Update TrustyAI Operator to allow for parameterized images

opendatahub-io · Aug 17, 2023 · 03f0416 · 03f0416
1 parent bfc8713
commit 03f0416
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 9 deletions.
diff --git a/trustyai-service-operator/base/kustomization.yaml b/trustyai-service-operator/base/kustomization.yaml
@@ -11,8 +11,12 @@ patchesStrategicMerge:
 - manager_auth_proxy_patch.yaml
 
 configMapGenerator:
-  - name: config
-    env: params.env
+  - env: params.env
+    name: config
+
+configurations:
+  - params.yaml
+
 generatorOptions:
   disableNameSuffixHash: true
 
@@ -31,3 +35,17 @@ vars:
       apiVersion: v1
     fieldref:
       fieldpath: data.trustyaiServiceImageTag
+  - name: trustyaiOperatorImageName
+    objref:
+      kind: ConfigMap
+      name: config
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.trustyaiOperatorImageName
+  - name: trustyaiOperatorImageTag
+    objref:
+      kind: ConfigMap
+      name: config
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.trustyaiOperatorImageTag
diff --git a/trustyai-service-operator/base/params.env b/trustyai-service-operator/base/params.env
@@ -1,2 +1,4 @@
 trustyaiServiceImageName=quay.io/trustyai/trustyai-service
-trustyaiServiceImageTag=v0.2.0
+trustyaiServiceImageTag=latest
+trustyaiOperatorImageName=quay.io/trustyai/trustyai-service-operator
+trustyaiOperatorImageTag=latest
diff --git a/trustyai-service-operator/base/params.yaml b/trustyai-service-operator/base/params.yaml
@@ -0,0 +1,3 @@
+varReference:
+  - kind: Deployment
+    path: spec/template/spec/containers[]/image
diff --git a/trustyai-service-operator/manager/kustomization.yaml b/trustyai-service-operator/manager/kustomization.yaml
@@ -1,8 +1,4 @@
 resources:
 - manager.yaml
 apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-images:
-- name: controller
-  newName: quay.io/trustyai/trustyai-service-operator
-  newTag: v1.8.0
+kind: Kustomization
diff --git a/trustyai-service-operator/manager/manager.yaml b/trustyai-service-operator/manager/manager.yaml
@@ -32,7 +32,7 @@ spec:
         - /manager
         args:
         - --leader-elect
-        image: controller:latest
+        image: $(trustyaiOperatorImageName):$(trustyaiOperatorImageTag)
         name: manager
         securityContext:
           runAsNonRoot: true