Merge branch 'dev'

syntasso · Jul 13, 2023 · 2cde779 · 2cde779
2 parents 2d8b467 + 9929c06
commit 2cde779
Show file tree

Hide file tree

Showing 18 changed files with 662 additions and 286 deletions.
diff --git a/Makefile b/Makefile
@@ -126,7 +126,7 @@ ifeq ($(shell uname -sm),Darwin arm64)
 endif
 .PHONY: test
 test: manifests generate fmt vet envtest ## Run tests.
-	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) $(ARCH_FLAG) use $(ENVTEST_K8S_VERSION) -p path)" WC_IMG=${WC_IMG} TEST_PROMISE_CONTROLLER_POD_IDENTIFIER_UUID=12345 ACK_GINKGO_DEPRECATIONS=1.16.4 go run github.com/onsi/ginkgo/ginkgo -r  --coverprofile cover.out --skipPackage=system
+	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) $(ARCH_FLAG) use $(ENVTEST_K8S_VERSION) -p path)" WC_IMG=${WC_IMG} ACK_GINKGO_DEPRECATIONS=1.16.4 go run github.com/onsi/ginkgo/ginkgo -r  --coverprofile cover.out --skipPackage=system
 
 ENVTEST = $(shell pwd)/bin/setup-envtest
 .PHONY: envtest

diff --git a/api/v1alpha1/promise_types.go b/api/v1alpha1/promise_types.go
@@ -57,6 +57,8 @@ type Workflows struct {
 type WorkflowTriggers struct {
 	// +kubebuilder:pruning:PreserveUnknownFields
 	Configure []unstructured.Unstructured `json:"configure,omitempty"`
+	// +kubebuilder:pruning:PreserveUnknownFields
+	Delete []unstructured.Unstructured `json:"delete,omitempty"`
 }
 
 // Resources represents the manifest workload to be deployed on workers

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/charts/kratix/crds/platform_kratix_io_crds.yaml b/charts/kratix/crds/platform_kratix_io_crds.yaml
@@ -244,6 +244,11 @@ spec:
                             type: object
                           type: array
                           x-kubernetes-preserve-unknown-fields: true
+                        delete:
+                          items:
+                            type: object
+                          type: array
+                          x-kubernetes-preserve-unknown-fields: true
                       type: object
                   type: object
               type: object

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:1d6dc345ccfe23f51fddd4110b4b187c71151642
+  WC_IMG: syntasso/kratix-platform-pipeline-adapter:9929c0652d4e6778f3c4220f51ca02fa0df3c9b8
 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:1d6dc345ccfe23f51fddd4110b4b187c71151642
+          image: syntasso/kratix-platform:9929c0652d4e6778f3c4220f51ca02fa0df3c9b8
           livenessProbe:
             httpGet:
               path: /healthz

diff --git a/config/crd/bases/platform.kratix.io_promises.yaml b/config/crd/bases/platform.kratix.io_promises.yaml
@@ -66,6 +66,11 @@ spec:
                           type: object
                         type: array
                         x-kubernetes-preserve-unknown-fields: true
+                      delete:
+                        items:
+                          type: object
+                        type: array
+                        x-kubernetes-preserve-unknown-fields: true
                     type: object
                 type: object
             type: object

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: 1d6dc345ccfe23f51fddd4110b4b187c71151642
+  newTag: 9929c0652d4e6778f3c4220f51ca02fa0df3c9b8
diff --git a/config/samples/redis/redis-promise.yaml b/config/samples/redis/redis-promise.yaml
@@ -4495,3 +4495,13 @@ spec:
             containers:
               - image: syntasso/kustomize-redis
                 name: kustomize-redis
+      delete:
+        - apiVersion: platform.kratix.io/v1alpha1
+          kind: Pipeline
+          metadata:
+            name: instance-delete
+            namespace: default
+          spec:
+            containers:
+              - image: syntasso/kustomize-redis
+                name: kustomize-redis