Extend intergration test

* Trigger workflow when kfam code changes since profile-controller manifests use that component * Update tag in manifests to v1.6.0 Signed-off-by: Apostolos Gerakaris <apoger@arrikto.com>
kubeflow · Dec 9, 2022 · 8c60846 · 8c60846
1 parent ae73de0
commit 8c60846
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/.github/workflows/prof_controller_intergration_test.yaml b/.github/workflows/prof_controller_intergration_test.yaml
@@ -3,12 +3,14 @@ on:
   pull_request:
     paths:
       - components/profile-controller/**
+      - components/access-management/**
     branches:
       - master
       - v*-branch
 
 env:
-  IMG: profile-controller
+  PROFILE_IMG: profile-controller
+  KFAM_IMG: kfam
   TAG: intergration-test
 
 jobs:
@@ -21,16 +23,23 @@ jobs:
     - name: Build Profile Controller Image 
       run: |
         cd components/profile-controller
-        make docker-build
+        make docker-build IMG=${{env.PROFILE_IMG}}
+
+    - name: Build Kfam Image
+      run: |
+        cd components/access-management
+        make docker-build IMG=${{env.KFAM_IMG}}
 
     - name: Install KinD
       run: ./components/testing/gh-actions/install_kind.sh
 
     - name: Create KinD Cluster
       run: kind create cluster --config components/testing/gh-actions/kind-1-25.yaml
 
-    - name: Load image into KinD Cluster 
-      run: kind load docker-image ${{env.IMG}}:${{env.TAG}}
+    - name: Load Images into KinD Cluster 
+      run: |
+        kind load docker-image ${{env.PROFILE_IMG}}:${{env.TAG}}
+        kind load docker-image ${{env.KFAM_IMG}}:${{env.TAG}}
 
     - name: Install kustomize
       run: ./components/testing/gh-actions/install_kustomize.sh
@@ -43,9 +52,11 @@ jobs:
         cd components/profile-controller/config
         kubectl create ns kubeflow
 
-        export CURRENT_IMG=docker.io/kubeflownotebookswg/profile-controller:v1.5.0
-        export PR_IMG=${{env.IMG}}:${{env.TAG}}
+        export CURRENT_PROFILE_IMG=docker.io/kubeflownotebookswg/profile-controller:v1.6.0
+        export CURRENT_KFAM_IMG=docker.io/kubeflownotebookswg/kfam:v1.6.0
+        export PR_PROFILE_IMG=${{env.PROFILE_IMG}}:${{env.TAG}}
+        export PR_KFAM_IMG=${{env.KFAM_IMG}}:${{env.TAG}}
 
-        kustomize build overlays/kubeflow | sed "s#$CURRENT_IMG#$PR_IMG#g" | kubectl apply -f -
+        kustomize build overlays/kubeflow | sed "s#$CURRENT_PROFILE_IMG#$PR_PROFILE_IMG#g" | sed "s#$CURRENT_KFAM_IMG#$PR_KFAM_IMG#g" | kubectl apply -f -
         kubectl wait pods -n kubeflow -l kustomize.component=profiles --for=condition=Ready --timeout=300s
 
diff --git a/components/profile-controller/config/base/kustomization.yaml b/components/profile-controller/config/base/kustomization.yaml
@@ -12,7 +12,7 @@ patchesStrategicMerge:
 images:
 - name: docker.io/kubeflownotebookswg/profile-controller
   newName: docker.io/kubeflownotebookswg/profile-controller
-  newTag: v1.5.0
+  newTag: v1.6.0
 
 configMapGenerator:
 - name: namespace-labels-data

diff --git a/components/profile-controller/config/overlays/kubeflow/kustomization.yaml b/components/profile-controller/config/overlays/kubeflow/kustomization.yaml
@@ -29,4 +29,4 @@ vars:
 images:
 - name: docker.io/kubeflownotebookswg/kfam
   newName: docker.io/kubeflownotebookswg/kfam
-  newTag: v1.5.0
+  newTag: v1.6.0