feat: add rhoai overlay.

Signed-off-by: Humair Khan <HumairAK@users.noreply.github.com>
opendatahub-io · Feb 14, 2024 · 4d6d246 · 4d6d246
1 parent 9574a6e
commit 4d6d246
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 2 deletions.
diff --git a/.github/resources/argo-lite/kustomization.yaml b/.github/resources/argo-lite/kustomization.yaml
@@ -2,6 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: opendatahub
 resources:
-  - ../../../config/argo
+  - ../../../config/overlays/make-argodeploy
 patchesStrategicMerge:
   - patch/argo_server_deployment.yaml
diff --git a/config/argo/deployment.argo-server.yaml b/config/argo/deployment.argo-server.yaml
@@ -17,7 +17,7 @@ spec:
       - args:
         - server
         env: []
-        image: quay.io/argoproj/argocli:v3.4.12
+        image: $(IMAGES_ARGO_SERVER)
         name: argo-server
         ports:
         - containerPort: 2746

diff --git a/config/argo/params.yaml b/config/argo/params.yaml
@@ -0,0 +1,5 @@
+varReference:
+- path: spec/template/spec/containers/image
+  kind: Deployment
+- path: data
+  kind: ConfigMap
diff --git a/config/base/kustomization.yaml b/config/base/kustomization.yaml
@@ -9,6 +9,9 @@ resources:
   - ../prometheus
   - ../configmaps
 
+generatorOptions:
+  disableNameSuffixHash: true
+
 configMapGenerator:
   - name: dspo-parameters
     envs:

diff --git a/config/base/params.env b/config/base/params.env
@@ -15,6 +15,7 @@ IMAGESV2_ARGO_MLMDGRPC=quay.io/opendatahub/ds-pipelines-metadata-grpc:latest
 IMAGESV2_ARGO_MLMDWRITER=quay.io/opendatahub/ds-pipelines-metadata-writer:latest
 IMAGESV2_ARGO_WORKFLOWCONTROLLER=quay.io/opendatahub/ds-pipelines-argo-workflowcontroller:3.3.10-upstream
 IMAGESV2_ARGO_ARGOEXEC=quay.io/opendatahub/ds-pipelines-argo-argoexec:3.3.10-upstream
+IMAGES_ARGO_SERVER=quay.io/opendatahub/ds-pipelines-argo-server:3.3.10-upstream
 V2_LAUNCHER_IMAGE=quay.io/opendatahub/ds-pipelines-launcher:latest
 V2_DRIVER_IMAGE=quay.io/opendatahub/ds-pipelines-driver:latest
 IMAGES_CACHE=registry.access.redhat.com/ubi8/ubi-minimal:8.8

diff --git a/config/configmaps/kustomization.yaml b/config/configmaps/kustomization.yaml
@@ -1,5 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+generatorOptions:
+  disableNameSuffixHash: true
 configMapGenerator:
   - name: dspo-config
     files:

diff --git a/config/overlays/odh/kustomization.yaml b/config/overlays/odh/kustomization.yaml
@@ -4,3 +4,11 @@ resources:
 - ../make-argodeploy
 - ../make-deploy
 namespace: opendatahub
+vars:
+  - name: IMAGES_ARGO_SERVER
+    objref:
+      kind: ConfigMap
+      name: dspo-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.IMAGES_ARGO_SERVER
diff --git a/config/overlays/rhoai/kustomization.yaml b/config/overlays/rhoai/kustomization.yaml
@@ -0,0 +1,21 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../../base
+- ../../argo
+namespace: redhat-ods-applications
+
+vars:
+  - name: IMAGES_ARGO_SERVER
+    objref:
+      kind: ConfigMap
+      name: dspo-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.IMAGES_ARGO_SERVER
+
+configMapGenerator:
+  - name: dspo-parameters
+    behavior: merge
+    envs:
+      - params.env