diff --git a/.konflux/olm-catalog/bundle/kodata/tekton-chains/0.0.0-nightly/00-chains.yaml b/.konflux/olm-catalog/bundle/kodata/tekton-chains/0.0.0-nightly/00-chains.yaml index 0f3ccb95a..512c48d3b 100644 --- a/.konflux/olm-catalog/bundle/kodata/tekton-chains/0.0.0-nightly/00-chains.yaml +++ b/.konflux/olm-catalog/bundle/kodata/tekton-chains/0.0.0-nightly/00-chains.yaml @@ -63,8 +63,8 @@ metadata: app.kubernetes.io/component: controller app.kubernetes.io/instance: default app.kubernetes.io/part-of: tekton-chains - pipeline.tekton.dev/release: "v20241107-227b3119c6" - version: "v20241107-227b3119c6" + pipeline.tekton.dev/release: "v20241110-227b3119c6" + version: "v20241110-227b3119c6" spec: replicas: 1 selector: @@ -84,13 +84,13 @@ spec: app.kubernetes.io/instance: default app.kubernetes.io/part-of: tekton-chains # # tekton.dev/release value replaced with inputs.params.versionTag in pipeline/tekton/publish.yaml - pipeline.tekton.dev/release: "v20241107-227b3119c6" - version: "v20241107-227b3119c6" + pipeline.tekton.dev/release: "v20241110-227b3119c6" + version: "v20241110-227b3119c6" spec: serviceAccountName: tekton-chains-controller containers: - name: tekton-chains-controller - image: ghcr.io/tektoncd/chains/controller-92006fd957c0afd31de6a40b3e33b39f:v20241107-227b3119c6@sha256:da486fa187cb2329aab9a328a031f784714a1b6845d36701a8856eb7d755316e + image: ghcr.io/tektoncd/chains/controller-92006fd957c0afd31de6a40b3e33b39f:v20241110-227b3119c6@sha256:e693a8981d5c13fae5e2a8601e5cb4855ae35c62ba7ce177c9b1e293be1e4d06 volumeMounts: - name: signing-secrets mountPath: /etc/signing-secrets @@ -342,7 +342,7 @@ data: # this ConfigMap such that even if we don't have access to # other resources in the namespace, we can still access # this ConfigMap. - version: "v20241107-227b3119c6" + version: "v20241110-227b3119c6" --- # Copyright 2023 Tekton Authors LLC diff --git a/.konflux/olm-catalog/bundle/kodata/tekton-pipeline/0.0.0-nightly/00-pipelines.yaml b/.konflux/olm-catalog/bundle/kodata/tekton-pipeline/0.0.0-nightly/00-pipelines.yaml index 49154e16f..d00318f0f 100644 --- a/.konflux/olm-catalog/bundle/kodata/tekton-pipeline/0.0.0-nightly/00-pipelines.yaml +++ b/.konflux/olm-catalog/bundle/kodata/tekton-pipeline/0.0.0-nightly/00-pipelines.yaml @@ -584,8 +584,8 @@ metadata: labels: app.kubernetes.io/instance: default app.kubernetes.io/part-of: tekton-pipelines - pipeline.tekton.dev/release: "v20241107-7056a411c4" - version: "v20241107-7056a411c4" + pipeline.tekton.dev/release: "v20241110-7056a411c4" + version: "v20241110-7056a411c4" spec: group: tekton.dev preserveUnknownFields: false @@ -639,8 +639,8 @@ metadata: labels: app.kubernetes.io/instance: default app.kubernetes.io/part-of: tekton-pipelines - pipeline.tekton.dev/release: "v20241107-7056a411c4" - version: "v20241107-7056a411c4" + pipeline.tekton.dev/release: "v20241110-7056a411c4" + version: "v20241110-7056a411c4" spec: group: tekton.dev preserveUnknownFields: false @@ -707,8 +707,8 @@ metadata: labels: app.kubernetes.io/instance: default app.kubernetes.io/part-of: tekton-pipelines - pipeline.tekton.dev/release: "v20241107-7056a411c4" - version: "v20241107-7056a411c4" + pipeline.tekton.dev/release: "v20241110-7056a411c4" + version: "v20241110-7056a411c4" spec: group: tekton.dev preserveUnknownFields: false @@ -786,8 +786,8 @@ metadata: labels: app.kubernetes.io/instance: default app.kubernetes.io/part-of: tekton-pipelines - pipeline.tekton.dev/release: "v20241107-7056a411c4" - version: "v20241107-7056a411c4" + pipeline.tekton.dev/release: "v20241110-7056a411c4" + version: "v20241110-7056a411c4" spec: group: tekton.dev preserveUnknownFields: false @@ -999,8 +999,8 @@ metadata: labels: app.kubernetes.io/instance: default app.kubernetes.io/part-of: tekton-pipelines - pipeline.tekton.dev/release: "v20241107-7056a411c4" - version: "v20241107-7056a411c4" + pipeline.tekton.dev/release: "v20241110-7056a411c4" + version: "v20241110-7056a411c4" spec: group: tekton.dev preserveUnknownFields: false @@ -1072,8 +1072,8 @@ metadata: labels: app.kubernetes.io/instance: default app.kubernetes.io/part-of: tekton-pipelines - pipeline.tekton.dev/release: "v20241107-7056a411c4" - version: "v20241107-7056a411c4" + pipeline.tekton.dev/release: "v20241110-7056a411c4" + version: "v20241110-7056a411c4" spec: group: tekton.dev preserveUnknownFields: false @@ -1154,8 +1154,8 @@ metadata: labels: app.kubernetes.io/instance: default app.kubernetes.io/part-of: tekton-pipelines - pipeline.tekton.dev/release: "v20241107-7056a411c4" - version: "v20241107-7056a411c4" + pipeline.tekton.dev/release: "v20241110-7056a411c4" + version: "v20241110-7056a411c4" spec: group: tekton.dev preserveUnknownFields: false @@ -1264,8 +1264,8 @@ metadata: labels: app.kubernetes.io/instance: default app.kubernetes.io/part-of: tekton-pipelines - pipeline.tekton.dev/release: "v20241107-7056a411c4" - version: "v20241107-7056a411c4" + pipeline.tekton.dev/release: "v20241110-7056a411c4" + version: "v20241110-7056a411c4" spec: group: tekton.dev versions: @@ -1316,7 +1316,7 @@ metadata: app.kubernetes.io/component: webhook app.kubernetes.io/instance: default app.kubernetes.io/part-of: tekton-pipelines - pipeline.tekton.dev/release: "v20241107-7056a411c4" + pipeline.tekton.dev/release: "v20241110-7056a411c4" # The data is populated at install time. --- apiVersion: admissionregistration.k8s.io/v1 @@ -1327,7 +1327,7 @@ metadata: app.kubernetes.io/component: webhook app.kubernetes.io/instance: default app.kubernetes.io/part-of: tekton-pipelines - pipeline.tekton.dev/release: "v20241107-7056a411c4" + pipeline.tekton.dev/release: "v20241110-7056a411c4" webhooks: - admissionReviewVersions: ["v1"] clientConfig: @@ -1346,7 +1346,7 @@ metadata: app.kubernetes.io/component: webhook app.kubernetes.io/instance: default app.kubernetes.io/part-of: tekton-pipelines - pipeline.tekton.dev/release: "v20241107-7056a411c4" + pipeline.tekton.dev/release: "v20241110-7056a411c4" webhooks: - admissionReviewVersions: ["v1"] clientConfig: @@ -1365,7 +1365,7 @@ metadata: app.kubernetes.io/component: webhook app.kubernetes.io/instance: default app.kubernetes.io/part-of: tekton-pipelines - pipeline.tekton.dev/release: "v20241107-7056a411c4" + pipeline.tekton.dev/release: "v20241110-7056a411c4" webhooks: - admissionReviewVersions: ["v1"] clientConfig: @@ -1835,7 +1835,7 @@ data: # this ConfigMap such that even if we don't have access to # other resources in the namespace we still can have access to # this ConfigMap. - version: "v20241107-7056a411c4" + version: "v20241110-7056a411c4" --- # Copyright 2020 Tekton Authors LLC @@ -2266,12 +2266,12 @@ metadata: app.kubernetes.io/name: controller app.kubernetes.io/component: controller app.kubernetes.io/instance: default - app.kubernetes.io/version: "v20241107-7056a411c4" + app.kubernetes.io/version: "v20241110-7056a411c4" app.kubernetes.io/part-of: tekton-pipelines # tekton.dev/release value replaced with inputs.params.versionTag in pipeline/tekton/publish.yaml - pipeline.tekton.dev/release: "v20241107-7056a411c4" + pipeline.tekton.dev/release: "v20241110-7056a411c4" # labels below are related to istio and should not be used for resource lookup - version: "v20241107-7056a411c4" + version: "v20241110-7056a411c4" spec: replicas: 1 selector: @@ -2286,13 +2286,13 @@ spec: app.kubernetes.io/name: controller app.kubernetes.io/component: controller app.kubernetes.io/instance: default - app.kubernetes.io/version: "v20241107-7056a411c4" + app.kubernetes.io/version: "v20241110-7056a411c4" app.kubernetes.io/part-of: tekton-pipelines # tekton.dev/release value replaced with inputs.params.versionTag in pipeline/tekton/publish.yaml - pipeline.tekton.dev/release: "v20241107-7056a411c4" + pipeline.tekton.dev/release: "v20241110-7056a411c4" # labels below are related to istio and should not be used for resource lookup app: tekton-pipelines-controller - version: "v20241107-7056a411c4" + version: "v20241110-7056a411c4" spec: affinity: nodeAffinity: @@ -2306,11 +2306,11 @@ spec: serviceAccountName: tekton-pipelines-controller containers: - name: tekton-pipelines-controller - image: ghcr.io/tektoncd/pipeline/controller-10a3e32792f33651396d02b6855a6e36:v20241107-7056a411c4@sha256:3769629ec4a531b66eec3b16e3ad3a8062fe00046d9a4cb213144e3a3161b15c + image: ghcr.io/tektoncd/pipeline/controller-10a3e32792f33651396d02b6855a6e36:v20241110-7056a411c4@sha256:be8f10414efea4954ef2db7c2ddadb6509628c70664727c4dac1df1bb2a6c10b args: [ # These images are built on-demand by `ko resolve` and are replaced # by image references by digest. - "-entrypoint-image", "ghcr.io/tektoncd/pipeline/entrypoint-bff0a22da108bc2f16c818c97641a296:v20241107-7056a411c4@sha256:561182d7ecb8791e49db593293d6e9f154af8f37f633b1e454e8306a9840da9a", "-nop-image", "ghcr.io/tektoncd/pipeline/nop-8eac7c133edad5df719dc37b36b62482:v20241107-7056a411c4@sha256:2714dac5b899d51aa6f6236b574afd8f34bd07ca532abbe3d5fb995f3d91649b", "-sidecarlogresults-image", "ghcr.io/tektoncd/pipeline/sidecarlogresults-7501c6a20d741631510a448b48ab098f:v20241107-7056a411c4@sha256:49ffe50072aa5b8cd37053f2eaed1f006d9d8418dddaaa25698d51f25d473f8a", "-workingdirinit-image", "ghcr.io/tektoncd/pipeline/workingdirinit-0c558922ec6a1b739e550e349f2d5fc1:v20241107-7056a411c4@sha256:daa851b73f3c2ffe34cdbc0c1357e245aed3db06c01806ca31cde069f1097e8a", + "-entrypoint-image", "ghcr.io/tektoncd/pipeline/entrypoint-bff0a22da108bc2f16c818c97641a296:v20241110-7056a411c4@sha256:ca7d3b6a79acad0b04280d5a5a00b67a8a1bed1e03ea38f15dc21fd18da265a1", "-nop-image", "ghcr.io/tektoncd/pipeline/nop-8eac7c133edad5df719dc37b36b62482:v20241110-7056a411c4@sha256:742adbf53e766e940bf5eec5e9aa45da7bb5b93195aa7bb51d91e039f2b9a928", "-sidecarlogresults-image", "ghcr.io/tektoncd/pipeline/sidecarlogresults-7501c6a20d741631510a448b48ab098f:v20241110-7056a411c4@sha256:49ffe50072aa5b8cd37053f2eaed1f006d9d8418dddaaa25698d51f25d473f8a", "-workingdirinit-image", "ghcr.io/tektoncd/pipeline/workingdirinit-0c558922ec6a1b739e550e349f2d5fc1:v20241110-7056a411c4@sha256:daa851b73f3c2ffe34cdbc0c1357e245aed3db06c01806ca31cde069f1097e8a", # The shell image must allow root in order to create directories and copy files to PVCs. # cgr.dev/chainguard/busybox as of April 14 2022 # image shall not contains tag, so it will be supported on a runtime like cri-o @@ -2399,13 +2399,13 @@ metadata: app.kubernetes.io/name: controller app.kubernetes.io/component: controller app.kubernetes.io/instance: default - app.kubernetes.io/version: "v20241107-7056a411c4" + app.kubernetes.io/version: "v20241110-7056a411c4" app.kubernetes.io/part-of: tekton-pipelines # tekton.dev/release value replaced with inputs.params.versionTag in pipeline/tekton/publish.yaml - pipeline.tekton.dev/release: "v20241107-7056a411c4" + pipeline.tekton.dev/release: "v20241110-7056a411c4" # labels below are related to istio and should not be used for resource lookup app: tekton-pipelines-controller - version: "v20241107-7056a411c4" + version: "v20241110-7056a411c4" name: tekton-pipelines-controller namespace: tekton-pipelines spec: @@ -2449,12 +2449,12 @@ metadata: app.kubernetes.io/name: events app.kubernetes.io/component: events app.kubernetes.io/instance: default - app.kubernetes.io/version: "v20241107-7056a411c4" + app.kubernetes.io/version: "v20241110-7056a411c4" app.kubernetes.io/part-of: tekton-pipelines # tekton.dev/release value replaced with inputs.params.versionTag in pipeline/tekton/publish.yaml - pipeline.tekton.dev/release: "v20241107-7056a411c4" + pipeline.tekton.dev/release: "v20241110-7056a411c4" # labels below are related to istio and should not be used for resource lookup - version: "v20241107-7056a411c4" + version: "v20241110-7056a411c4" spec: replicas: 1 selector: @@ -2469,13 +2469,13 @@ spec: app.kubernetes.io/name: events app.kubernetes.io/component: events app.kubernetes.io/instance: default - app.kubernetes.io/version: "v20241107-7056a411c4" + app.kubernetes.io/version: "v20241110-7056a411c4" app.kubernetes.io/part-of: tekton-pipelines # tekton.dev/release value replaced with inputs.params.versionTag in pipeline/tekton/publish.yaml - pipeline.tekton.dev/release: "v20241107-7056a411c4" + pipeline.tekton.dev/release: "v20241110-7056a411c4" # labels below are related to istio and should not be used for resource lookup app: tekton-events-controller - version: "v20241107-7056a411c4" + version: "v20241110-7056a411c4" spec: affinity: nodeAffinity: @@ -2489,7 +2489,7 @@ spec: serviceAccountName: tekton-events-controller containers: - name: tekton-events-controller - image: ghcr.io/tektoncd/pipeline/events-a9042f7efb0cbade2a868a1ee5ddd52c:v20241107-7056a411c4@sha256:3f13b8c6a447761471ac552e09233de70cef74d05649ef775f3b0ef8a3cefb64 + image: ghcr.io/tektoncd/pipeline/events-a9042f7efb0cbade2a868a1ee5ddd52c:v20241110-7056a411c4@sha256:18b9da74768bb4539c1c0014ad956dc348203bb040f16af74d16d48ed2f5ca7c args: [] volumeMounts: - name: config-logging @@ -2566,13 +2566,13 @@ metadata: app.kubernetes.io/name: events app.kubernetes.io/component: events app.kubernetes.io/instance: default - app.kubernetes.io/version: "v20241107-7056a411c4" + app.kubernetes.io/version: "v20241110-7056a411c4" app.kubernetes.io/part-of: tekton-pipelines # tekton.dev/release value replaced with inputs.params.versionTag in pipeline/tekton/publish.yaml - pipeline.tekton.dev/release: "v20241107-7056a411c4" + pipeline.tekton.dev/release: "v20241110-7056a411c4" # labels below are related to istio and should not be used for resource lookup app: tekton-events-controller - version: "v20241107-7056a411c4" + version: "v20241110-7056a411c4" name: tekton-events-controller namespace: tekton-pipelines spec: @@ -3179,12 +3179,12 @@ metadata: app.kubernetes.io/name: resolvers app.kubernetes.io/component: resolvers app.kubernetes.io/instance: default - app.kubernetes.io/version: "v20241107-7056a411c4" + app.kubernetes.io/version: "v20241110-7056a411c4" app.kubernetes.io/part-of: tekton-pipelines # tekton.dev/release value replaced with inputs.params.versionTag in pipeline/tekton/publish.yaml - pipeline.tekton.dev/release: "v20241107-7056a411c4" + pipeline.tekton.dev/release: "v20241110-7056a411c4" # labels below are related to istio and should not be used for resource lookup - version: "v20241107-7056a411c4" + version: "v20241110-7056a411c4" spec: replicas: 1 selector: @@ -3199,13 +3199,13 @@ spec: app.kubernetes.io/name: resolvers app.kubernetes.io/component: resolvers app.kubernetes.io/instance: default - app.kubernetes.io/version: "v20241107-7056a411c4" + app.kubernetes.io/version: "v20241110-7056a411c4" app.kubernetes.io/part-of: tekton-pipelines # tekton.dev/release value replaced with inputs.params.versionTag in pipeline/tekton/publish.yaml - pipeline.tekton.dev/release: "v20241107-7056a411c4" + pipeline.tekton.dev/release: "v20241110-7056a411c4" # labels below are related to istio and should not be used for resource lookup app: tekton-pipelines-resolvers - version: "v20241107-7056a411c4" + version: "v20241110-7056a411c4" spec: affinity: podAntiAffinity: @@ -3222,7 +3222,7 @@ spec: serviceAccountName: tekton-pipelines-resolvers containers: - name: controller - image: ghcr.io/tektoncd/pipeline/resolvers-ff86b24f130c42b88983d3c13993056d:v20241107-7056a411c4@sha256:36dfeb98a61b4a374eb7f97c1d86fb7e92fa1574cc80e9d629e248dbe06a1da2 + image: ghcr.io/tektoncd/pipeline/resolvers-ff86b24f130c42b88983d3c13993056d:v20241110-7056a411c4@sha256:24db6eebbeb20ff307674e92aae0d61502e236c7861b7e951e89f8f312ff6532 resources: requests: cpu: 100m @@ -3294,13 +3294,13 @@ metadata: app.kubernetes.io/name: resolvers app.kubernetes.io/component: resolvers app.kubernetes.io/instance: default - app.kubernetes.io/version: "v20241107-7056a411c4" + app.kubernetes.io/version: "v20241110-7056a411c4" app.kubernetes.io/part-of: tekton-pipelines # tekton.dev/release value replaced with inputs.params.versionTag in pipeline/tekton/publish.yaml - pipeline.tekton.dev/release: "v20241107-7056a411c4" + pipeline.tekton.dev/release: "v20241110-7056a411c4" # labels below are related to istio and should not be used for resource lookup app: tekton-pipelines-remote-resolvers - version: "v20241107-7056a411c4" + version: "v20241110-7056a411c4" name: tekton-pipelines-remote-resolvers namespace: tekton-pipelines-resolvers spec: @@ -3344,12 +3344,12 @@ metadata: app.kubernetes.io/name: webhook app.kubernetes.io/component: webhook app.kubernetes.io/instance: default - app.kubernetes.io/version: "v20241107-7056a411c4" + app.kubernetes.io/version: "v20241110-7056a411c4" app.kubernetes.io/part-of: tekton-pipelines # tekton.dev/release value replaced with inputs.params.versionTag in pipeline/tekton/publish.yaml - pipeline.tekton.dev/release: "v20241107-7056a411c4" + pipeline.tekton.dev/release: "v20241110-7056a411c4" # labels below are related to istio and should not be used for resource lookup - version: "v20241107-7056a411c4" + version: "v20241110-7056a411c4" spec: minReplicas: 1 maxReplicas: 5 @@ -3392,12 +3392,12 @@ metadata: app.kubernetes.io/name: webhook app.kubernetes.io/component: webhook app.kubernetes.io/instance: default - app.kubernetes.io/version: "v20241107-7056a411c4" + app.kubernetes.io/version: "v20241110-7056a411c4" app.kubernetes.io/part-of: tekton-pipelines # tekton.dev/release value replaced with inputs.params.versionTag in pipeline/tekton/publish.yaml - pipeline.tekton.dev/release: "v20241107-7056a411c4" + pipeline.tekton.dev/release: "v20241110-7056a411c4" # labels below are related to istio and should not be used for resource lookup - version: "v20241107-7056a411c4" + version: "v20241110-7056a411c4" spec: selector: matchLabels: @@ -3411,13 +3411,13 @@ spec: app.kubernetes.io/name: webhook app.kubernetes.io/component: webhook app.kubernetes.io/instance: default - app.kubernetes.io/version: "v20241107-7056a411c4" + app.kubernetes.io/version: "v20241110-7056a411c4" app.kubernetes.io/part-of: tekton-pipelines # tekton.dev/release value replaced with inputs.params.versionTag in pipeline/tekton/publish.yaml - pipeline.tekton.dev/release: "v20241107-7056a411c4" + pipeline.tekton.dev/release: "v20241110-7056a411c4" # labels below are related to istio and should not be used for resource lookup app: tekton-pipelines-webhook - version: "v20241107-7056a411c4" + version: "v20241110-7056a411c4" spec: affinity: nodeAffinity: @@ -3444,7 +3444,7 @@ spec: - name: webhook # This is the Go import path for the binary that is containerized # and substituted here. - image: ghcr.io/tektoncd/pipeline/webhook-d4749e605405422fd87700164e31b2d1:v20241107-7056a411c4@sha256:81a4e4ccc050e3a04e80d13f704c24eb9d98ee83d595db420f45e4031d943171 + image: ghcr.io/tektoncd/pipeline/webhook-d4749e605405422fd87700164e31b2d1:v20241110-7056a411c4@sha256:8067f5533b3b0e1106a7e4175eab5da6da44f0238e7f3964246888d9cef2efa9 # Resource request required for autoscaler to take any action for a metric resources: requests: @@ -3539,13 +3539,13 @@ metadata: app.kubernetes.io/name: webhook app.kubernetes.io/component: webhook app.kubernetes.io/instance: default - app.kubernetes.io/version: "v20241107-7056a411c4" + app.kubernetes.io/version: "v20241110-7056a411c4" app.kubernetes.io/part-of: tekton-pipelines # tekton.dev/release value replaced with inputs.params.versionTag in pipeline/tekton/publish.yaml - pipeline.tekton.dev/release: "v20241107-7056a411c4" + pipeline.tekton.dev/release: "v20241110-7056a411c4" # labels below are related to istio and should not be used for resource lookup app: tekton-pipelines-webhook - version: "v20241107-7056a411c4" + version: "v20241110-7056a411c4" name: tekton-pipelines-webhook namespace: tekton-pipelines spec: diff --git a/.konflux/olm-catalog/bundle/kodata/tekton-trigger/0.0.0-nightly/00-triggers.yaml b/.konflux/olm-catalog/bundle/kodata/tekton-trigger/0.0.0-nightly/00-triggers.yaml index 19b0f971a..c5142e511 100644 --- a/.konflux/olm-catalog/bundle/kodata/tekton-trigger/0.0.0-nightly/00-triggers.yaml +++ b/.konflux/olm-catalog/bundle/kodata/tekton-trigger/0.0.0-nightly/00-triggers.yaml @@ -398,8 +398,8 @@ metadata: labels: app.kubernetes.io/instance: default app.kubernetes.io/part-of: tekton-triggers - triggers.tekton.dev/release: "v20241107-c6d2a8dfae" - version: "v20241107-c6d2a8dfae" + triggers.tekton.dev/release: "v20241110-c6d2a8dfae" + version: "v20241110-c6d2a8dfae" spec: group: triggers.tekton.dev scope: Cluster @@ -454,8 +454,8 @@ metadata: labels: app.kubernetes.io/instance: default app.kubernetes.io/part-of: tekton-triggers - triggers.tekton.dev/release: "v20241107-c6d2a8dfae" - version: "v20241107-c6d2a8dfae" + triggers.tekton.dev/release: "v20241110-c6d2a8dfae" + version: "v20241110-c6d2a8dfae" spec: group: triggers.tekton.dev scope: Cluster @@ -524,8 +524,8 @@ metadata: labels: app.kubernetes.io/instance: default app.kubernetes.io/part-of: tekton-triggers - triggers.tekton.dev/release: "v20241107-c6d2a8dfae" - version: "v20241107-c6d2a8dfae" + triggers.tekton.dev/release: "v20241110-c6d2a8dfae" + version: "v20241110-c6d2a8dfae" spec: group: triggers.tekton.dev scope: Namespaced @@ -630,8 +630,8 @@ metadata: labels: app.kubernetes.io/instance: default app.kubernetes.io/part-of: tekton-triggers - triggers.tekton.dev/release: "v20241107-c6d2a8dfae" - version: "v20241107-c6d2a8dfae" + triggers.tekton.dev/release: "v20241110-c6d2a8dfae" + version: "v20241110-c6d2a8dfae" spec: group: triggers.tekton.dev scope: Namespaced @@ -686,8 +686,8 @@ metadata: labels: app.kubernetes.io/instance: default app.kubernetes.io/part-of: tekton-triggers - triggers.tekton.dev/release: "v20241107-c6d2a8dfae" - version: "v20241107-c6d2a8dfae" + triggers.tekton.dev/release: "v20241110-c6d2a8dfae" + version: "v20241110-c6d2a8dfae" spec: group: triggers.tekton.dev scope: Namespaced @@ -758,8 +758,8 @@ metadata: labels: app.kubernetes.io/instance: default app.kubernetes.io/part-of: tekton-triggers - triggers.tekton.dev/release: "v20241107-c6d2a8dfae" - version: "v20241107-c6d2a8dfae" + triggers.tekton.dev/release: "v20241110-c6d2a8dfae" + version: "v20241110-c6d2a8dfae" spec: group: triggers.tekton.dev scope: Namespaced @@ -832,8 +832,8 @@ metadata: labels: app.kubernetes.io/instance: default app.kubernetes.io/part-of: tekton-triggers - triggers.tekton.dev/release: "v20241107-c6d2a8dfae" - version: "v20241107-c6d2a8dfae" + triggers.tekton.dev/release: "v20241110-c6d2a8dfae" + version: "v20241110-c6d2a8dfae" spec: group: triggers.tekton.dev scope: Namespaced @@ -908,7 +908,7 @@ metadata: app.kubernetes.io/component: webhook app.kubernetes.io/instance: default app.kubernetes.io/part-of: tekton-triggers - triggers.tekton.dev/release: "v20241107-c6d2a8dfae" + triggers.tekton.dev/release: "v20241110-c6d2a8dfae" # The data is populated at install time. --- apiVersion: admissionregistration.k8s.io/v1 @@ -919,7 +919,7 @@ metadata: app.kubernetes.io/component: webhook app.kubernetes.io/instance: default app.kubernetes.io/part-of: tekton-triggers - triggers.tekton.dev/release: "v20241107-c6d2a8dfae" + triggers.tekton.dev/release: "v20241110-c6d2a8dfae" webhooks: - admissionReviewVersions: - v1 @@ -939,7 +939,7 @@ metadata: app.kubernetes.io/component: webhook app.kubernetes.io/instance: default app.kubernetes.io/part-of: tekton-triggers - triggers.tekton.dev/release: "v20241107-c6d2a8dfae" + triggers.tekton.dev/release: "v20241110-c6d2a8dfae" webhooks: - admissionReviewVersions: - v1 @@ -959,7 +959,7 @@ metadata: app.kubernetes.io/component: webhook app.kubernetes.io/instance: default app.kubernetes.io/part-of: tekton-triggers - triggers.tekton.dev/release: "v20241107-c6d2a8dfae" + triggers.tekton.dev/release: "v20241110-c6d2a8dfae" webhooks: - admissionReviewVersions: - v1 @@ -1167,7 +1167,7 @@ data: # this ConfigMap such that even if we don't have access to # other resources in the namespace we still can have access to # this ConfigMap. - version: "v20241107-c6d2a8dfae" + version: "v20241110-c6d2a8dfae" --- # Copyright 2023 Tekton Authors LLC @@ -1412,11 +1412,11 @@ metadata: app.kubernetes.io/name: controller app.kubernetes.io/component: controller app.kubernetes.io/instance: default - app.kubernetes.io/version: "v20241107-c6d2a8dfae" + app.kubernetes.io/version: "v20241110-c6d2a8dfae" app.kubernetes.io/part-of: tekton-triggers - triggers.tekton.dev/release: "v20241107-c6d2a8dfae" + triggers.tekton.dev/release: "v20241110-c6d2a8dfae" app: tekton-triggers-controller - version: "v20241107-c6d2a8dfae" + version: "v20241110-c6d2a8dfae" name: tekton-triggers-controller namespace: tekton-pipelines spec: @@ -1455,10 +1455,10 @@ metadata: app.kubernetes.io/name: controller app.kubernetes.io/component: controller app.kubernetes.io/instance: default - app.kubernetes.io/version: "v20241107-c6d2a8dfae" + app.kubernetes.io/version: "v20241110-c6d2a8dfae" app.kubernetes.io/part-of: tekton-triggers # tekton.dev/release value replaced with inputs.params.versionTag in triggers/tekton/publish.yaml - triggers.tekton.dev/release: "v20241107-c6d2a8dfae" + triggers.tekton.dev/release: "v20241110-c6d2a8dfae" spec: replicas: 1 selector: @@ -1473,18 +1473,18 @@ spec: app.kubernetes.io/name: controller app.kubernetes.io/component: controller app.kubernetes.io/instance: default - app.kubernetes.io/version: "v20241107-c6d2a8dfae" + app.kubernetes.io/version: "v20241110-c6d2a8dfae" app.kubernetes.io/part-of: tekton-triggers app: tekton-triggers-controller - triggers.tekton.dev/release: "v20241107-c6d2a8dfae" + triggers.tekton.dev/release: "v20241110-c6d2a8dfae" # version value replaced with inputs.params.versionTag in triggers/tekton/publish.yaml - version: "v20241107-c6d2a8dfae" + version: "v20241110-c6d2a8dfae" spec: serviceAccountName: tekton-triggers-controller containers: - name: tekton-triggers-controller - image: "ghcr.io/tektoncd/triggers/controller-f656ca31de179ab913fa76abc255c315:v20241107-c6d2a8dfae@sha256:4778273a5bce8802b6e127037a53e959ad606b0784cb01ac51bda325984dbebb" - args: ["-logtostderr", "-stderrthreshold", "INFO", "-el-image", "ghcr.io/tektoncd/triggers/eventlistenersink-7ad1faa98cddbcb0c24990303b220bb8:v20241107-c6d2a8dfae@sha256:d06b587d6f927874005fec90d3d2be0c119f50bb4b071e3bd89b09c2edc50e75", "-el-port", "8080", "-el-security-context=true", "-el-read-only-root-filesystem=true", "-el-events", "disable", "-el-readtimeout", "5", "-el-writetimeout", "40", "-el-idletimeout", "120", "-el-timeouthandler", "30", "-el-httpclient-readtimeout", "30", "-el-httpclient-keep-alive", "30", "-el-httpclient-tlshandshaketimeout", "10", "-el-httpclient-responseheadertimeout", "10", "-el-httpclient-expectcontinuetimeout", "1", "-period-seconds", "10", "-failure-threshold", "3"] + image: "ghcr.io/tektoncd/triggers/controller-f656ca31de179ab913fa76abc255c315:v20241110-c6d2a8dfae@sha256:ad9f8e403cfa8aafef3de9c953a0d3dbac7bd0ed524e6dd924159bcd641b9651" + args: ["-logtostderr", "-stderrthreshold", "INFO", "-el-image", "ghcr.io/tektoncd/triggers/eventlistenersink-7ad1faa98cddbcb0c24990303b220bb8:v20241110-c6d2a8dfae@sha256:f360c40a398714c7a1e8120cc63aef8279cbd4042c61994c2392f756c93133de", "-el-port", "8080", "-el-security-context=true", "-el-read-only-root-filesystem=true", "-el-events", "disable", "-el-readtimeout", "5", "-el-writetimeout", "40", "-el-idletimeout", "120", "-el-timeouthandler", "30", "-el-httpclient-readtimeout", "30", "-el-httpclient-keep-alive", "30", "-el-httpclient-tlshandshaketimeout", "10", "-el-httpclient-responseheadertimeout", "10", "-el-httpclient-expectcontinuetimeout", "1", "-period-seconds", "10", "-failure-threshold", "3"] env: - name: SYSTEM_NAMESPACE valueFrom: @@ -1539,11 +1539,11 @@ metadata: app.kubernetes.io/name: webhook app.kubernetes.io/component: webhook app.kubernetes.io/instance: default - app.kubernetes.io/version: "v20241107-c6d2a8dfae" + app.kubernetes.io/version: "v20241110-c6d2a8dfae" app.kubernetes.io/part-of: tekton-triggers app: tekton-triggers-webhook - version: "v20241107-c6d2a8dfae" - triggers.tekton.dev/release: "v20241107-c6d2a8dfae" + version: "v20241110-c6d2a8dfae" + triggers.tekton.dev/release: "v20241110-c6d2a8dfae" spec: ports: - name: https-webhook @@ -1579,10 +1579,10 @@ metadata: app.kubernetes.io/name: webhook app.kubernetes.io/component: webhook app.kubernetes.io/instance: default - app.kubernetes.io/version: "v20241107-c6d2a8dfae" + app.kubernetes.io/version: "v20241110-c6d2a8dfae" app.kubernetes.io/part-of: tekton-triggers # tekton.dev/release value replaced with inputs.params.versionTag in triggers/tekton/publish.yaml - triggers.tekton.dev/release: "v20241107-c6d2a8dfae" + triggers.tekton.dev/release: "v20241110-c6d2a8dfae" spec: replicas: 1 selector: @@ -1597,19 +1597,19 @@ spec: app.kubernetes.io/name: webhook app.kubernetes.io/component: webhook app.kubernetes.io/instance: default - app.kubernetes.io/version: "v20241107-c6d2a8dfae" + app.kubernetes.io/version: "v20241110-c6d2a8dfae" app.kubernetes.io/part-of: tekton-triggers app: tekton-triggers-webhook - triggers.tekton.dev/release: "v20241107-c6d2a8dfae" + triggers.tekton.dev/release: "v20241110-c6d2a8dfae" # version value replaced with inputs.params.versionTag in triggers/tekton/publish.yaml - version: "v20241107-c6d2a8dfae" + version: "v20241110-c6d2a8dfae" spec: serviceAccountName: tekton-triggers-webhook containers: - name: webhook # This is the Go import path for the binary that is containerized # and substituted here. - image: "ghcr.io/tektoncd/triggers/webhook-dd1edc925ee1772a9f76e2c1bc291ef6:v20241107-c6d2a8dfae@sha256:8744fbc8192d32e7e42b38174dc28b327f797872253f44ae978277edf4a2baf2" + image: "ghcr.io/tektoncd/triggers/webhook-dd1edc925ee1772a9f76e2c1bc291ef6:v20241110-c6d2a8dfae@sha256:56ee457ce486035e3328a9c6c30cb923775d2eb2fea3d765bbf7f42bd2db1d9f" env: - name: SYSTEM_NAMESPACE valueFrom: diff --git a/.konflux/olm-catalog/bundle/kodata/tekton-trigger/0.0.0-nightly/01-interceptors.yaml b/.konflux/olm-catalog/bundle/kodata/tekton-trigger/0.0.0-nightly/01-interceptors.yaml index d8c38dad7..bb82dcb86 100644 --- a/.konflux/olm-catalog/bundle/kodata/tekton-trigger/0.0.0-nightly/01-interceptors.yaml +++ b/.konflux/olm-catalog/bundle/kodata/tekton-trigger/0.0.0-nightly/01-interceptors.yaml @@ -22,7 +22,7 @@ metadata: app.kubernetes.io/component: interceptors app.kubernetes.io/instance: default app.kubernetes.io/part-of: tekton-triggers - triggers.tekton.dev/release: "v20241107-c6d2a8dfae" + triggers.tekton.dev/release: "v20241110-c6d2a8dfae" # The data is populated at install time. --- @@ -49,10 +49,10 @@ metadata: app.kubernetes.io/name: core-interceptors app.kubernetes.io/component: interceptors app.kubernetes.io/instance: default - app.kubernetes.io/version: "v20241107-c6d2a8dfae" + app.kubernetes.io/version: "v20241110-c6d2a8dfae" app.kubernetes.io/part-of: tekton-triggers # tekton.dev/release value replaced with inputs.params.versionTag in triggers/tekton/publish.yaml - triggers.tekton.dev/release: "v20241107-c6d2a8dfae" + triggers.tekton.dev/release: "v20241110-c6d2a8dfae" spec: replicas: 1 selector: @@ -67,17 +67,17 @@ spec: app.kubernetes.io/name: core-interceptors app.kubernetes.io/component: interceptors app.kubernetes.io/instance: default - app.kubernetes.io/version: "v20241107-c6d2a8dfae" + app.kubernetes.io/version: "v20241110-c6d2a8dfae" app.kubernetes.io/part-of: tekton-triggers app: tekton-triggers-core-interceptors - triggers.tekton.dev/release: "v20241107-c6d2a8dfae" + triggers.tekton.dev/release: "v20241110-c6d2a8dfae" # version value replaced with inputs.params.versionTag in triggers/tekton/publish.yaml - version: "v20241107-c6d2a8dfae" + version: "v20241110-c6d2a8dfae" spec: serviceAccountName: tekton-triggers-core-interceptors containers: - name: tekton-triggers-core-interceptors - image: "ghcr.io/tektoncd/triggers/interceptors-3176d6a3f314c3655b30bfd36e421dd5:v20241107-c6d2a8dfae@sha256:d2898b90afce06e10773af96e150f49c4d63db0ccb6ca93a466c38fa5c1ebb01" + image: "ghcr.io/tektoncd/triggers/interceptors-3176d6a3f314c3655b30bfd36e421dd5:v20241110-c6d2a8dfae@sha256:d2898b90afce06e10773af96e150f49c4d63db0ccb6ca93a466c38fa5c1ebb01" ports: - containerPort: 8443 args: ["-logtostderr", "-stderrthreshold", "INFO"] @@ -125,11 +125,11 @@ metadata: app.kubernetes.io/name: tekton-triggers-core-interceptors app.kubernetes.io/component: interceptors app.kubernetes.io/instance: default - app.kubernetes.io/version: "v20241107-c6d2a8dfae" + app.kubernetes.io/version: "v20241110-c6d2a8dfae" app.kubernetes.io/part-of: tekton-triggers - triggers.tekton.dev/release: "v20241107-c6d2a8dfae" + triggers.tekton.dev/release: "v20241110-c6d2a8dfae" app: tekton-triggers-core-interceptors - version: "v20241107-c6d2a8dfae" + version: "v20241110-c6d2a8dfae" name: tekton-triggers-core-interceptors namespace: tekton-pipelines spec: diff --git a/.konflux/olm-catalog/bundle/manifests/openshift-pipelines-operator-rh.clusterserviceversion.yaml b/.konflux/olm-catalog/bundle/manifests/openshift-pipelines-operator-rh.clusterserviceversion.yaml index 25320b4c6..10f7a3751 100644 --- a/.konflux/olm-catalog/bundle/manifests/openshift-pipelines-operator-rh.clusterserviceversion.yaml +++ b/.konflux/olm-catalog/bundle/manifests/openshift-pipelines-operator-rh.clusterserviceversion.yaml @@ -333,7 +333,7 @@ spec: - Pipelines as Code: v0.28.1 - - Tekton Chains: v0.22.2 + - Tekton Chains: v0.23.0 - Tekton Hub (tech-preview): v1.19.0 @@ -1284,11 +1284,11 @@ spec: - name: IMAGE_MAG_MANUAL_APPROVAL value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/manual-approval-gate-main/webhook@sha256:42eed05d0f681deb8d9198bf483bbeda02016c23515f061b828aec71f0ae142f - name: IMAGE_PAC_PAC_CONTROLLER - value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/pipelines-as-code-main/controller@sha256:42eed05d0f681deb8d9198bf483bbeda02016c23515f061b828aec71f0ae142f + value: quay.io/openshift-pipeline/openshift-pipelines-pipelines-as-code:1.16 - name: IMAGE_PAC_PAC_WEBHOOK - value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/pipelines-as-code-main/webhook@sha256:42eed05d0f681deb8d9198bf483bbeda02016c23515f061b828aec71f0ae142f + value: quay.io/openshift-pipeline/openshift-pipelines-pipelines-as-code:1.16 - name: IMAGE_PAC_PAC_WATCHER - value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/pipelines-as-code-main/watcher@sha256:42eed05d0f681deb8d9198bf483bbeda02016c23515f061b828aec71f0ae142f + value: quay.io/openshift-pipeline/openshift-pipelines-pipelines-as-code:1.16 - name: IMAGE_RESULTS_WATCHER value: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/tektoncd-results-main/watcher@sha256:85d472af9437cc1553f1521ef550246cfef368132b61ef0fd01fbe96b4e6f577 - name: IMAGE_RESULTS_API @@ -1521,11 +1521,11 @@ spec: name: IMAGE_MAG_TEKTON_TASKGROUP_CONTROLLER - image: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/manual-approval-gate-main/webhook@sha256:42eed05d0f681deb8d9198bf483bbeda02016c23515f061b828aec71f0ae142f name: IMAGE_MAG_MANUAL_APPROVAL - - image: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/pipelines-as-code-main/controller@sha256:42eed05d0f681deb8d9198bf483bbeda02016c23515f061b828aec71f0ae142f + - image: quay.io/openshift-pipeline/openshift-pipelines-pipelines-as-code:1.16 name: IMAGE_PAC_PAC_CONTROLLER - - image: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/pipelines-as-code-main/webhook@sha256:42eed05d0f681deb8d9198bf483bbeda02016c23515f061b828aec71f0ae142f + - image: quay.io/openshift-pipeline/openshift-pipelines-pipelines-as-code:1.16 name: IMAGE_PAC_PAC_WEBHOOK - - image: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/pipelines-as-code-main/watcher@sha256:42eed05d0f681deb8d9198bf483bbeda02016c23515f061b828aec71f0ae142f + - image: quay.io/openshift-pipeline/openshift-pipelines-pipelines-as-code:1.16 name: IMAGE_PAC_PAC_WATCHER - image: quay.io/redhat-user-workloads/tekton-ecosystem-tenant/tektoncd-results-main/watcher@sha256:85d472af9437cc1553f1521ef550246cfef368132b61ef0fd01fbe96b4e6f577 name: IMAGE_RESULTS_WATCHER diff --git a/head b/head index f8ecdd23b..c6ba29c1f 100644 --- a/head +++ b/head @@ -1 +1 @@ -7ffbd7a136d13e79956e14f618f213bf129a3455 +18dee15ecfdd52bc7dda80804f3a0fcc67f47110 diff --git a/upstream/components.yaml b/upstream/components.yaml index 69de6cd35..e0332878d 100644 --- a/upstream/components.yaml +++ b/upstream/components.yaml @@ -1,6 +1,6 @@ chains: github: tektoncd/chains - version: v0.22.2 + version: v0.23.0 dashboard: github: tektoncd/dashboard version: v0.52.0 diff --git a/upstream/operatorhub/openshift/manifests/bases/openshift-pipelines-operator-rh.clusterserviceversion.template.yaml b/upstream/operatorhub/openshift/manifests/bases/openshift-pipelines-operator-rh.clusterserviceversion.template.yaml index 310182c2e..8bb98dc8a 100644 --- a/upstream/operatorhub/openshift/manifests/bases/openshift-pipelines-operator-rh.clusterserviceversion.template.yaml +++ b/upstream/operatorhub/openshift/manifests/bases/openshift-pipelines-operator-rh.clusterserviceversion.template.yaml @@ -312,7 +312,7 @@ spec: - Tekton Pipelines: v0.65.1 - Tekton Triggers: v0.30.0 - Pipelines as Code: v0.28.1 - - Tekton Chains: v0.22.2 + - Tekton Chains: v0.23.0 - Tekton Hub (tech-preview): v1.19.0 - Tekton Results (tech-preview): v0.12.2 - Manual Approval Gate (tech-preview): v0.4.0 diff --git a/upstream/pkg/reconciler/kubernetes/tektoninstallerset/client/create.go b/upstream/pkg/reconciler/kubernetes/tektoninstallerset/client/create.go index 556420b5e..09229d27f 100644 --- a/upstream/pkg/reconciler/kubernetes/tektoninstallerset/client/create.go +++ b/upstream/pkg/reconciler/kubernetes/tektoninstallerset/client/create.go @@ -60,7 +60,7 @@ func (i *InstallerSetClient) create(ctx context.Context, comp v1alpha1.TektonCom func (i *InstallerSetClient) makeMainSets(ctx context.Context, comp v1alpha1.TektonComponent, manifest *mf.Manifest) ([]v1alpha1.TektonInstallerSet, error) { staticManifest := manifest.Filter(mf.Not(mf.ByKind("Deployment")), mf.Not(mf.ByKind("Service"))) deploymentManifest := manifest.Filter(mf.Any(mf.ByKind("Deployment"), mf.ByKind("Service"))) - statefulSetManifest := manifest.Filter(mf.Any(mf.ByKind("StatefulSet"), mf.ByKind("Service"))) + statefulSetManifest := manifest.Filter(mf.Any(mf.ByKind("StatefulSet"), mf.Any(mf.ByKind("Deployment")), mf.ByKind("Service"))) kind := strings.ToLower(strings.TrimPrefix(i.resourceKind, "Tekton")) staticName := fmt.Sprintf("%s-%s-%s-", kind, InstallerTypeMain, InstallerSubTypeStatic) diff --git a/upstream/pkg/reconciler/kubernetes/tektonpipeline/transform.go b/upstream/pkg/reconciler/kubernetes/tektonpipeline/transform.go index ac6de3771..3f0200f5d 100644 --- a/upstream/pkg/reconciler/kubernetes/tektonpipeline/transform.go +++ b/upstream/pkg/reconciler/kubernetes/tektonpipeline/transform.go @@ -43,7 +43,8 @@ const ( clusterResolverConfig = "cluster-resolver-config" hubResolverConfig = "hubresolver-config" gitResolverConfig = "git-resolver-config" - leaderElectionConfig = "config-leader-election-controller" + leaderElectionPipelineConfig = "config-leader-election-controller" + leaderElectionResolversConfig = "config-leader-election-resolvers" pipelinesControllerDeployment = "tekton-pipelines-controller" pipelinesControllerContainer = "tekton-pipelines-controller" pipelinesRemoteResolversControllerDeployment = "tekton-pipelines-remote-resolvers" @@ -53,6 +54,8 @@ const ( tektonPipelinesControllerName = "tekton-pipelines-controller" tektonPipelinesServiceName = "tekton-pipelines-controller" + tektonRemoteResolversControllerName = "tekton-pipelines-remote-resolvers" + tektonRemoteResolversServiceName = "tekton-pipelines-remote-resolvers" tektonPipelinesControllerStatefulServiceName = "STATEFUL_SERVICE_NAME" tektonPipelinesControllerStatefulControllerOrdinal = "STATEFUL_CONTROLLER_ORDINAL" ) @@ -83,13 +86,17 @@ func filterAndTransform(extension common.Extension) client.FilterAndTransform { common.CopyConfigMap(hubResolverConfig, pipeline.Spec.HubResolverConfig), common.CopyConfigMap(clusterResolverConfig, pipeline.Spec.ClusterResolverConfig), common.CopyConfigMap(gitResolverConfig, pipeline.Spec.GitResolverConfig), - common.AddConfigMapValues(leaderElectionConfig, pipeline.Spec.Performance.PipelinePerformanceLeaderElectionConfig), - updatePerformanceFlagsInDeployment(pipeline), + common.AddConfigMapValues(leaderElectionPipelineConfig, pipeline.Spec.Performance.PipelinePerformanceLeaderElectionConfig), + common.AddConfigMapValues(leaderElectionResolversConfig, pipeline.Spec.Performance.PipelinePerformanceLeaderElectionConfig), + updatePerformanceFlagsInDeploymentAndLeaderConfigMap(pipeline, leaderElectionPipelineConfig, pipelinesControllerDeployment, pipelinesControllerContainer), + updatePerformanceFlagsInDeploymentAndLeaderConfigMap(pipeline, leaderElectionResolversConfig, pipelinesRemoteResolversControllerDeployment, pipelinesRemoteResolverControllerContainer), updateResolverConfigEnvironmentsInDeployment(pipeline), } if pipeline.Spec.Performance.StatefulsetOrdinals != nil && *pipeline.Spec.Performance.StatefulsetOrdinals { extra = append(extra, common.ConvertDeploymentToStatefulSet(tektonPipelinesControllerName, tektonPipelinesServiceName), common.AddStatefulEnvVars( tektonPipelinesControllerName, tektonPipelinesServiceName, tektonPipelinesControllerStatefulServiceName, tektonPipelinesControllerStatefulControllerOrdinal)) + extra = append(extra, common.ConvertDeploymentToStatefulSet(tektonRemoteResolversControllerName, tektonRemoteResolversServiceName), common.AddStatefulEnvVars( + tektonRemoteResolversControllerName, tektonRemoteResolversServiceName, tektonPipelinesControllerStatefulServiceName, tektonPipelinesControllerStatefulControllerOrdinal)) } trns = append(trns, extra...) @@ -108,10 +115,10 @@ func filterAndTransform(extension common.Extension) client.FilterAndTransform { } } -// updates performance flags/args into pipelines controller container -func updatePerformanceFlagsInDeployment(pipelineCR *v1alpha1.TektonPipeline) mf.Transformer { +// updates performance flags/args into deployment and container given as args +func updatePerformanceFlagsInDeploymentAndLeaderConfigMap(pipelineCR *v1alpha1.TektonPipeline, leaderConfig, deploymentName, containerName string) mf.Transformer { return func(u *unstructured.Unstructured) error { - if u.GetKind() != "Deployment" || u.GetName() != pipelinesControllerDeployment { + if u.GetKind() != "Deployment" || u.GetName() != deploymentName { return nil } @@ -151,7 +158,7 @@ func updatePerformanceFlagsInDeployment(pipelineCR *v1alpha1.TektonPipeline) mf. labelKeys := getSortedKeys(leaderElectionConfigMapData) for _, key := range labelKeys { value := leaderElectionConfigMapData[key] - labelKey := fmt.Sprintf("%s.data.%s", leaderElectionConfig, key) + labelKey := fmt.Sprintf("%s.data.%s", leaderConfig, key) podLabels[labelKey] = fmt.Sprintf("%v", value) } dep.Spec.Template.Labels = podLabels @@ -170,13 +177,18 @@ func updatePerformanceFlagsInDeployment(pipelineCR *v1alpha1.TektonPipeline) mf. flagKeys := getSortedKeys(flags) // update performance arguments into target container for containerIndex, container := range dep.Spec.Template.Spec.Containers { - if container.Name != pipelinesControllerContainer { + if container.Name != containerName { continue } for _, flagKey := range flagKeys { // update the arg name with "-" prefix expectedArg := fmt.Sprintf("-%s", flagKey) argStringValue := fmt.Sprintf("%v", flags[flagKey]) + // skip deprecated disable-ha flag if not pipelinesControllerDeployment + // should be removed when the flag is removed from pipelines controller + if deploymentName != pipelinesControllerDeployment && flagKey == "disable-ha" { + continue + } argUpdated := false for argIndex, existingArg := range container.Args { if strings.HasPrefix(existingArg, expectedArg) { diff --git a/upstream/pkg/reconciler/kubernetes/tektonpipeline/transform_test.go b/upstream/pkg/reconciler/kubernetes/tektonpipeline/transform_test.go index 7df57dcfd..e8a661d45 100644 --- a/upstream/pkg/reconciler/kubernetes/tektonpipeline/transform_test.go +++ b/upstream/pkg/reconciler/kubernetes/tektonpipeline/transform_test.go @@ -36,7 +36,7 @@ import ( "knative.dev/pkg/ptr" ) -func TestUpdatePerformanceFlagsInDeployment(t *testing.T) { +func TestUpdatePerformanceFlagsInDeploymentAndLeaderConfigMap(t *testing.T) { pipelineCR := &v1alpha1.TektonPipeline{ ObjectMeta: metav1.ObjectMeta{ Name: "pipeline", @@ -111,7 +111,7 @@ func TestUpdatePerformanceFlagsInDeployment(t *testing.T) { assert.NilError(t, err) // apply transformer - transformer := updatePerformanceFlagsInDeployment(pipelineCR) + transformer := updatePerformanceFlagsInDeploymentAndLeaderConfigMap(pipelineCR, leaderElectionPipelineConfig, pipelinesControllerDeployment, pipelinesControllerContainer) err = transformer(ud) assert.NilError(t, err) diff --git a/upstream/test/resources/statefulset.go b/upstream/test/resources/statefulset.go index 11767edf7..e08664a70 100644 --- a/upstream/test/resources/statefulset.go +++ b/upstream/test/resources/statefulset.go @@ -40,31 +40,29 @@ func DeleteAndVerifyStatefulSet(t *testing.T, clients *utils.Clients, namespace, t.Fatalf("No StatefulSet under the namespace %q was found", namespace) } - // Delete the first StatefulSet and verify the operator recreates it - statefulSet := stsList.Items[0] - err = clients.KubeClient.AppsV1().StatefulSets(statefulSet.Namespace).Delete(context.TODO(), statefulSet.Name, metav1.DeleteOptions{}) - if err != nil { - t.Fatalf("Failed to delete StatefulSet %s/%s: %v", statefulSet.Namespace, statefulSet.Name, err) - } - - // Poll and wait for the StatefulSet to be recreated and ready - waitErr := wait.PollUntilContextTimeout(context.TODO(), utils.Interval, utils.Timeout, true, func(ctx context.Context) (bool, error) { - sts, err := clients.KubeClient. - AppsV1().StatefulSets(statefulSet.Namespace).Get(context.TODO(), statefulSet.Name, metav1.GetOptions{}) + // Delete each StatefulSet and verify the operator recreates it + for _, statefulSet := range stsList.Items { + err = clients.KubeClient.AppsV1().StatefulSets(statefulSet.Namespace).Delete(context.TODO(), statefulSet.Name, metav1.DeleteOptions{}) if err != nil { - // If the StatefulSet is not found, we continue to wait for it to be recreated. - if apierrs.IsNotFound(err) { - return false, nil - } - return false, err + t.Fatalf("Failed to delete StatefulSet %s/%s: %v", statefulSet.Namespace, statefulSet.Name, err) } + } + // Poll and wait for each StatefulSet to be recreated and ready + for _, statefulSet := range stsList.Items { + waitErr := wait.PollUntilContextTimeout(context.TODO(), utils.Interval, utils.Timeout, true, func(ctx context.Context) (bool, error) { + sts, err := clients.KubeClient.AppsV1().StatefulSets(statefulSet.Namespace).Get(context.TODO(), statefulSet.Name, metav1.GetOptions{}) + if err != nil { + if apierrs.IsNotFound(err) { + return false, nil + } + return false, err + } + return IsStatefulSetAvailable(sts) + }) - // Check if the StatefulSet is available - return IsStatefulSetAvailable(sts) - }) - - if waitErr != nil { - t.Fatalf("The StatefulSet %s/%s failed to reach the desired state: %v", statefulSet.Namespace, statefulSet.Name, waitErr) + if waitErr != nil { + t.Fatalf("The StatefulSet %s/%s failed to reach the desired state: %v", statefulSet.Namespace, statefulSet.Name, waitErr) + } } }