Merge pull request #298 from mbaldessari/quick-fixes

A bunch of fixes
validatedpatterns · Nov 14, 2024 · 065b180 · 065b180
2 parents 9803552 + c207e34
commit 065b180
Show file tree

Hide file tree

Showing 18 changed files with 64 additions and 20 deletions.
diff --git a/charts/datacenter/data-science-project/templates/dev-project.yaml b/charts/datacenter/data-science-project/templates/dev-project.yaml
@@ -146,7 +146,7 @@ spec:
             timeoutSeconds: 1
           envFrom:
             - secretRef:
-                name: gitea-admin-secret
+                name: gitea-admin-secret-and-branch
             - secretRef:
                 name: aws-connection-user-bucket
           env:

diff --git a/charts/datacenter/manuela-tst/templates/messaging/messaging-is.yaml b/charts/datacenter/manuela-tst/templates/messaging/messaging-is.yaml
@@ -3,6 +3,8 @@ kind: ImageStream
 metadata:
   name: messaging
 spec:
+  lookupPolicy:
+    local: true
   tags:
   - name: {{ .Values.iot_consumer.bootstrap_tag }}
     from:

diff --git a/charts/datacenter/pipelines/templates/gitea-admin-secret.yaml b/charts/datacenter/pipelines/templates/gitea-admin-secret.yaml
@@ -35,13 +35,12 @@ spec:
     secret:
       name: gitea-admin-secret
   updatePolicy: Replace
-{{- range $i := list "manuela-ci" "ml-development" }}
 ---
 apiVersion: "external-secrets.io/v1beta1"
 kind: ExternalSecret
 metadata:
   name: gitea-admin-external-secret
-  namespace: {{ $i }}
+  namespace: manuela-ci
 spec:
   refreshInterval: 15s
   secretStoreRef:
@@ -69,9 +68,39 @@ spec:
     remoteRef:
       key: "pushsecrets/gitea_admin"
       property: "password"
-{{- end }}{{/* range $i := list manuela-ci ml-development */}}
+---
+apiVersion: "external-secrets.io/v1beta1"
+kind: ExternalSecret
+metadata:
+  name: gitea-admin-external-secret
+  namespace: ml-development
+spec:
+  refreshInterval: 15s
+  secretStoreRef:
+    name: {{ $.Values.secretStore.name }}
+    kind: {{ $.Values.secretStore.kind }}
+  target:
+    name: gitea-admin-secret-and-branch
+    template:
+      metadata:
+        annotations:
+          # Tekton magic, see https://tekton.dev/vault/pipelines-v0.15.2/auth/
+          tekton.dev/git-0: {{ $full_giturl }}
+      type: Opaque
+      engineVersion: v2
+      data:
+        username: "{{ `{{ .gitea_admin_user }}` }}"
+        password: "{{ `{{ .gitea_admin_password }}` }}"
+        branch: {{ $.Values.global.targetRevision }}
+  data:
+  - secretKey: gitea_admin_user
+    remoteRef:
+      key: "pushsecrets/gitea_admin"
+      property: "username"
+
+  - secretKey: gitea_admin_password
+    remoteRef:
+      key: "pushsecrets/gitea_admin"
+      property: "password"
 {{- end }}
 {{- end }}
-
-# TODO: We used to have a branch field we need to circle back and expose that differently
-# branch: 
diff --git a/charts/datacenter/pipelines/templates/pipelines/build-and-test-iot-anomaly-detection.yaml b/charts/datacenter/pipelines/templates/pipelines/build-and-test-iot-anomaly-detection.yaml
@@ -164,6 +164,8 @@ spec:
     params:
     - name: subdirectory
       value: ops
+    - name: PUSH_FLAGS
+      value: --all
 
   - name: argocd-sync-application
     taskRef:
@@ -179,8 +181,6 @@ spec:
       value: manuela-test
     - name: flags
       value: --insecure
-    - name: argocd-version
-      value: "v1.5.2"
     - name: revision
       value: $(params.OPS_REVISION)
     - name: argocd-server

diff --git a/charts/datacenter/pipelines/templates/pipelines/build-and-test-iot-consumer.yaml b/charts/datacenter/pipelines/templates/pipelines/build-and-test-iot-consumer.yaml
@@ -165,6 +165,8 @@ spec:
     params:
     - name: subdirectory
       value: ops
+    - name: PUSH_FLAGS
+      value: --all
 
   - name: argocd-sync-application
     taskRef:
@@ -180,8 +182,6 @@ spec:
       value: manuela-test
     - name: flags
       value: --insecure
-    - name: argocd-version
-      value: "v1.5.2"
     - name: revision
       value: $(params.OPS_REVISION)
     - name: argocd-server

diff --git a/charts/datacenter/pipelines/templates/pipelines/build-and-test.yaml b/charts/datacenter/pipelines/templates/pipelines/build-and-test.yaml
@@ -258,6 +258,8 @@ spec:
     params:
     - name: subdirectory
       value: ops
+    - name: PUSH_FLAGS
+      value: --all
 
   - name: argocd-sync-application
     taskRef:
@@ -273,8 +275,6 @@ spec:
       value: manuela-test
     - name: flags
       value: --insecure
-    - name: argocd-version
-      value: "v1.5.2"
     - name: revision
       value: $(params.OPS_REVISION)
     - name: argocd-server

