Skip to content

Commit acfa06a

Browse files
tolushatolusha
committed
chore: Use the upstream version of oauth2-proxy and kube-rbac-proxy images
Signed-off-by: Anatolii Bazko <[email protected]>
1 parent ba55857 commit acfa06a

File tree

8 files changed

+9
-53
lines changed

8 files changed

+9
-53
lines changed

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

+3-9
Original file line numberDiff line numberDiff line change
@@ -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.99.0-902.next
111+
name: eclipse-che.v7.99.0-903.next
112112
namespace: placeholder
113113
spec:
114114
apiservicedefinitions: {}
@@ -929,15 +929,9 @@ spec:
929929
- name: RELATED_IMAGE_single_host_gateway_config_sidecar
930930
value: quay.io/che-incubator/configbump:next
931931
- name: RELATED_IMAGE_gateway_authentication_sidecar
932-
value: quay.io/openshift/origin-oauth-proxy:4.9
933-
- name: RELATED_IMAGE_gateway_authorization_sidecar
934-
value: quay.io/openshift/origin-kube-rbac-proxy:4.9
935-
- name: RELATED_IMAGE_gateway_authentication_sidecar_k8s
936932
value: quay.io/oauth2-proxy/oauth2-proxy:v7.6.0
937-
- name: RELATED_IMAGE_gateway_authorization_sidecar_k8s
933+
- name: RELATED_IMAGE_gateway_authorization_sidecar
938934
value: quay.io/brancz/kube-rbac-proxy:v0.13.1
939-
- name: RELATED_IMAGE_gateway_header_sidecar
940-
value: quay.io/che-incubator/header-rewrite-proxy:latest
941935
- name: CHE_FLAVOR
942936
value: che
943937
- name: CONSOLE_LINK_NAME
@@ -1077,7 +1071,7 @@ spec:
10771071
minKubeVersion: 1.19.0
10781072
provider:
10791073
name: Eclipse Foundation
1080-
version: 7.99.0-902.next
1074+
version: 7.99.0-903.next
10811075
webhookdefinitions:
10821076
- admissionReviewVersions:
10831077
- v1

‎config/manager/manager.yaml

+1-7
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,9 @@ 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
80-
- name: RELATED_IMAGE_gateway_authentication_sidecar_k8s
8177
value: quay.io/oauth2-proxy/oauth2-proxy:v7.6.0
82-
- name: RELATED_IMAGE_gateway_authorization_sidecar_k8s
78+
- name: RELATED_IMAGE_gateway_authorization_sidecar
8379
value: quay.io/brancz/kube-rbac-proxy:v0.13.1
84-
- name: RELATED_IMAGE_gateway_header_sidecar
85-
value: quay.io/che-incubator/header-rewrite-proxy:latest
8680
- name: CHE_FLAVOR
8781
value: che
8882
- name: CONSOLE_LINK_NAME

‎deploy/deployment/kubernetes/combined.yaml

+1-7
Original file line numberDiff line numberDiff line change
@@ -9155,15 +9155,9 @@ spec:
91559155
- name: RELATED_IMAGE_single_host_gateway_config_sidecar
91569156
value: quay.io/che-incubator/configbump:next
91579157
- name: RELATED_IMAGE_gateway_authentication_sidecar
9158-
value: quay.io/openshift/origin-oauth-proxy:4.9
9159-
- name: RELATED_IMAGE_gateway_authorization_sidecar
9160-
value: quay.io/openshift/origin-kube-rbac-proxy:4.9
9161-
- name: RELATED_IMAGE_gateway_authentication_sidecar_k8s
91629158
value: quay.io/oauth2-proxy/oauth2-proxy:v7.6.0
9163-
- name: RELATED_IMAGE_gateway_authorization_sidecar_k8s
9159+
- name: RELATED_IMAGE_gateway_authorization_sidecar
91649160
value: quay.io/brancz/kube-rbac-proxy:v0.13.1
9165-
- name: RELATED_IMAGE_gateway_header_sidecar
9166-
value: quay.io/che-incubator/header-rewrite-proxy:latest
91679161
- name: CHE_FLAVOR
91689162
value: che
91699163
- name: CONSOLE_LINK_NAME

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,9 @@ 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
74-
- name: RELATED_IMAGE_gateway_authentication_sidecar_k8s
7571
value: quay.io/oauth2-proxy/oauth2-proxy:v7.6.0
76-
- name: RELATED_IMAGE_gateway_authorization_sidecar_k8s
72+
- name: RELATED_IMAGE_gateway_authorization_sidecar
7773
value: quay.io/brancz/kube-rbac-proxy:v0.13.1
78-
- name: RELATED_IMAGE_gateway_header_sidecar
79-
value: quay.io/che-incubator/header-rewrite-proxy:latest
8074
- name: CHE_FLAVOR
8175
value: che
8276
- name: CONSOLE_LINK_NAME

