From 72adc03606218dc5fab2c480549465ab7f14fbd2 Mon Sep 17 00:00:00 2001
From: Corneil du Plessis <corneil.du-plessis@broadcom.com>
Date: Tue, 10 Sep 2024 14:54:18 +0200
Subject: [PATCH] [CI] Remove carvel change dependencies.
---
src/carvel/config/dataflow-deployment.yml | 4 ----
src/carvel/config/dataflow-svc.yml | 4 ----
src/carvel/config/skipper-deployment.yml | 3 ---
src/carvel/config/skipper-svc.yml | 3 ---
src/carvel/test/ordering.test.ts | 20 ++++++++++----------
5 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/src/carvel/config/dataflow-deployment.yml b/src/carvel/config/dataflow-deployment.yml
index a51378d678..ff7c9758a7 100644
--- a/src/carvel/config/dataflow-deployment.yml
+++ b/src/carvel/config/dataflow-deployment.yml
@@ -14,10 +14,6 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: scdf-server
- annotations:
- kapp.k14s.io/change-group: "scdf.tanzu.vmware.com/server"
- kapp.k14s.io/change-rule.1: "upsert after upserting scdf.tanzu.vmware.com/db"
- kapp.k14s.io/change-rule.2: "upsert after upserting scdf.tanzu.vmware.com/skipper"
labels:
app: scdf-server
spec:
diff --git a/src/carvel/config/dataflow-svc.yml b/src/carvel/config/dataflow-svc.yml
index de0a15015e..2d0ef32379 100644
--- a/src/carvel/config/dataflow-svc.yml
+++ b/src/carvel/config/dataflow-svc.yml
@@ -8,10 +8,6 @@ kind: Service
apiVersion: v1
metadata:
name: scdf-server
- annotations:
- kapp.k14s.io/change-group: "scdf.tanzu.vmware.com/server"
- kapp.k14s.io/change-rule.1: "upsert after upserting scdf.tanzu.vmware.com/db"
- kapp.k14s.io/change-rule.2: "upsert after upserting scdf.tanzu.vmware.com/skipper"
labels:
app: scdf-server
spring-deployment-id: scdf
diff --git a/src/carvel/config/skipper-deployment.yml b/src/carvel/config/skipper-deployment.yml
index b6e6587c20..d4a2e78a8e 100644
--- a/src/carvel/config/skipper-deployment.yml
+++ b/src/carvel/config/skipper-deployment.yml
@@ -10,9 +10,6 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: skipper
- annotations:
- kapp.k14s.io/change-group: "scdf.tanzu.vmware.com/skipper"
- kapp.k14s.io/change-rule: "upsert after upserting scdf.tanzu.vmware.com/db"
labels:
app: skipper
spec:
diff --git a/src/carvel/config/skipper-svc.yml b/src/carvel/config/skipper-svc.yml
index 6219d77a90..e6229db45a 100644
--- a/src/carvel/config/skipper-svc.yml
+++ b/src/carvel/config/skipper-svc.yml
@@ -9,9 +9,6 @@ apiVersion: v1
kind: Service
metadata:
name: skipper
- annotations:
- kapp.k14s.io/change-group: "scdf.tanzu.vmware.com/skipper"
- kapp.k14s.io/change-rule: "upsert after upserting scdf.tanzu.vmware.com/db"
labels:
app: skipper
spring-deployment-id: scdf
diff --git a/src/carvel/test/ordering.test.ts b/src/carvel/test/ordering.test.ts
index 05c7b6a728..f8e1e460f2 100644
--- a/src/carvel/test/ordering.test.ts
+++ b/src/carvel/test/ordering.test.ts
@@ -25,16 +25,16 @@ describe('ordering', () => {
const skipperDbService = findService(yaml, DB_SKIPPER_NAME);
const dataflowDbService = findService(yaml, DB_DATAFLOW_NAME);
- expect(findAnnotation(skipperService, 'kapp.k14s.io/change-group')).toBe('scdf.tanzu.vmware.com/skipper');
- expect(findAnnotation(skipperDeployment, 'kapp.k14s.io/change-group')).toBe('scdf.tanzu.vmware.com/skipper');
- expect(findAnnotation(dataflowService, 'kapp.k14s.io/change-group')).toBe('scdf.tanzu.vmware.com/server');
- expect(findAnnotation(dataflowDeployment, 'kapp.k14s.io/change-group')).toBe('scdf.tanzu.vmware.com/server');
- expect(findAnnotations(dataflowService, 'kapp.k14s.io/change-rule')).toContainAnyValues([
- 'upsert after upserting scdf.tanzu.vmware.com/skipper'
- ]);
- expect(findAnnotations(dataflowDeployment, 'kapp.k14s.io/change-rule')).toContainAnyValues([
- 'upsert after upserting scdf.tanzu.vmware.com/skipper'
- ]);
+ // expect(findAnnotation(skipperService, 'kapp.k14s.io/change-group')).toBe('scdf.tanzu.vmware.com/skipper');
+ // expect(findAnnotation(skipperDeployment, 'kapp.k14s.io/change-group')).toBe('scdf.tanzu.vmware.com/skipper');
+ // expect(findAnnotation(dataflowService, 'kapp.k14s.io/change-group')).toBe('scdf.tanzu.vmware.com/server');
+ // expect(findAnnotation(dataflowDeployment, 'kapp.k14s.io/change-group')).toBe('scdf.tanzu.vmware.com/server');
+ // expect(findAnnotations(dataflowService, 'kapp.k14s.io/change-rule')).toContainAnyValues([
+ // 'upsert after upserting scdf.tanzu.vmware.com/skipper'
+ // ]);
+ // expect(findAnnotations(dataflowDeployment, 'kapp.k14s.io/change-rule')).toContainAnyValues([
+ // 'upsert after upserting scdf.tanzu.vmware.com/skipper'
+ // ]);
});
it('should have annotation for servers configmap', async () => {