diff --git a/charts/datacenter/pipelines/templates/pipelines/build-iot-anomaly-detection.yaml b/charts/datacenter/pipelines/templates/pipelines/build-iot-anomaly-detection.yaml
@@ -156,3 +156,5 @@ spec:
     params:
     - name: subdirectory
       value: ops
+    - name: PUSH_FLAGS
+      value: --all
diff --git a/charts/datacenter/pipelines/templates/pipelines/build-iot-consumer.yaml b/charts/datacenter/pipelines/templates/pipelines/build-iot-consumer.yaml
@@ -157,3 +157,5 @@ spec:
     params:
     - name: subdirectory
       value: ops
+    - name: PUSH_FLAGS
+      value: --all
diff --git a/charts/datacenter/pipelines/templates/pipelines/build-iot-frontend.yaml b/charts/datacenter/pipelines/templates/pipelines/build-iot-frontend.yaml
@@ -159,3 +159,5 @@ spec:
     params:
     - name: subdirectory
       value: ops
+    - name: PUSH_FLAGS
+      value: --all
diff --git a/charts/datacenter/pipelines/templates/pipelines/build-iot-software-sensor.yaml b/charts/datacenter/pipelines/templates/pipelines/build-iot-software-sensor.yaml
@@ -156,3 +156,5 @@ spec:
     params:
     - name: subdirectory
       value: ops
+    - name: PUSH_FLAGS
+      value: --all
diff --git a/charts/datacenter/pipelines/templates/pipelines/just-pr.yaml b/charts/datacenter/pipelines/templates/pipelines/just-pr.yaml
@@ -165,8 +165,6 @@ spec:
       value: manuela-test
     - name: flags
       value: --insecure
-    - name: argocd-version
-      value: "v1.5.2"
     - name: revision
       value: $(params.OPS_REVISION)
     - name: argocd-server

diff --git a/charts/datacenter/pipelines/templates/pipelines/seed-iot-anomaly-detection.yaml b/charts/datacenter/pipelines/templates/pipelines/seed-iot-anomaly-detection.yaml
@@ -176,3 +176,5 @@ spec:
     params:
     - name: subdirectory
       value: ops
+    - name: PUSH_FLAGS
+      value: --all
diff --git a/charts/datacenter/pipelines/templates/pipelines/seed-iot-consumer.yaml b/charts/datacenter/pipelines/templates/pipelines/seed-iot-consumer.yaml
@@ -177,3 +177,5 @@ spec:
     params:
     - name: subdirectory
       value: ops
+    - name: PUSH_FLAGS
+      value: --all
diff --git a/charts/datacenter/pipelines/templates/pipelines/seed-iot-frontend.yaml b/charts/datacenter/pipelines/templates/pipelines/seed-iot-frontend.yaml
@@ -179,3 +179,5 @@ spec:
     params:
     - name: subdirectory
       value: ops
+    - name: PUSH_FLAGS
+      value: --all
diff --git a/charts/datacenter/pipelines/templates/pipelines/seed-iot-software-sensor.yaml b/charts/datacenter/pipelines/templates/pipelines/seed-iot-software-sensor.yaml
@@ -176,3 +176,5 @@ spec:
     params:
     - name: subdirectory
       value: ops
+    - name: PUSH_FLAGS
+      value: --all
diff --git a/charts/datacenter/pipelines/templates/tasks/argocd-sync-and-wait.yaml b/charts/datacenter/pipelines/templates/tasks/argocd-sync-and-wait.yaml
@@ -18,13 +18,13 @@ spec:
     default: --
   - name: argocd-version
     type: string
-    default: v1.5.2
+    default: v1.14.1
   - name: argocd-server
     type: string
     default: openshift-gitops-server.openshift-gitops.svc
   steps:
     - name: login-sync-wait
-      image: argoproj/argocd:$(params.argocd-version)
+      image: registry.redhat.io/openshift-gitops-1/argocd-rhel8:$(params.argocd-version)
       command: ["/bin/bash", "-c"]
       args:
         - if [ -z $ARGOCD_AUTH_TOKEN ]; then

diff --git a/charts/datacenter/pipelines/templates/tasks/github-push.yaml b/charts/datacenter/pipelines/templates/tasks/github-push.yaml
@@ -1,5 +1,3 @@
-{{- $giturl := coalesce .Values.global.git.hostname (printf "gitea-route-vp-gitea.%s" .Values.global.localClusterDomain) }}
-{{- $full_giturl := printf "https://%s/%s/manuela-dev.git" $giturl .Values.global.git.account }}
 ---
 apiVersion: tekton.dev/v1beta1
 kind: Task
@@ -24,6 +22,7 @@ spec:
   - name: push
     image: gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/git-init:v0.44.5
     script: |
+      set -x
       git remote -v
       git branch
       git branch -r | grep -q origin/$(git rev-parse --abbrev-ref HEAD) && git -c http.sslVerify=$(params.sslVerify) pull --ff-only --no-edit

diff --git a/values-global.yaml b/values-global.yaml
@@ -15,7 +15,7 @@ global:
     installPlanApproval: Automatic
 
   imageregistry:
-    account: rhn_support_mbaldess
+    account: PLAINTEXT
     hostname: quay.io
     type: quay