diff --git a/.gitignore b/.gitignore index 5bc6ce80..bf8a6d8c 100644 --- 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 index ec41dc13..305ab87a 100644 --- 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 index 5a988ba3..d40f15d1 100644 --- 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 index 7d6b25d4..fed7df7f 100644 --- 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 index a4ded538..f39c47af 100644 --- 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 index 80622450..3f9a1682 100644 --- 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 index c29a434b..dc1196dc 100644 --- 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 index 3c19bf6a..7b4b63da 100644 --- 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())