From 8ef15f948908e1e11b3ba1ba020c836fbf7d894d Mon Sep 17 00:00:00 2001 From: Anatolii Bazko Date: Tue, 6 Dec 2022 15:08:52 +0200 Subject: [PATCH] chore: Update oauth2-proxy image (#1574) * chore: Update oauth2-proxy image Signed-off-by: Anatolii Bazko --- build/scripts/minikube-tests/test-helm.sh | 2 ++ build/scripts/minikube-tests/test-operator.sh | 2 ++ .../scripts/minikube-tests/test-upgrade-from-stable-to-next.sh | 2 ++ .../minikube-tests/test-upgrade-from-stable-to-stable.sh | 2 ++ .../manifests/che-operator.clusterserviceversion.yaml | 2 +- config/manager/manager.yaml | 2 +- deploy/deployment/kubernetes/combined.yaml | 2 +- .../deployment/kubernetes/objects/che-operator.Deployment.yaml | 2 +- deploy/deployment/openshift/combined.yaml | 2 +- .../deployment/openshift/objects/che-operator.Deployment.yaml | 2 +- helmcharts/next/templates/che-operator.Deployment.yaml | 2 +- 11 files changed, 15 insertions(+), 7 deletions(-) diff --git a/build/scripts/minikube-tests/test-helm.sh b/build/scripts/minikube-tests/test-helm.sh index dd62ed16a..bda5dfa49 100755 --- a/build/scripts/minikube-tests/test-helm.sh +++ b/build/scripts/minikube-tests/test-helm.sh @@ -30,6 +30,8 @@ runTest() { chectl server:deploy \ --batch \ --platform minikube \ + --k8spodwaittimeout=120000 \ + --k8spodreadytimeout=120000 \ --che-operator-cr-patch-yaml "${OPERATOR_REPO}/build/scripts/minikube-tests/minikube-checluster-patch.yaml" # Read OIDC configuration diff --git a/build/scripts/minikube-tests/test-operator.sh b/build/scripts/minikube-tests/test-operator.sh index b49c3703e..e04e59127 100755 --- a/build/scripts/minikube-tests/test-operator.sh +++ b/build/scripts/minikube-tests/test-operator.sh @@ -33,6 +33,8 @@ runTest() { chectl server:deploy \ --batch \ --platform minikube \ + --k8spodwaittimeout=120000 \ + --k8spodreadytimeout=120000 \ --templates "${CURRENT_OPERATOR_VERSION_TEMPLATE_PATH}" \ --che-operator-cr-patch-yaml "${OPERATOR_REPO}/build/scripts/minikube-tests/minikube-checluster-patch.yaml" diff --git a/build/scripts/minikube-tests/test-upgrade-from-stable-to-next.sh b/build/scripts/minikube-tests/test-upgrade-from-stable-to-next.sh index ac7734433..9b29bf45b 100755 --- a/build/scripts/minikube-tests/test-upgrade-from-stable-to-next.sh +++ b/build/scripts/minikube-tests/test-upgrade-from-stable-to-next.sh @@ -30,6 +30,8 @@ runTest() { chectl server:deploy \ --batch \ --platform minikube \ + --k8spodwaittimeout=120000 \ + --k8spodreadytimeout=120000 \ --templates ${LAST_OPERATOR_VERSION_TEMPLATE_PATH} \ --che-operator-cr-patch-yaml "${OPERATOR_REPO}/build/scripts/minikube-tests/minikube-checluster-patch.yaml" diff --git a/build/scripts/minikube-tests/test-upgrade-from-stable-to-stable.sh b/build/scripts/minikube-tests/test-upgrade-from-stable-to-stable.sh index 4965d9971..51ff41c1b 100755 --- a/build/scripts/minikube-tests/test-upgrade-from-stable-to-stable.sh +++ b/build/scripts/minikube-tests/test-upgrade-from-stable-to-stable.sh @@ -30,6 +30,8 @@ runTest() { --batch \ --platform minikube \ --templates ${PREVIOUS_OPERATOR_VERSION_TEMPLATE_PATH} \ + --k8spodwaittimeout=120000 \ + --k8spodreadytimeout=120000 \ --che-operator-cr-patch-yaml "${OPERATOR_REPO}/build/scripts/minikube-tests/minikube-checluster-patch.yaml" chectl server:update --templates ${LAST_OPERATOR_VERSION_TEMPLATE_PATH} --batch diff --git a/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml b/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml index d9ff76ff1..2dc229cca 100644 --- a/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml +++ b/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml @@ -935,7 +935,7 @@ spec: - name: RELATED_IMAGE_gateway_authorization_sidecar value: quay.io/openshift/origin-kube-rbac-proxy:4.9 - name: RELATED_IMAGE_gateway_authentication_sidecar_k8s - value: quay.io/oauth2-proxy/oauth2-proxy:v7.2.0 + value: quay.io/oauth2-proxy/oauth2-proxy:v7.4.0 - name: RELATED_IMAGE_gateway_authorization_sidecar_k8s value: quay.io/brancz/kube-rbac-proxy:v0.11.0 - name: RELATED_IMAGE_gateway_header_sidecar diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index e7f1bd913..a0fb2eee8 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -84,7 +84,7 @@ spec: - name: RELATED_IMAGE_gateway_authorization_sidecar value: quay.io/openshift/origin-kube-rbac-proxy:4.9 - name: RELATED_IMAGE_gateway_authentication_sidecar_k8s - value: quay.io/oauth2-proxy/oauth2-proxy:v7.2.0 + value: quay.io/oauth2-proxy/oauth2-proxy:v7.4.0 - name: RELATED_IMAGE_gateway_authorization_sidecar_k8s value: quay.io/brancz/kube-rbac-proxy:v0.11.0 - name: RELATED_IMAGE_gateway_header_sidecar diff --git a/deploy/deployment/kubernetes/combined.yaml b/deploy/deployment/kubernetes/combined.yaml index 50550ea9a..0984e1bd4 100644 --- a/deploy/deployment/kubernetes/combined.yaml +++ b/deploy/deployment/kubernetes/combined.yaml @@ -5773,7 +5773,7 @@ spec: - name: RELATED_IMAGE_gateway_authorization_sidecar value: quay.io/openshift/origin-kube-rbac-proxy:4.9 - name: RELATED_IMAGE_gateway_authentication_sidecar_k8s - value: quay.io/oauth2-proxy/oauth2-proxy:v7.2.0 + value: quay.io/oauth2-proxy/oauth2-proxy:v7.4.0 - name: RELATED_IMAGE_gateway_authorization_sidecar_k8s value: quay.io/brancz/kube-rbac-proxy:v0.11.0 - name: RELATED_IMAGE_gateway_header_sidecar diff --git a/deploy/deployment/kubernetes/objects/che-operator.Deployment.yaml b/deploy/deployment/kubernetes/objects/che-operator.Deployment.yaml index 505448e4c..0370495e8 100644 --- a/deploy/deployment/kubernetes/objects/che-operator.Deployment.yaml +++ b/deploy/deployment/kubernetes/objects/che-operator.Deployment.yaml @@ -78,7 +78,7 @@ spec: - name: RELATED_IMAGE_gateway_authorization_sidecar value: quay.io/openshift/origin-kube-rbac-proxy:4.9 - name: RELATED_IMAGE_gateway_authentication_sidecar_k8s - value: quay.io/oauth2-proxy/oauth2-proxy:v7.2.0 + value: quay.io/oauth2-proxy/oauth2-proxy:v7.4.0 - name: RELATED_IMAGE_gateway_authorization_sidecar_k8s value: quay.io/brancz/kube-rbac-proxy:v0.11.0 - name: RELATED_IMAGE_gateway_header_sidecar diff --git a/deploy/deployment/openshift/combined.yaml b/deploy/deployment/openshift/combined.yaml index ee23ba9cc..b36c7a13c 100644 --- a/deploy/deployment/openshift/combined.yaml +++ b/deploy/deployment/openshift/combined.yaml @@ -5775,7 +5775,7 @@ spec: - name: RELATED_IMAGE_gateway_authorization_sidecar value: quay.io/openshift/origin-kube-rbac-proxy:4.9 - name: RELATED_IMAGE_gateway_authentication_sidecar_k8s - value: quay.io/oauth2-proxy/oauth2-proxy:v7.2.0 + value: quay.io/oauth2-proxy/oauth2-proxy:v7.4.0 - name: RELATED_IMAGE_gateway_authorization_sidecar_k8s value: quay.io/brancz/kube-rbac-proxy:v0.11.0 - name: RELATED_IMAGE_gateway_header_sidecar diff --git a/deploy/deployment/openshift/objects/che-operator.Deployment.yaml b/deploy/deployment/openshift/objects/che-operator.Deployment.yaml index bc68236d5..1c8d3e5a8 100644 --- a/deploy/deployment/openshift/objects/che-operator.Deployment.yaml +++ b/deploy/deployment/openshift/objects/che-operator.Deployment.yaml @@ -78,7 +78,7 @@ spec: - name: RELATED_IMAGE_gateway_authorization_sidecar value: quay.io/openshift/origin-kube-rbac-proxy:4.9 - name: RELATED_IMAGE_gateway_authentication_sidecar_k8s - value: quay.io/oauth2-proxy/oauth2-proxy:v7.2.0 + value: quay.io/oauth2-proxy/oauth2-proxy:v7.4.0 - name: RELATED_IMAGE_gateway_authorization_sidecar_k8s value: quay.io/brancz/kube-rbac-proxy:v0.11.0 - name: RELATED_IMAGE_gateway_header_sidecar diff --git a/helmcharts/next/templates/che-operator.Deployment.yaml b/helmcharts/next/templates/che-operator.Deployment.yaml index 505448e4c..0370495e8 100644 --- a/helmcharts/next/templates/che-operator.Deployment.yaml +++ b/helmcharts/next/templates/che-operator.Deployment.yaml @@ -78,7 +78,7 @@ spec: - name: RELATED_IMAGE_gateway_authorization_sidecar value: quay.io/openshift/origin-kube-rbac-proxy:4.9 - name: RELATED_IMAGE_gateway_authentication_sidecar_k8s - value: quay.io/oauth2-proxy/oauth2-proxy:v7.2.0 + value: quay.io/oauth2-proxy/oauth2-proxy:v7.4.0 - name: RELATED_IMAGE_gateway_authorization_sidecar_k8s value: quay.io/brancz/kube-rbac-proxy:v0.11.0 - name: RELATED_IMAGE_gateway_header_sidecar