Skip to content

Commit adc7dde

Browse files
tolushatolusha
authored
chore: Update quay.io/oauth2-proxy/oauth2-proxy and quay.io/brancz/ku… (#2124)
* chore: Update quay.io/oauth2-proxy/oauth2-proxy and quay.io/brancz/kube-rbac-proxy images Signed-off-by: Anatolii Bazko <abazko@redhat.com>
1 parent 518bd8a commit adc7dde

10 files changed

Lines changed: 43 additions & 77 deletions

File tree

‎bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ metadata:
8686
categories: Developer Tools
8787
certified: "false"
8888
containerImage: quay.io/eclipse/che-operator:next
89-
createdAt: "2026-05-15T10:45:47Z"
89+
createdAt: "2026-05-21T07:42:52Z"
9090
description: A Kube-native development solution that delivers portable and collaborative
9191
developer workspaces.
9292
features.operators.openshift.io/cnf: "false"
@@ -108,7 +108,7 @@ metadata:
108108
operatorframework.io/arch.amd64: supported
109109
operatorframework.io/arch.arm64: supported
110110
operatorframework.io/os.linux: supported
111-
name: eclipse-che.v7.118.0-980.next
111+
name: eclipse-che.v7.118.0-986.next
112112
namespace: placeholder
113113
spec:
114114
apiservicedefinitions: {}
@@ -978,13 +978,11 @@ spec:
978978
- name: RELATED_IMAGE_single_host_gateway_config_sidecar
979979
value: quay.io/che-incubator/configbump:next
980980
- name: RELATED_IMAGE_gateway_authentication_sidecar
981-
value: quay.io/openshift/origin-oauth-proxy:4.9
982-
- name: RELATED_IMAGE_gateway_authorization_sidecar
983-
value: quay.io/openshift/origin-kube-rbac-proxy:4.9
981+
value: quay.io/openshift/origin-oauth-proxy:4.22
984982
- name: RELATED_IMAGE_gateway_authentication_sidecar_k8s
985-
value: quay.io/oauth2-proxy/oauth2-proxy:v7.6.0
986-
- name: RELATED_IMAGE_gateway_authorization_sidecar_k8s
987-
value: quay.io/brancz/kube-rbac-proxy:v0.13.1
983+
value: quay.io/oauth2-proxy/oauth2-proxy:v7.15.2
984+
- name: RELATED_IMAGE_gateway_authorization_sidecar
985+
value: quay.io/brancz/kube-rbac-proxy:v0.22.0
988986
- name: RELATED_IMAGE_gateway_header_sidecar
989987
value: quay.io/che-incubator/header-rewrite-proxy:latest
990988
- name: CHE_FLAVOR
@@ -1146,17 +1144,15 @@ spec:
11461144
name: single-host-gateway
11471145
- image: quay.io/che-incubator/configbump:next
11481146
name: single-host-gateway-config-sidecar
1149-
- image: quay.io/openshift/origin-oauth-proxy:4.9
1147+
- image: quay.io/openshift/origin-oauth-proxy:4.22
11501148
name: gateway-authentication-sidecar
1151-
- image: quay.io/openshift/origin-kube-rbac-proxy:4.9
1152-
name: gateway-authorization-sidecar
1153-
- image: quay.io/oauth2-proxy/oauth2-proxy:v7.6.0
1149+
- image: quay.io/oauth2-proxy/oauth2-proxy:v7.15.2
11541150
name: gateway-authentication-sidecar-k8s
1155-
- image: quay.io/brancz/kube-rbac-proxy:v0.13.1
1156-
name: gateway-authorization-sidecar-k8s
1151+
- image: quay.io/brancz/kube-rbac-proxy:v0.22.0
1152+
name: gateway-authorization-sidecar
11571153
- image: quay.io/che-incubator/header-rewrite-proxy:latest
11581154
name: gateway-header-sidecar
1159-
version: 7.118.0-980.next
1155+
version: 7.118.0-986.next
11601156
webhookdefinitions:
11611157
- admissionReviewVersions:
11621158
- v1

‎config/manager/manager.yaml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,11 @@ spec:
7474
- name: RELATED_IMAGE_single_host_gateway_config_sidecar
7575
value: quay.io/che-incubator/configbump:next
7676
- name: RELATED_IMAGE_gateway_authentication_sidecar
77-
value: quay.io/openshift/origin-oauth-proxy:4.9
78-
- name: RELATED_IMAGE_gateway_authorization_sidecar
79-
value: quay.io/openshift/origin-kube-rbac-proxy:4.9
77+
value: quay.io/openshift/origin-oauth-proxy:4.22
8078
- name: RELATED_IMAGE_gateway_authentication_sidecar_k8s
81-
value: quay.io/oauth2-proxy/oauth2-proxy:v7.6.0
82-
- name: RELATED_IMAGE_gateway_authorization_sidecar_k8s
83-
value: quay.io/brancz/kube-rbac-proxy:v0.13.1
79+
value: quay.io/oauth2-proxy/oauth2-proxy:v7.15.2
80+
- name: RELATED_IMAGE_gateway_authorization_sidecar
81+
value: quay.io/brancz/kube-rbac-proxy:v0.22.0
8482
- name: RELATED_IMAGE_gateway_header_sidecar
8583
value: quay.io/che-incubator/header-rewrite-proxy:latest
8684
- name: CHE_FLAVOR

‎deploy/deployment/kubernetes/combined.yaml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23722,13 +23722,11 @@ spec:
2372223722
- name: RELATED_IMAGE_single_host_gateway_config_sidecar
2372323723
value: quay.io/che-incubator/configbump:next
2372423724
- name: RELATED_IMAGE_gateway_authentication_sidecar
23725-
value: quay.io/openshift/origin-oauth-proxy:4.9
23726-
- name: RELATED_IMAGE_gateway_authorization_sidecar
23727-
value: quay.io/openshift/origin-kube-rbac-proxy:4.9
23725+
value: quay.io/openshift/origin-oauth-proxy:4.22
2372823726
- name: RELATED_IMAGE_gateway_authentication_sidecar_k8s
23729-
value: quay.io/oauth2-proxy/oauth2-proxy:v7.6.0
23730-
- name: RELATED_IMAGE_gateway_authorization_sidecar_k8s
23731-
value: quay.io/brancz/kube-rbac-proxy:v0.13.1
23727+
value: quay.io/oauth2-proxy/oauth2-proxy:v7.15.2
23728+
- name: RELATED_IMAGE_gateway_authorization_sidecar
23729+
value: quay.io/brancz/kube-rbac-proxy:v0.22.0
2373223730
- name: RELATED_IMAGE_gateway_header_sidecar
2373323731
value: quay.io/che-incubator/header-rewrite-proxy:latest
2373423732
- name: CHE_FLAVOR

‎deploy/deployment/kubernetes/objects/che-operator.Deployment.yaml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,11 @@ spec:
6868
- name: RELATED_IMAGE_single_host_gateway_config_sidecar
6969
value: quay.io/che-incubator/configbump:next
7070
- name: RELATED_IMAGE_gateway_authentication_sidecar
71-
value: quay.io/openshift/origin-oauth-proxy:4.9
72-
- name: RELATED_IMAGE_gateway_authorization_sidecar
73-
value: quay.io/openshift/origin-kube-rbac-proxy:4.9
71+
value: quay.io/openshift/origin-oauth-proxy:4.22
7472
- name: RELATED_IMAGE_gateway_authentication_sidecar_k8s
75-
value: quay.io/oauth2-proxy/oauth2-proxy:v7.6.0
76-
- name: RELATED_IMAGE_gateway_authorization_sidecar_k8s
77-
value: quay.io/brancz/kube-rbac-proxy:v0.13.1
73+
value: quay.io/oauth2-proxy/oauth2-proxy:v7.15.2
74+
- name: RELATED_IMAGE_gateway_authorization_sidecar
75+
value: quay.io/brancz/kube-rbac-proxy:v0.22.0
7876
- name: RELATED_IMAGE_gateway_header_sidecar
7977
value: quay.io/che-incubator/header-rewrite-proxy:latest
8078
- name: CHE_FLAVOR

‎deploy/deployment/openshift/combined.yaml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23724,13 +23724,11 @@ spec:
2372423724
- name: RELATED_IMAGE_single_host_gateway_config_sidecar
2372523725
value: quay.io/che-incubator/configbump:next
2372623726
- name: RELATED_IMAGE_gateway_authentication_sidecar
23727-
value: quay.io/openshift/origin-oauth-proxy:4.9
23728-
- name: RELATED_IMAGE_gateway_authorization_sidecar
23729-
value: quay.io/openshift/origin-kube-rbac-proxy:4.9
23727+
value: quay.io/openshift/origin-oauth-proxy:4.22
2373023728
- name: RELATED_IMAGE_gateway_authentication_sidecar_k8s
23731-
value: quay.io/oauth2-proxy/oauth2-proxy:v7.6.0
23732-
- name: RELATED_IMAGE_gateway_authorization_sidecar_k8s
23733-
value: quay.io/brancz/kube-rbac-proxy:v0.13.1
23729+
value: quay.io/oauth2-proxy/oauth2-proxy:v7.15.2
23730+
- name: RELATED_IMAGE_gateway_authorization_sidecar
23731+
value: quay.io/brancz/kube-rbac-proxy:v0.22.0
2373423732
- name: RELATED_IMAGE_gateway_header_sidecar
2373523733
value: quay.io/che-incubator/header-rewrite-proxy:latest
2373623734
- name: CHE_FLAVOR

‎deploy/deployment/openshift/objects/che-operator.Deployment.yaml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,11 @@ spec:
6868
- name: RELATED_IMAGE_single_host_gateway_config_sidecar
6969
value: quay.io/che-incubator/configbump:next
7070
- name: RELATED_IMAGE_gateway_authentication_sidecar
71-
value: quay.io/openshift/origin-oauth-proxy:4.9
72-
- name: RELATED_IMAGE_gateway_authorization_sidecar
73-
value: quay.io/openshift/origin-kube-rbac-proxy:4.9
71+
value: quay.io/openshift/origin-oauth-proxy:4.22
7472
- name: RELATED_IMAGE_gateway_authentication_sidecar_k8s
75-
value: quay.io/oauth2-proxy/oauth2-proxy:v7.6.0
76-
- name: RELATED_IMAGE_gateway_authorization_sidecar_k8s
77-
value: quay.io/brancz/kube-rbac-proxy:v0.13.1
73+
value: quay.io/oauth2-proxy/oauth2-proxy:v7.15.2
74+
- name: RELATED_IMAGE_gateway_authorization_sidecar
75+
value: quay.io/brancz/kube-rbac-proxy:v0.22.0
7876
- name: RELATED_IMAGE_gateway_header_sidecar
7977
value: quay.io/che-incubator/header-rewrite-proxy:latest
8078
- name: CHE_FLAVOR

‎helmcharts/next/templates/che-operator.Deployment.yaml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,11 @@ spec:
6868
- name: RELATED_IMAGE_single_host_gateway_config_sidecar
6969
value: quay.io/che-incubator/configbump:next
7070
- name: RELATED_IMAGE_gateway_authentication_sidecar
71-
value: quay.io/openshift/origin-oauth-proxy:4.9
72-
- name: RELATED_IMAGE_gateway_authorization_sidecar
73-
value: quay.io/openshift/origin-kube-rbac-proxy:4.9
71+
value: quay.io/openshift/origin-oauth-proxy:4.22
7472
- name: RELATED_IMAGE_gateway_authentication_sidecar_k8s
75-
value: quay.io/oauth2-proxy/oauth2-proxy:v7.6.0
76-
- name: RELATED_IMAGE_gateway_authorization_sidecar_k8s
77-
value: quay.io/brancz/kube-rbac-proxy:v0.13.1
73+
value: quay.io/oauth2-proxy/oauth2-proxy:v7.15.2
74+
- name: RELATED_IMAGE_gateway_authorization_sidecar
75+
value: quay.io/brancz/kube-rbac-proxy:v0.22.0
7876
- name: RELATED_IMAGE_gateway_header_sidecar
7977
value: quay.io/che-incubator/header-rewrite-proxy:latest
8078
- name: CHE_FLAVOR

‎pkg/common/operator-defaults/defaults.go‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ var (
3636
defaultSingleHostGatewayImage string
3737
defaultSingleHostGatewayConfigSidecarImage string
3838
defaultGatewayKubernetesAuthenticationSidecarImage string
39-
defaultGatewayKubernetesAuthorizationSidecarImage string
4039
defaultGatewayOpenShiftAuthenticationSidecarImage string
41-
defaultGatewayOpenShiftAuthorizationSidecarImage string
40+
defaultGatewayAuthorizationSidecarImage string
4241
defaultConsoleLinkName string
4342
defaultConsoleLinkDisplayName string
4443
defaultConsoleLinkSection string
@@ -99,10 +98,9 @@ func Initialize() {
9998
defaultSingleHostGatewayImage = ensureEnv(util.GetArchitectureDependentEnvName("RELATED_IMAGE_single_host_gateway"))
10099
defaultSingleHostGatewayConfigSidecarImage = ensureEnv(util.GetArchitectureDependentEnvName("RELATED_IMAGE_single_host_gateway_config_sidecar"))
101100

101+
defaultGatewayAuthorizationSidecarImage = ensureEnv(util.GetArchitectureDependentEnvName("RELATED_IMAGE_gateway_authorization_sidecar"))
102102
defaultGatewayOpenShiftAuthenticationSidecarImage = ensureEnv(util.GetArchitectureDependentEnvName("RELATED_IMAGE_gateway_authentication_sidecar"))
103-
defaultGatewayOpenShiftAuthorizationSidecarImage = ensureEnv(util.GetArchitectureDependentEnvName("RELATED_IMAGE_gateway_authorization_sidecar"))
104103
defaultGatewayKubernetesAuthenticationSidecarImage = ensureEnv(util.GetArchitectureDependentEnvName("RELATED_IMAGE_gateway_authentication_sidecar_k8s"))
105-
defaultGatewayKubernetesAuthorizationSidecarImage = ensureEnv(util.GetArchitectureDependentEnvName("RELATED_IMAGE_gateway_authorization_sidecar_k8s"))
106104

107105
// Don't get some k8s specific env
108106
if !infrastructure.IsOpenShift() {
@@ -186,14 +184,6 @@ func GetGatewayKubernetesAuthenticationSidecarImage(checluster interface{}) stri
186184
return PatchDefaultImageName(checluster, defaultGatewayKubernetesAuthenticationSidecarImage)
187185
}
188186

189-
func GetGatewayKubernetesAuthorizationSidecarImage(checluster interface{}) string {
190-
if !initialized {
191-
Initialize()
192-
}
193-
194-
return PatchDefaultImageName(checluster, defaultGatewayKubernetesAuthorizationSidecarImage)
195-
}
196-
197187
func GetGatewayOpenShiftAuthenticationSidecarImage(checluster interface{}) string {
198188
if !initialized {
199189
Initialize()
@@ -202,12 +192,12 @@ func GetGatewayOpenShiftAuthenticationSidecarImage(checluster interface{}) strin
202192
return PatchDefaultImageName(checluster, defaultGatewayOpenShiftAuthenticationSidecarImage)
203193
}
204194

205-
func GetGatewayOpenShiftAuthorizationSidecarImage(checluster interface{}) string {
195+
func GetGatewayAuthorizationSidecarImage(checluster interface{}) string {
206196
if !initialized {
207197
Initialize()
208198
}
209199

210-
return PatchDefaultImageName(checluster, defaultGatewayOpenShiftAuthorizationSidecarImage)
200+
return PatchDefaultImageName(checluster, defaultGatewayAuthorizationSidecarImage)
211201
}
212202

213203
func GetCheFlavor() string {

‎pkg/deploy/gateway/gateway_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ func TestCustomizeGatewayDeploymentSingleImage(t *testing.T) {
265265
assert.Equal(t, defaults.GetGatewayOpenShiftAuthenticationSidecarImage(checluster), containers[2].Image)
266266

267267
assert.Equal(t, constants.GatewayAuthorizationContainerName, containers[3].Name)
268-
assert.Equal(t, defaults.GetGatewayOpenShiftAuthorizationSidecarImage(checluster), containers[3].Image)
268+
assert.Equal(t, defaults.GetGatewayAuthorizationSidecarImage(checluster), containers[3].Image)
269269
}
270270

271271
func TestTraefikLogLevel(t *testing.T) {
@@ -325,7 +325,7 @@ func TestKubeRbacProxyLogLevel(t *testing.T) {
325325

326326
containers := deployment.Spec.Template.Spec.Containers
327327
assert.Equal(t, constants.GatewayAuthorizationContainerName, containers[3].Name)
328-
assert.Equal(t, "--v=10", containers[3].Args[4])
328+
assert.Equal(t, "--v=10", containers[3].Args[3])
329329
}
330330

331331
func TestKubeRbacProxyLogLevelDefault(t *testing.T) {
@@ -336,5 +336,5 @@ func TestKubeRbacProxyLogLevelDefault(t *testing.T) {
336336

337337
containers := deployment.Spec.Template.Spec.Containers
338338
assert.Equal(t, constants.GatewayAuthorizationContainerName, containers[3].Name)
339-
assert.Equal(t, "--v=0", containers[3].Args[4])
339+
assert.Equal(t, "--v=0", containers[3].Args[3])
340340
}

‎pkg/deploy/gateway/kube_rbac_proxy.go‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
"strconv"
1717

1818
"github.com/eclipse-che/che-operator/pkg/common/chetypes"
19-
"github.com/eclipse-che/che-operator/pkg/common/infrastructure"
2019
"k8s.io/apimachinery/pkg/util/intstr"
2120

2221
chev2 "github.com/eclipse-che/che-operator/api/v2"
@@ -55,26 +54,19 @@ authorization:
5554
}
5655

5756
func getKubeRbacProxyContainerSpec(ctx *chetypes.DeployContext) corev1.Container {
57+
image := defaults.GetGatewayAuthorizationSidecarImage(ctx.CheCluster)
5858
logLevel := constants.DefaultKubeRbacProxyLogLevel
5959
if ctx.CheCluster.Spec.Networking.Auth.Gateway.KubeRbacProxy != nil && ctx.CheCluster.Spec.Networking.Auth.Gateway.KubeRbacProxy.LogLevel != nil {
6060
logLevel = *ctx.CheCluster.Spec.Networking.Auth.Gateway.KubeRbacProxy.LogLevel
6161
}
6262

63-
var image string
64-
if infrastructure.IsOpenShiftOAuthEnabled() {
65-
image = defaults.GetGatewayOpenShiftAuthorizationSidecarImage(ctx.CheCluster)
66-
} else {
67-
image = defaults.GetGatewayKubernetesAuthorizationSidecarImage(ctx.CheCluster)
68-
}
69-
7063
return corev1.Container{
7164
Name: "kube-rbac-proxy",
7265
Image: image,
7366
ImagePullPolicy: corev1.PullIfNotPresent,
7467
Args: []string{
7568
"--insecure-listen-address=0.0.0.0:8089",
7669
"--upstream=http://127.0.0.1:8090/ping",
77-
"--logtostderr=true",
7870
"--config-file=/etc/kube-rbac-proxy/authorization-config.yaml",
7971
"--v=" + strconv.FormatInt(int64(logLevel), 10),
8072
},

0 commit comments

Comments
 (0)