From 7d6dcbd9142cd3104359d95ee1bf32d6769fb7b6 Mon Sep 17 00:00:00 2001 From: Anatolii Bazko Date: Thu, 18 Aug 2022 14:20:02 +0300 Subject: [PATCH] =?UTF-8?q?chore:=20Update=20to=20newer=20RELATED=5FIMAGE?= =?UTF-8?q?=5Fgateway=5Fauthentication=5Fsidecar=20a=E2=80=A6=20(#1487)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update to newer RELATED_IMAGE_gateway_authentication_sidecar and RELATED_IMAGE_gateway_authorization_sidecar Signed-off-by: Anatolii Bazko --- Makefile | 14 +++++++++----- .../che-operator.clusterserviceversion.yaml | 8 ++++---- config/manager/manager.yaml | 4 ++-- deploy/deployment/kubernetes/combined.yaml | 4 ++-- .../objects/che-operator.Deployment.yaml | 4 ++-- deploy/deployment/openshift/combined.yaml | 4 ++-- .../openshift/objects/che-operator.Deployment.yaml | 4 ++-- .../next/templates/che-operator.Deployment.yaml | 4 ++-- 8 files changed, 25 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index f6799f584..5d2d01057 100644 --- a/Makefile +++ b/Makefile @@ -236,7 +236,7 @@ update-helmcharts: ## Update Helm Charts based on deployment resources gen-chectl-tmpl: SHELL := /bin/bash gen-chectl-tmpl: ## Generate Eclipse Che k8s deployment resources used by chectl - [[ -z "$(TEMPLATES)" ]] && { echo [ERROR] TARGET not defined; exit 1; } + [[ -z "$(TEMPLATES)" ]] && { echo [ERROR] TEMPLATES not defined; exit 1; } [[ -z "$(SOURCE_PROJECT)" ]] && src=$(PROJECT_DIR) || src=$(SOURCE_PROJECT) dst="$(TEMPLATES)/che-operator/kubernetes" && rm -rf $${dst} @@ -292,7 +292,7 @@ vet: ## Run go vet against code. go vet ./... ENVTEST_ASSETS_DIR=$(shell pwd)/testbin -test: download-devworkspace-resources ## Run tests. +test: download-devworkspace-resources download-gateway-resources ## Run tests. export MOCK_API=true; go test -mod=vendor ./... -coverprofile cover.out license: ## Add license to the files @@ -327,9 +327,10 @@ genenerate-env: cat $(BASH_ENV_FILE) install-che-operands: SHELL := /bin/bash -install-che-operands: generate manifests download-kustomize download-devworkspace-resources +install-che-operands: generate manifests download-kustomize download-gateway-resources echo "[INFO] Running on $(PLATFORM)" [[ $(PLATFORM) == "kubernetes" ]] && $(MAKE) install-certmgr + [[ $(PLATFORM) == "kubernetes" ]] && $(MAKE) download-devworkspace-resources [[ $(PLATFORM) == "openshift" ]] && $(MAKE) install-devworkspace CHANNEL=next $(KUSTOMIZE) build config/$(PLATFORM) | $(K8S_CLI) apply -f - @@ -342,7 +343,6 @@ install-che-operands: generate manifests download-kustomize download-devworkspac # Downloads Dev Workspace resources download-devworkspace-resources: DEVWORKSPACE_RESOURCES=/tmp/devworkspace-operator/templates - GATEWAY_RESOURCES=/tmp/header-rewrite-traefik-plugin rm -rf /tmp/devworkspace-operator.zip /tmp/devfile-devworkspace-operator-* $${DEVWORKSPACE_RESOURCES} mkdir -p $${DEVWORKSPACE_RESOURCES} @@ -352,6 +352,10 @@ download-devworkspace-resources: echo "[INFO] DevWorkspace resources downloaded into $${DEVWORKSPACE_RESOURCES}" +# Downloads Gateway resources +download-gateway-resources: + GATEWAY_RESOURCES=/tmp/header-rewrite-traefik-plugin + rm -rf /tmp/asset-header-rewrite-traefik-plugin.zip /tmp/*-header-rewrite-traefik-plugin-*/ $${GATEWAY_RESOURCES} mkdir -p $${GATEWAY_RESOURCES} curl -sL https://api.github.com/repos/che-incubator/header-rewrite-traefik-plugin/zipball/${DEV_HEADER_REWRITE_TRAEFIK_PLUGIN} > /tmp/asset-header-rewrite-traefik-plugin.zip @@ -597,7 +601,7 @@ validate-requirements: command -v skopeo >/dev/null 2>&1 || { echo "[ERROR] skopeo is not installed."; exit 1; } # Set a new operator image for kustomize -kustomize-operator-image: +kustomize-operator-image: download-kustomize cd config/manager $(KUSTOMIZE) edit set image quay.io/eclipse/che-operator:next=$(IMG) cd ../.. diff --git a/bundle/next/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml b/bundle/next/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml index 419615b6b..ccb44fe67 100644 --- a/bundle/next/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml +++ b/bundle/next/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml @@ -76,7 +76,7 @@ metadata: operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/eclipse-che/che-operator support: Eclipse Foundation - name: eclipse-che-preview-openshift.v7.53.0-649.next + name: eclipse-che-preview-openshift.v7.53.0-650.next namespace: placeholder spec: apiservicedefinitions: {} @@ -1115,9 +1115,9 @@ spec: - name: RELATED_IMAGE_devworkspace_controller value: quay.io/devfile/devworkspace-controller:v0.15.2 - name: RELATED_IMAGE_gateway_authentication_sidecar - value: quay.io/openshift/origin-oauth-proxy:4.7 + value: quay.io/openshift/origin-oauth-proxy:4.9 - name: RELATED_IMAGE_gateway_authorization_sidecar - value: quay.io/openshift/origin-kube-rbac-proxy:4.7 + 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 - name: RELATED_IMAGE_gateway_authorization_sidecar_k8s @@ -1389,7 +1389,7 @@ spec: maturity: stable provider: name: Eclipse Foundation - version: 7.53.0-649.next + version: 7.53.0-650.next webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 1546165d6..e771c978a 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -82,9 +82,9 @@ spec: - name: RELATED_IMAGE_devworkspace_controller value: quay.io/devfile/devworkspace-controller:v0.15.2 - name: RELATED_IMAGE_gateway_authentication_sidecar - value: quay.io/openshift/origin-oauth-proxy:4.7 + value: quay.io/openshift/origin-oauth-proxy:4.9 - name: RELATED_IMAGE_gateway_authorization_sidecar - value: quay.io/openshift/origin-kube-rbac-proxy:4.7 + 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 - name: RELATED_IMAGE_gateway_authorization_sidecar_k8s diff --git a/deploy/deployment/kubernetes/combined.yaml b/deploy/deployment/kubernetes/combined.yaml index 72d2a80da..c4ed383d8 100644 --- a/deploy/deployment/kubernetes/combined.yaml +++ b/deploy/deployment/kubernetes/combined.yaml @@ -5959,9 +5959,9 @@ spec: - name: RELATED_IMAGE_devworkspace_controller value: quay.io/devfile/devworkspace-controller:v0.15.2 - name: RELATED_IMAGE_gateway_authentication_sidecar - value: quay.io/openshift/origin-oauth-proxy:4.7 + value: quay.io/openshift/origin-oauth-proxy:4.9 - name: RELATED_IMAGE_gateway_authorization_sidecar - value: quay.io/openshift/origin-kube-rbac-proxy:4.7 + 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 - name: RELATED_IMAGE_gateway_authorization_sidecar_k8s diff --git a/deploy/deployment/kubernetes/objects/che-operator.Deployment.yaml b/deploy/deployment/kubernetes/objects/che-operator.Deployment.yaml index b3732d437..5f1526294 100644 --- a/deploy/deployment/kubernetes/objects/che-operator.Deployment.yaml +++ b/deploy/deployment/kubernetes/objects/che-operator.Deployment.yaml @@ -76,9 +76,9 @@ spec: - name: RELATED_IMAGE_devworkspace_controller value: quay.io/devfile/devworkspace-controller:v0.15.2 - name: RELATED_IMAGE_gateway_authentication_sidecar - value: quay.io/openshift/origin-oauth-proxy:4.7 + value: quay.io/openshift/origin-oauth-proxy:4.9 - name: RELATED_IMAGE_gateway_authorization_sidecar - value: quay.io/openshift/origin-kube-rbac-proxy:4.7 + 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 - name: RELATED_IMAGE_gateway_authorization_sidecar_k8s diff --git a/deploy/deployment/openshift/combined.yaml b/deploy/deployment/openshift/combined.yaml index 35408e074..66713d977 100644 --- a/deploy/deployment/openshift/combined.yaml +++ b/deploy/deployment/openshift/combined.yaml @@ -5961,9 +5961,9 @@ spec: - name: RELATED_IMAGE_devworkspace_controller value: quay.io/devfile/devworkspace-controller:v0.15.2 - name: RELATED_IMAGE_gateway_authentication_sidecar - value: quay.io/openshift/origin-oauth-proxy:4.7 + value: quay.io/openshift/origin-oauth-proxy:4.9 - name: RELATED_IMAGE_gateway_authorization_sidecar - value: quay.io/openshift/origin-kube-rbac-proxy:4.7 + 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 - name: RELATED_IMAGE_gateway_authorization_sidecar_k8s diff --git a/deploy/deployment/openshift/objects/che-operator.Deployment.yaml b/deploy/deployment/openshift/objects/che-operator.Deployment.yaml index 479bf3b23..19f781ec8 100644 --- a/deploy/deployment/openshift/objects/che-operator.Deployment.yaml +++ b/deploy/deployment/openshift/objects/che-operator.Deployment.yaml @@ -76,9 +76,9 @@ spec: - name: RELATED_IMAGE_devworkspace_controller value: quay.io/devfile/devworkspace-controller:v0.15.2 - name: RELATED_IMAGE_gateway_authentication_sidecar - value: quay.io/openshift/origin-oauth-proxy:4.7 + value: quay.io/openshift/origin-oauth-proxy:4.9 - name: RELATED_IMAGE_gateway_authorization_sidecar - value: quay.io/openshift/origin-kube-rbac-proxy:4.7 + 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 - name: RELATED_IMAGE_gateway_authorization_sidecar_k8s diff --git a/helmcharts/next/templates/che-operator.Deployment.yaml b/helmcharts/next/templates/che-operator.Deployment.yaml index b3732d437..5f1526294 100644 --- a/helmcharts/next/templates/che-operator.Deployment.yaml +++ b/helmcharts/next/templates/che-operator.Deployment.yaml @@ -76,9 +76,9 @@ spec: - name: RELATED_IMAGE_devworkspace_controller value: quay.io/devfile/devworkspace-controller:v0.15.2 - name: RELATED_IMAGE_gateway_authentication_sidecar - value: quay.io/openshift/origin-oauth-proxy:4.7 + value: quay.io/openshift/origin-oauth-proxy:4.9 - name: RELATED_IMAGE_gateway_authorization_sidecar - value: quay.io/openshift/origin-kube-rbac-proxy:4.7 + 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 - name: RELATED_IMAGE_gateway_authorization_sidecar_k8s