Merge branch 'dev'

syntasso · Jul 13, 2023 · 6943c53 · 6943c53
2 parents 2cde779 + 0372062
commit 6943c53
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,7 +28,6 @@ __debug_bin
 
 # Generated by make distribution - contains pointers to images
 distribution/kratix.yaml
-charts/kratix/crds/platform_kratix_io_crds.yaml
 charts/kratix/templates/distribution.yaml
 
 # Generated by .goreleaser.yml - contains binaries released to GitHub

diff --git a/charts/kratix/templates/distribution.yaml b/charts/kratix/templates/distribution.yaml
@@ -327,7 +327,7 @@ metadata:
 ---
 apiVersion: v1
 data:
-  WC_IMG: syntasso/kratix-platform-pipeline-adapter:9929c0652d4e6778f3c4220f51ca02fa0df3c9b8
+  WC_IMG: syntasso/kratix-platform-pipeline-adapter:0372062c21fbdaa138e2b70b44802d55d3354625
 kind: ConfigMap
 metadata:
   name: kratix-platform-wc-img-config
@@ -388,7 +388,7 @@ spec:
                 configMapKeyRef:
                   key: WC_IMG
                   name: kratix-platform-wc-img-config
-          image: syntasso/kratix-platform:9929c0652d4e6778f3c4220f51ca02fa0df3c9b8
+          image: syntasso/kratix-platform:0372062c21fbdaa138e2b70b44802d55d3354625
           livenessProbe:
             httpGet:
               path: /healthz

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -20,4 +20,4 @@ configMapGenerator:
 images:
 - name: controller
   newName: syntasso/kratix-platform
-  newTag: 9929c0652d4e6778f3c4220f51ca02fa0df3c9b8
+  newTag: 0372062c21fbdaa138e2b70b44802d55d3354625
diff --git a/distribution/kratix.yaml b/distribution/kratix.yaml
@@ -762,7 +762,7 @@ metadata:
 ---
 apiVersion: v1
 data:
-  WC_IMG: syntasso/kratix-platform-pipeline-adapter:9929c0652d4e6778f3c4220f51ca02fa0df3c9b8
+  WC_IMG: syntasso/kratix-platform-pipeline-adapter:0372062c21fbdaa138e2b70b44802d55d3354625
 kind: ConfigMap
 metadata:
   name: kratix-platform-wc-img-config
@@ -823,7 +823,7 @@ spec:
             configMapKeyRef:
               key: WC_IMG
               name: kratix-platform-wc-img-config
-        image: syntasso/kratix-platform:9929c0652d4e6778f3c4220f51ca02fa0df3c9b8
+        image: syntasso/kratix-platform:0372062c21fbdaa138e2b70b44802d55d3354625
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/distribution/single-cluster/install-all-in-one.yaml b/distribution/single-cluster/install-all-in-one.yaml
@@ -762,7 +762,7 @@ metadata:
 ---
 apiVersion: v1
 data:
-  WC_IMG: syntasso/kratix-platform-pipeline-adapter:9929c0652d4e6778f3c4220f51ca02fa0df3c9b8
+  WC_IMG: syntasso/kratix-platform-pipeline-adapter:0372062c21fbdaa138e2b70b44802d55d3354625
 kind: ConfigMap
 metadata:
   name: kratix-platform-wc-img-config
@@ -823,7 +823,7 @@ spec:
             configMapKeyRef:
               key: WC_IMG
               name: kratix-platform-wc-img-config
-        image: syntasso/kratix-platform:9929c0652d4e6778f3c4220f51ca02fa0df3c9b8
+        image: syntasso/kratix-platform:0372062c21fbdaa138e2b70b44802d55d3354625
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/lib/pipeline/configure.go b/lib/pipeline/configure.go
@@ -12,6 +12,8 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
 
+const kratixConfigureOperation = "configure"
+
 func NewConfigurePipeline(rr *unstructured.Unstructured, pipelines []platformv1alpha1.Pipeline, resourceRequestIdentifier, promiseIdentifier string) v1.Pod {
 	volumes := metadataAndSchedulingVolumes(promiseIdentifier)
 
@@ -79,6 +81,12 @@ func configurePipelineInitContainers(rr *unstructured.Unstructured, pipelines []
 					{Name: "vol" + strconv.Itoa(i), MountPath: "/input"},
 					{Name: "vol" + strconv.Itoa(i+1), MountPath: "/output"},
 				},
+				Env: []v1.EnvVar{
+					{
+						Name:  kratixOperationEnvVar,
+						Value: kratixConfigureOperation,
+					},
+				},
 			})
 		}
 	}

diff --git a/lib/pipeline/delete.go b/lib/pipeline/delete.go
@@ -9,6 +9,8 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
 
+const kratixDeleteOperation = "delete"
+
 func NewDeletePipeline(rr *unstructured.Unstructured, pipelines []platformv1alpha1.Pipeline, resourceRequestIdentifier, promiseIdentifier string) v1.Pod {
 	containers, pipelineVolumes := deletePipelineContainers(rr, pipelines, resourceRequestIdentifier)
 
@@ -56,8 +58,8 @@ func deletePipelineContainers(rr *unstructured.Unstructured, pipelines []platfor
 				},
 				Env: []v1.EnvVar{
 					{
-						Name:  "KRATIX_OPERATION",
-						Value: "delete",
+						Name:  kratixOperationEnvVar,
+						Value: kratixDeleteOperation,
 					},
 				},
 			})

diff --git a/lib/pipeline/shared.go b/lib/pipeline/shared.go
@@ -9,6 +9,8 @@ import (
 	"k8s.io/apimachinery/pkg/util/uuid"
 )
 
+const kratixOperationEnvVar = "KRATIX_OPERATION"
+
 func readerContainerAndVolume(rr *unstructured.Unstructured) (v1.Container, v1.Volume) {
 	resourceKindNameNamespace := fmt.Sprintf("%s.%s %s --namespace %s",
 		strings.ToLower(rr.GetKind()), rr.GroupVersionKind().Group, rr.GetName(), rr.GetNamespace())