‎deploy/deployment/openshift/combined.yaml

+1-7
Original file line numberDiff line numberDiff line change
@@ -9157,15 +9157,9 @@ spec:
91579157
- name: RELATED_IMAGE_single_host_gateway_config_sidecar
91589158
value: quay.io/che-incubator/configbump:next
91599159
- name: RELATED_IMAGE_gateway_authentication_sidecar
9160-
value: quay.io/openshift/origin-oauth-proxy:4.9
9161-
- name: RELATED_IMAGE_gateway_authorization_sidecar
9162-
value: quay.io/openshift/origin-kube-rbac-proxy:4.9
9163-
- name: RELATED_IMAGE_gateway_authentication_sidecar_k8s
91649160
value: quay.io/oauth2-proxy/oauth2-proxy:v7.6.0
9165-
- name: RELATED_IMAGE_gateway_authorization_sidecar_k8s
9161+
- name: RELATED_IMAGE_gateway_authorization_sidecar
91669162
value: quay.io/brancz/kube-rbac-proxy:v0.13.1
9167-
- name: RELATED_IMAGE_gateway_header_sidecar
9168-
value: quay.io/che-incubator/header-rewrite-proxy:latest
91699163
- name: CHE_FLAVOR
91709164
value: che
91719165
- name: CONSOLE_LINK_NAME

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,9 @@ 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
74-
- name: RELATED_IMAGE_gateway_authentication_sidecar_k8s
7571
value: quay.io/oauth2-proxy/oauth2-proxy:v7.6.0
76-
- name: RELATED_IMAGE_gateway_authorization_sidecar_k8s
72+
- name: RELATED_IMAGE_gateway_authorization_sidecar
7773
value: quay.io/brancz/kube-rbac-proxy:v0.13.1
78-
- name: RELATED_IMAGE_gateway_header_sidecar
79-
value: quay.io/che-incubator/header-rewrite-proxy:latest
8074
- name: CHE_FLAVOR
8175
value: che
8276
- name: CONSOLE_LINK_NAME

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,9 @@ 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
74-
- name: RELATED_IMAGE_gateway_authentication_sidecar_k8s
7571
value: quay.io/oauth2-proxy/oauth2-proxy:v7.6.0
76-
- name: RELATED_IMAGE_gateway_authorization_sidecar_k8s
72+
- name: RELATED_IMAGE_gateway_authorization_sidecar
7773
value: quay.io/brancz/kube-rbac-proxy:v0.13.1
78-
- name: RELATED_IMAGE_gateway_header_sidecar
79-
value: quay.io/che-incubator/header-rewrite-proxy:latest
8074
- name: CHE_FLAVOR
8175
value: che
8276
- name: CONSOLE_LINK_NAME

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

-2
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@ func Initialize() {
9696
// Don't get some k8s specific env
9797
if !infrastructure.IsOpenShift() {
9898
defaultCheTLSSecretsCreationJobImage = ensureEnv(util.GetArchitectureDependentEnvName("RELATED_IMAGE_che_tls_secrets_creation_job"))
99-
defaultGatewayAuthenticationSidecarImage = ensureEnv(util.GetArchitectureDependentEnvName("RELATED_IMAGE_gateway_authentication_sidecar_k8s"))
100-
defaultGatewayAuthorizationSidecarImage = ensureEnv(util.GetArchitectureDependentEnvName("RELATED_IMAGE_gateway_authorization_sidecar_k8s"))
10199
}
102100

103101
initialized = true

0 commit comments

Comments
 (0)