Skip to content

Commit 72adc03

Browse files
author
Corneil du Plessis
committed
[CI] Remove carvel change dependencies.
1 parent c9c7721 commit 72adc03

File tree

5 files changed

+10
-24
lines changed

5 files changed

+10
-24
lines changed

src/carvel/config/dataflow-deployment.yml

-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ apiVersion: apps/v1
1414
kind: Deployment
1515
metadata:
1616
name: scdf-server
17-
annotations:
18-
kapp.k14s.io/change-group: "scdf.tanzu.vmware.com/server"
19-
kapp.k14s.io/change-rule.1: "upsert after upserting scdf.tanzu.vmware.com/db"
20-
kapp.k14s.io/change-rule.2: "upsert after upserting scdf.tanzu.vmware.com/skipper"
2117
labels:
2218
app: scdf-server
2319
spec:

src/carvel/config/dataflow-svc.yml

-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ kind: Service
88
apiVersion: v1
99
metadata:
1010
name: scdf-server
11-
annotations:
12-
kapp.k14s.io/change-group: "scdf.tanzu.vmware.com/server"
13-
kapp.k14s.io/change-rule.1: "upsert after upserting scdf.tanzu.vmware.com/db"
14-
kapp.k14s.io/change-rule.2: "upsert after upserting scdf.tanzu.vmware.com/skipper"
1511
labels:
1612
app: scdf-server
1713
spring-deployment-id: scdf

src/carvel/config/skipper-deployment.yml

-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ apiVersion: apps/v1
1010
kind: Deployment
1111
metadata:
1212
name: skipper
13-
annotations:
14-
kapp.k14s.io/change-group: "scdf.tanzu.vmware.com/skipper"
15-
kapp.k14s.io/change-rule: "upsert after upserting scdf.tanzu.vmware.com/db"
1613
labels:
1714
app: skipper
1815
spec:

src/carvel/config/skipper-svc.yml

-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ apiVersion: v1
99
kind: Service
1010
metadata:
1111
name: skipper
12-
annotations:
13-
kapp.k14s.io/change-group: "scdf.tanzu.vmware.com/skipper"
14-
kapp.k14s.io/change-rule: "upsert after upserting scdf.tanzu.vmware.com/db"
1512
labels:
1613
app: skipper
1714
spring-deployment-id: scdf

src/carvel/test/ordering.test.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ describe('ordering', () => {
2525
const skipperDbService = findService(yaml, DB_SKIPPER_NAME);
2626
const dataflowDbService = findService(yaml, DB_DATAFLOW_NAME);
2727

28-
expect(findAnnotation(skipperService, 'kapp.k14s.io/change-group')).toBe('scdf.tanzu.vmware.com/skipper');
29-
expect(findAnnotation(skipperDeployment, 'kapp.k14s.io/change-group')).toBe('scdf.tanzu.vmware.com/skipper');
30-
expect(findAnnotation(dataflowService, 'kapp.k14s.io/change-group')).toBe('scdf.tanzu.vmware.com/server');
31-
expect(findAnnotation(dataflowDeployment, 'kapp.k14s.io/change-group')).toBe('scdf.tanzu.vmware.com/server');
32-
expect(findAnnotations(dataflowService, 'kapp.k14s.io/change-rule')).toContainAnyValues([
33-
'upsert after upserting scdf.tanzu.vmware.com/skipper'
34-
]);
35-
expect(findAnnotations(dataflowDeployment, 'kapp.k14s.io/change-rule')).toContainAnyValues([
36-
'upsert after upserting scdf.tanzu.vmware.com/skipper'
37-
]);
28+
// expect(findAnnotation(skipperService, 'kapp.k14s.io/change-group')).toBe('scdf.tanzu.vmware.com/skipper');
29+
// expect(findAnnotation(skipperDeployment, 'kapp.k14s.io/change-group')).toBe('scdf.tanzu.vmware.com/skipper');
30+
// expect(findAnnotation(dataflowService, 'kapp.k14s.io/change-group')).toBe('scdf.tanzu.vmware.com/server');
31+
// expect(findAnnotation(dataflowDeployment, 'kapp.k14s.io/change-group')).toBe('scdf.tanzu.vmware.com/server');
32+
// expect(findAnnotations(dataflowService, 'kapp.k14s.io/change-rule')).toContainAnyValues([
33+
// 'upsert after upserting scdf.tanzu.vmware.com/skipper'
34+
// ]);
35+
// expect(findAnnotations(dataflowDeployment, 'kapp.k14s.io/change-rule')).toContainAnyValues([
36+
// 'upsert after upserting scdf.tanzu.vmware.com/skipper'
37+
// ]);
3838
});
3939

4040
it('should have annotation for servers configmap', async () => {

0 commit comments

Comments
 (0)