Skip to content

Commit e543724

Browse files
fix(opensearch-operator): use values.yaml override instead of patch
Move the kube-rbac-proxy image override from a patch + vendored-chart edit to a values.yaml override under kubeRbacProxy.image.repository. This matches the project convention documented in docs/agents/overview.md ("Override configuration in root values.yaml") and the pattern used by sibling packages such as kamaji. Assisted-By: Claude <[email protected]> Signed-off-by: Myasnikov Daniil <[email protected]>
1 parent d0a0b06 commit e543724

4 files changed

Lines changed: 5 additions & 13 deletions

File tree

‎packages/system/opensearch-operator/Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@ update:
88
helm repo add opensearch-operator https://opensearch-project.github.io/opensearch-k8s-operator/
99
helm repo update opensearch-operator
1010
helm pull opensearch-operator/opensearch-operator --version 2.8.0 --untar --untardir charts
11-
patch --no-backup-if-mismatch -p4 < patches/fix-kube-rbac-proxy-image.patch

‎packages/system/opensearch-operator/charts/opensearch-operator/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ kubeRbacProxy:
113113
initialDelaySeconds: 10
114114

115115
image:
116-
repository: "quay.io/brancz/kube-rbac-proxy"
116+
repository: "gcr.io/kubebuilder/kube-rbac-proxy"
117117
tag: "v0.15.0"
118118

119119
## If this is set to true, RoleBindings will be used instead of ClusterRoleBindings, inorder to restrict ClusterRoles

‎packages/system/opensearch-operator/patches/fix-kube-rbac-proxy-image.patch‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎packages/system/opensearch-operator/values.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,7 @@ opensearch-operator:
22
manager:
33
# Enable cluster-wide mode to watch all namespaces
44
watchNamespace: ""
5+
kubeRbacProxy:
6+
image:
7+
# gcr.io/kubebuilder/kube-rbac-proxy was sunset; use the original upstream
8+
repository: "quay.io/brancz/kube-rbac-proxy"

0 commit comments

Comments
 (0)