Merge pull request #688 from openshift-pipelines/osp-1.11

Upgrade to OSP 1.11

Author: gabemontero

developer/openshift/reset.sh

@@ -244,13 +244,6 @@ uninstall_operators_and_controllers(){
       kubectl delete ns "$pac_ns"
     fi
 
-    printf "\n  Uninstalling tekton-chains:\n"
-    kubectl delete -k "$GITOPS_DIR/tekton-chains" --ignore-not-found=true
-    tkn_chains_ns=$(kubectl get ns | grep -ie "tekton-chains" | cut -d " " -f 1)
-    if [[ -n "$pac_ns" ]]; then
-      kubectl delete ns "$tkn_chains_ns"
-    fi
-
     printf "\n  Uninstalling tekton-results:\n"
     kubectl delete -k "$GITOPS_DIR/tekton-results/base" --ignore-not-found=true
     tkn_results_ns=$(kubectl get ns | grep -ie "tekton-results" | cut -d " " -f 1)
@@ -266,7 +259,7 @@ uninstall_operators_and_controllers(){
     fi
 
     # Checks if the Tekton controllers are uninstalled successfully
-    mapfile -t controllers < <(kubectl get ns | grep -iE "tekton-results|tekton-chains|pipelines-as-code" | cut -d " " -f 1)
+    mapfile -t controllers < <(kubectl get ns | grep -iE "tekton-results" | cut -d " " -f 1)
     if (( ${#controllers[@]} >= 1 )); then
         printf "\n[ERROR] Couldn't remove Tekton controllers, please try removing them manually." >&2
         exit 1

operator/gitops/argocd/pipeline-service/kustomization.yaml

@@ -4,7 +4,6 @@ kind: Kustomization
 
 resources:
   - openshift-pipelines
-  - pipelines-as-code
   - tekton-chains
   - tekton-results/base
   - metrics-exporter

operator/gitops/argocd/pipeline-service/openshift-pipelines/allow-argocd-to-manage.yaml

@@ -4,6 +4,16 @@ kind: ClusterRole
 metadata:
   name: openshift-gitops-apply-tekton-config-parameters
 rules:
+  - apiGroups:
+      - monitoring.coreos.com
+    resources:
+      - servicemonitors
+    verbs:
+      - get
+      - list
+      - patch
+      - create
+      - delete
   - apiGroups:
       - operator.tekton.dev
     resources:

operator/gitops/argocd/pipeline-service/openshift-pipelines/openshift-operator.yaml

@@ -5,7 +5,7 @@ metadata:
   name: openshift-pipelines-operator
   namespace: openshift-operators
 spec:
-  channel: pipelines-1.10
+  channel: pipelines-1.11
   name: openshift-pipelines-operator-rh
   source: redhat-operators
   sourceNamespace: openshift-marketplace

operator/gitops/argocd/pipeline-service/openshift-pipelines/tekton-config.yaml

@@ -1,4 +1,5 @@
 ---
+# Docs: https://github.com/tektoncd/operator/blob/main/docs/TektonConfig.md
 apiVersion: operator.tekton.dev/v1alpha1
 kind: TektonConfig
 metadata:
@@ -14,7 +15,23 @@ spec:
   platforms:
     openshift:
       pipelinesAsCode:
-        enable: false
+        enable: true
+  chain:
+    # Configure TaskRun attestation.
+    # RHTAP does not leverage the TaskRun attestations.
+    # This tells Tekton Chains to not store them in the OCI registry.
+    artifacts.taskrun.format: "in-toto"
+    artifacts.taskrun.storage: ""
+
+    # Configure image signing
+    artifacts.oci.storage: "oci"
+
+    # Configure PipelineRun attestation
+    artifacts.pipelinerun.format: "in-toto"
+    artifacts.pipelinerun.storage: "oci"
+
+    # Rekor integration is disabled for now. It is planned to be re-introduced in the future.
+    transparency.enabled: "false"
   pipeline:
     default-service-account: appstudio-pipeline
     enable-api-fields: beta