From 7666b436c42170398496863018e16acc225d31c5 Mon Sep 17 00:00:00 2001 From: Eguzki Astiz Lezaun Date: Fri, 9 Sep 2022 18:17:21 +0200 Subject: [PATCH] wasm shim image from env var --- .../kuadrant-operator.clusterserviceversion.yaml | 6 ++++++ config/manager/manager.yaml | 3 +++ controllers/kuadrant_controller.go | 3 +++ pkg/common/wasm_shim_image.go | 10 ++++++++++ 4 files changed, 22 insertions(+) create mode 100644 pkg/common/wasm_shim_image.go diff --git a/bundle/manifests/kuadrant-operator.clusterserviceversion.yaml b/bundle/manifests/kuadrant-operator.clusterserviceversion.yaml index 353f2eb2a..977ed42a9 100644 --- a/bundle/manifests/kuadrant-operator.clusterserviceversion.yaml +++ b/bundle/manifests/kuadrant-operator.clusterserviceversion.yaml @@ -338,6 +338,9 @@ spec: - --leader-elect command: - /manager + env: + - name: RELATED_IMAGE_WASMSHIM + value: oci://quay.io/kuadrant/wasm-shim:latest image: quay.io/kuadrant/kuadrant-operator:latest livenessProbe: httpGet: @@ -433,4 +436,7 @@ spec: provider: name: Red Hat url: https://github.com/Kuadrant/kuadrant-operator + relatedImages: + - image: oci://quay.io/kuadrant/wasm-shim:latest + name: wasmshim version: 0.0.0 diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index fb8a2c72e..afd442ee2 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -29,6 +29,9 @@ spec: - /manager args: - --leader-elect + env: + - name: RELATED_IMAGE_WASMSHIM + value: "oci://quay.io/kuadrant/wasm-shim:latest" image: controller:latest name: manager securityContext: diff --git a/controllers/kuadrant_controller.go b/controllers/kuadrant_controller.go index 4927ebd0b..21cb3ddeb 100644 --- a/controllers/kuadrant_controller.go +++ b/controllers/kuadrant_controller.go @@ -21,6 +21,7 @@ import ( "encoding/json" "errors" "fmt" + "github.com/go-logr/logr" authorinov1beta1 "github.com/kuadrant/authorino-operator/api/v1beta1" limitadorv1alpha1 "github.com/kuadrant/limitador-operator/api/v1alpha1" @@ -405,6 +406,8 @@ func (r *KuadrantReconciler) createOnlyInKuadrantNSCb(ctx context.Context, kObj obj.Spec.Template.Spec.Containers[0].Env, v1.EnvVar{Name: envLimitadorNamespace, Value: kObj.Namespace}, v1.EnvVar{Name: envLimitadorName, Value: limitadorName}, + // env var name taken from https://github.com/Kuadrant/kuadrant-controller/blob/4e9763bbabc8a7b5f7695aa4f53d9edc0c376ba3/pkg/rlptools/wasm_utils.go#L18 + v1.EnvVar{Name: "WASM_FILTER_IMAGE", Value: common.GetWASMShimImageVersion()}, ) newObj = obj // TODO: DRY the following 2 case switches diff --git a/pkg/common/wasm_shim_image.go b/pkg/common/wasm_shim_image.go new file mode 100644 index 000000000..d2cb6528c --- /dev/null +++ b/pkg/common/wasm_shim_image.go @@ -0,0 +1,10 @@ +package common + +const ( + DEFAULT_WASMSHIM_IMAGE_VERSION = "oci://quay.io/kuadrant/wasm-shim:latest" + WASM_SHIM_IMAGE_ENV_NAME = "RELATED_IMAGE_WASMSHIM" +) + +func GetWASMShimImageVersion() string { + return FetchEnv(WASM_SHIM_IMAGE_ENV_NAME, DEFAULT_WASMSHIM_IMAGE_VERSION) +}