Skip to content

Commit 2b698a1

Browse files
authored
wasm shim image from env var (#41)
1 parent d9c9710 commit 2b698a1

File tree

4 files changed

+22
-0
lines changed

4 files changed

+22
-0
lines changed

bundle/manifests/kuadrant-operator.clusterserviceversion.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,9 @@ spec:
338338
- --leader-elect
339339
command:
340340
- /manager
341+
env:
342+
- name: RELATED_IMAGE_WASMSHIM
343+
value: oci://quay.io/kuadrant/wasm-shim:latest
341344
image: quay.io/kuadrant/kuadrant-operator:latest
342345
livenessProbe:
343346
httpGet:
@@ -433,4 +436,7 @@ spec:
433436
provider:
434437
name: Red Hat
435438
url: https://github.com/Kuadrant/kuadrant-operator
439+
relatedImages:
440+
- image: oci://quay.io/kuadrant/wasm-shim:latest
441+
name: wasmshim
436442
version: 0.0.0

config/manager/manager.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ spec:
2929
- /manager
3030
args:
3131
- --leader-elect
32+
env:
33+
- name: RELATED_IMAGE_WASMSHIM
34+
value: "oci://quay.io/kuadrant/wasm-shim:latest"
3235
image: controller:latest
3336
name: manager
3437
securityContext:

controllers/kuadrant_controller.go

+3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"encoding/json"
2222
"errors"
2323
"fmt"
24+
2425
"github.com/go-logr/logr"
2526
authorinov1beta1 "github.com/kuadrant/authorino-operator/api/v1beta1"
2627
limitadorv1alpha1 "github.com/kuadrant/limitador-operator/api/v1alpha1"
@@ -405,6 +406,8 @@ func (r *KuadrantReconciler) createOnlyInKuadrantNSCb(ctx context.Context, kObj
405406
obj.Spec.Template.Spec.Containers[0].Env,
406407
v1.EnvVar{Name: envLimitadorNamespace, Value: kObj.Namespace},
407408
v1.EnvVar{Name: envLimitadorName, Value: limitadorName},
409+
// env var name taken from https://github.com/Kuadrant/kuadrant-controller/blob/4e9763bbabc8a7b5f7695aa4f53d9edc0c376ba3/pkg/rlptools/wasm_utils.go#L18
410+
v1.EnvVar{Name: "WASM_FILTER_IMAGE", Value: common.GetWASMShimImageVersion()},
408411
)
409412
newObj = obj
410413
// TODO: DRY the following 2 case switches

pkg/common/wasm_shim_image.go

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package common
2+
3+
const (
4+
DEFAULT_WASMSHIM_IMAGE_VERSION = "oci://quay.io/kuadrant/wasm-shim:latest"
5+
WASM_SHIM_IMAGE_ENV_NAME = "RELATED_IMAGE_WASMSHIM"
6+
)
7+
8+
func GetWASMShimImageVersion() string {
9+
return FetchEnv(WASM_SHIM_IMAGE_ENV_NAME, DEFAULT_WASMSHIM_IMAGE_VERSION)
10+
}

0 commit comments

Comments
 (0)