Skip to content

Commit e62f7d2

Browse files
authored
Merge branch 'main' into add_fallback_strategy_for_per_node_strategy
2 parents 6f757c3 + 49710a9 commit e62f7d2

5 files changed

+20
-4
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: enhancement
3+
4+
# The name of the component, or a single word describing the area of concern, (e.g. collector, target allocator, auto-instrumentation, opamp, github action)
5+
component: operator
6+
7+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8+
note: Replace references to gcr.io/kubebuilder/kube-rbac-proxy with quay.io/brancz/kube-rbac-proxy
9+
10+
# One or more tracking issues related to the change
11+
issues: [3485]
12+
13+
# (Optional) One or more lines of additional information to render under the primary note.
14+
# These lines will be padded with 2 spaces and then inserted directly into the document.
15+
# Use pipe (|) for multiline entries.
16+
subtext:

bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ spec:
514514
- --upstream=http://127.0.0.1:8080/
515515
- --logtostderr=true
516516
- --v=0
517-
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1
517+
image: quay.io/brancz/kube-rbac-proxy:v0.13.1
518518
name: kube-rbac-proxy
519519
ports:
520520
- containerPort: 8443

bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ spec:
522522
- --tls-private-key-file=/var/run/tls/server/tls.key
523523
- --tls-cipher-suites=TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_CBC_SHA256
524524
- --tls-min-version=VersionTLS12
525-
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1
525+
image: quay.io/brancz/kube-rbac-proxy:v0.13.1
526526
name: kube-rbac-proxy
527527
ports:
528528
- containerPort: 8443

config/default/manager_auth_proxy_patch.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
spec:
1111
containers:
1212
- name: kube-rbac-proxy
13-
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1
13+
image: quay.io/brancz/kube-rbac-proxy:v0.13.1
1414
args:
1515
- "--secure-listen-address=0.0.0.0:8443"
1616
- "--upstream=http://127.0.0.1:8080/"

tests/e2e-upgrade/upgrade-test/opentelemetry-operator-v0.86.0.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8348,7 +8348,7 @@ spec:
83488348
- --upstream=http://127.0.0.1:8080/
83498349
- --logtostderr=true
83508350
- --v=0
8351-
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1
8351+
image: quay.io/brancz/kube-rbac-proxy:v0.13.1
83528352
name: kube-rbac-proxy
83538353
ports:
83548354
- containerPort: 8443

0 commit comments

Comments
 (0)