rosa hcp upgrade to 4.14

openshift-pipelines · Dec 4, 2023 · 7b37455 · 7b37455
1 parent 6735c1e
commit 7b37455
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 48 deletions.
diff --git a/...ipeline-service-upgrade-test-ocp-412.yaml → ...ipeline-service-upgrade-test-ocp-414.yaml b/...ipeline-service-upgrade-test-ocp-412.yaml → ...ipeline-service-upgrade-test-ocp-414.yaml
@@ -2,7 +2,7 @@
 apiVersion: tekton.dev/v1beta1
 kind: PipelineRun
 metadata:
-  name: test-pipeline-service-upgrade-ocp-412
+  name: test-pipeline-service-upgrade-ocp-414
   annotations:
     pipelinesascode.tekton.dev/on-event: "[pull_request, push]"
     pipelinesascode.tekton.dev/on-target-branch: "[refs/heads/*]"

diff --git a/.tekton/tasks/deploy-cluster.yaml b/.tekton/tasks/deploy-cluster.yaml
@@ -7,7 +7,7 @@ spec:
   params:
     - name: ocp_version
       description: ocp cluster version that you want to provision
-      default: "4.12.36"
+      default: "4.14.3"
     - name: region
       description: ocp cluster region where you want to provision
       default: "us-east-1"

diff --git a/.tekton/test-pipeline-service-deployment-ocp-413.yaml b/.tekton/test-pipeline-service-deployment-ocp-413.yaml
diff --git a/...-pipeline-service-deployment-ocp-412.yaml → ...-pipeline-service-deployment-ocp-414.yaml b/...-pipeline-service-deployment-ocp-412.yaml → ...-pipeline-service-deployment-ocp-414.yaml
@@ -2,7 +2,7 @@
 apiVersion: tekton.dev/v1beta1
 kind: PipelineRun
 metadata:
-  name: test-pipeline-service-deployment-ocp-412
+  name: test-pipeline-service-deployment-ocp-414
   annotations:
     pipelinesascode.tekton.dev/on-event: "[pull_request, push]"
     pipelinesascode.tekton.dev/on-target-branch: "[refs/heads/*]"
@@ -20,7 +20,7 @@ spec:
     name: test-pipeline-service-deployment
   params:
     - name: ocp_version
-      value: "4.12.36"
+      value: "4.14.3"
     - name: repo_url
       value: "{{ repo_url }}"
     - name: revision

diff --git a/ci/images/static-checks/content/config/checkov.yaml b/ci/images/static-checks/content/config/checkov.yaml
@@ -36,6 +36,7 @@ skip-check:
   # openshift scc / security addresses these check by mutating pod under the covers
   # with pods getting assigned the restricted scc unless explicitly allowed otherwise
   - CKV_K8S_20 # no allowPrivilegeEscalation
+  - CKV_K8S_21 # the default namespace should not be used
   - CKV_K8S_22 # read only FS
   - CKV_K8S_23 # admission of root containers
   - CKV_K8S_25 # we are not adding capabilities, running under restricted-scc

diff --git a/...hift/gitops/argocd/pipeline-service-o11y/appstudio-prometheus/allow-argocd-to-manage.yaml b/...hift/gitops/argocd/pipeline-service-o11y/appstudio-prometheus/allow-argocd-to-manage.yaml
@@ -22,6 +22,7 @@ rules:
       - monitoring.coreos.com
     resources:
       - prometheusrules
+      - servicemonitors
     verbs:
       - get
       - list

diff --git a/developer/openshift/gitops/argocd/pipeline-service-storage/minio/tenant/tenant.yaml b/developer/openshift/gitops/argocd/pipeline-service-storage/minio/tenant/tenant.yaml
@@ -14,7 +14,7 @@ metadata:
     argocd.argoproj.io/sync-wave: "0"
 spec:
   exposeServices:
-    minio: true
+    minio: false
   features:
     bucketDNS: false
     domains: {}

diff --git a/developer/openshift/gitops/argocd/pipeline-service-storage/postgres.yaml b/developer/openshift/gitops/argocd/pipeline-service-storage/postgres.yaml
@@ -62,7 +62,7 @@ spec:
       prune: true
       selfHeal: true
     syncOptions:
-      - CreateNamespace=true
+      - CreateNamespace=false
       # workaround to make working both minio: newer and old 4.5.4
       - Validate=false
     retry:

diff --git a/developer/openshift/gitops/argocd/pipeline-service/kustomization.yaml b/developer/openshift/gitops/argocd/pipeline-service/kustomization.yaml
@@ -8,6 +8,7 @@ resources:
 patches:
   - path: tekton-results/minio-create-bucket.yaml
   - path: tekton-results/minio-tls.yaml
+  - path: tekton-results/postgres.yaml
 
   # Skip applying the Tekton operands while the Tekton operator is being installed.
   # See more information about this option, here:

diff --git a/developer/openshift/gitops/argocd/pipeline-service/tekton-results/kustomization.yaml b/developer/openshift/gitops/argocd/pipeline-service/tekton-results/kustomization.yaml
@@ -7,3 +7,4 @@ resources:
 patches:
   - path: minio-create-bucket.yaml
   - path: minio-tls.yaml
+  - path: postgres.yaml
diff --git a/developer/openshift/gitops/argocd/pipeline-service/tekton-results/postgres.yaml b/developer/openshift/gitops/argocd/pipeline-service/tekton-results/postgres.yaml
@@ -0,0 +1,16 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: tekton-results-api
+  namespace: tekton-results
+  annotations:
+    argocd.argoproj.io/sync-wave: "0"
+spec:
+  template:
+    spec:
+      containers:
+        - name: api
+          env:
+            - name: DB_SSLMODE
+              value: "disable"
diff --git a/developer/openshift/gitops/local/tekton-results/namespace.yaml b/developer/openshift/gitops/local/tekton-results/namespace.yaml
@@ -3,3 +3,5 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: tekton-results
+  labels:
+    argocd.argoproj.io/managed-by: openshift-gitops
diff --git a/operator/test/test.sh b/operator/test/test.sh
@@ -359,9 +359,8 @@ test_results() {
       QUERY_URL="https://$RESULT_ROUTE/apis/results.tekton.dev/v1alpha2/parents/${LOG_PATH}"
       QUERY_CMD[6]="${QUERY_URL}"
       LOGS_RESULT=$("${QUERY_CMD[@]}" 2>/dev/null)
-      LOGS_OUTPUT=$(echo "$LOGS_RESULT" | jq -r ".result.data | @base64d")
 
-      if ! echo "$LOGS_OUTPUT" | grep -qF "PipelineRun name from params:" ; then
+      if ! echo "$LOGS_RESULT" | grep -qF "PipelineRun name from params:" ; then
           echo "[ERROR] Unable to retrieve logs output."
           printf "[ERROR] Log record: %s \n" "${LOGS_RESULT}"
           exit 1