fix(chart): make the openshift flavor functional and align with kustomize #3945
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -48,6 +48,10 @@ spec: | |
| value: tekton-operator | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- if .Values.openshift.enabled }} | ||
| - name: PLATFORM | ||
| value: openshift | ||
| {{- end }} | ||
| - name: IMAGE_PIPELINES_PROXY | ||
| value: {{ include "tekton-operator.webhook-proxy-image" . }} | ||
| - name: IMAGE_JOB_PRUNER_TKN | ||
|
|
@@ -209,6 +213,10 @@ spec: | |
| valueFrom: | ||
| fieldRef: | ||
| fieldPath: metadata.namespace | ||
| {{- if .Values.openshift.enabled }} | ||
| - name: PLATFORM | ||
|
Member
There was a problem hiding this comment. The OpenShift branches in
Contributor
Author
There was a problem hiding this comment. Addressed in 59d667f: the openshift webhook and proxy-webhook image helpers now select the openshift image repositories, digest-pinned from the v0.81.0 openshift release. |
||
| value: openshift | ||
| {{- end }} | ||
| - name: CONFIG_LOGGING_NAME | ||
| value: {{ include "tekton-operator.fullname" . }}-config-logging | ||
| - name: WEBHOOK_POD_NAME | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
PLATFORMdoes not switch the compiled operator binary. The OpenShift branch in_helpers.tplstill selects the Kubernetes operator image. The correct OpenShift binary also rejects the defaulttektondashboardcontroller. Please make the image and controller defaults flavor-aware, or narrow the PR title, description, and release note.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Addressed in 59d667f: the openshift branches of the image helpers now select the openshift operator/webhook/proxy images (digest-pinned from the v0.81.0 openshift release), and the
-controllersflag gets a flavor-aware default matching config/openshift/base/operator.yaml (tektonaddon and syncerservice instead of tektondashboard, plus tektonscheduler and tektonmulticlusterproxyaae). IMAGE_ADDONS_* is deliberately not set — defaults come from the operator's built-in manifests and TEKTON_REGISTRY_OVERRIDE covers registry rewrites; noted in values.yaml and the PR description.