fix: rollout transformer for pod affinity. add new v0.7 name references and testing

Makefile

@@ -88,9 +88,13 @@ lint:
 	golangci-lint run --fix
 
 .PHONY: test
-test:
+test: test-kustomize
 	go test -failfast -covermode=count -coverprofile=coverage.out ${TEST_TARGET}
 
+.PHONY: test-kustomize
+test-kustomize:
+	./test/kustomize/test.sh
+
 .PHONY: coverage
 coverage: test
 	go tool cover -html=coverage.out -o coverage.html

docs/features/kustomize.md

@@ -18,4 +18,5 @@ configurations:
 - rollout-transform.yaml
 ```
 
-A example kustomize app demonstrating the ability to use transformers with Rollouts can be seen [here](https://github.com/argoproj/argo-rollouts/blob/master/docs/features/kustomize/).
+A example kustomize app demonstrating the ability to use transformers with Rollouts can be seen
+[here](https://github.com/argoproj/argo-rollouts/blob/master/docs/features/kustomize/example).

docs/features/kustomize/kustomization.yaml → docs/features/kustomize/example/kustomization.yaml

@@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 configurations:
-- rollout-transform.yaml
+- ../rollout-transform.yaml
 
 namePrefix: my-
 

docs/features/kustomize/rollout-transform.yaml

@@ -1,4 +1,4 @@
-# https://github.com/kubernetes-sigs/kustomize/blob/master/api/plugins/builtinconfig/consts/namereference.go
+# https://github.com/kubernetes-sigs/kustomize/blob/master/api/konfig/builtinpluginconsts/namereference.go
 nameReference:
 - kind: ConfigMap
   version: v1
@@ -32,7 +32,17 @@ nameReference:
     kind: Rollout
   - path: spec/template/spec/volumes/projected/sources/secret/name
     kind: Rollout
-# These Service fields are unique to Rollouts and absent from Rollout
+- kind: ServiceAccount
+  version: v1
+  fieldSpecs:
+  - path: spec/template/spec/serviceAccountName
+    kind: Rollout
+- kind: PersistentVolumeClaim
+  version: v1
+  fieldSpecs:
+  - path: spec/template/spec/volumes/persistentVolumeClaim/claimName
+    kind: Rollout
+# The name references below are unique to Rollouts and not applicable to Deployment
 - kind: Service
   version: v1
   fieldSpecs:
@@ -42,18 +52,15 @@ nameReference:
     kind: Rollout
   - path: spec/strategy/canary/canaryService
     kind: Rollout
-- kind: ServiceAccount
-  version: v1
-  fieldSpecs:
-  - path: spec/template/spec/serviceAccountName
+  - path: spec/strategy/canary/stableService
     kind: Rollout
-- kind: PersistentVolumeClaim
-  version: v1
+- kind: VirtualService
+  group: networking.istio.io
   fieldSpecs:
-  - path: spec/template/spec/volumes/persistentVolumeClaim/claimName
+  - path: spec/strategy/canary/trafficRouting/istio/virtualService/name
     kind: Rollout
 
-# https://github.com/kubernetes-sigs/kustomize/blob/master/api/plugins/builtinconfig/consts/commonlabels.go
+# https://github.com/kubernetes-sigs/kustomize/blob/master/api/konfig/builtinpluginconsts/commonlabels.go
 commonLabels:
 - path: spec/selector/matchLabels
   create: true
@@ -63,28 +70,24 @@ commonLabels:
   kind: Rollout
 - path: spec/template/spec/affinity/podAffinity/preferredDuringSchedulingIgnoredDuringExecution/podAffinityTerm/labelSelector/matchLabels
   create: false
-  group: apps
   kind: Rollout
 - path: spec/template/spec/affinity/podAffinity/requiredDuringSchedulingIgnoredDuringExecution/labelSelector/matchLabels
   create: false
-  group: apps
   kind: Rollout
 - path: spec/template/spec/affinity/podAntiAffinity/preferredDuringSchedulingIgnoredDuringExecution/podAffinityTerm/labelSelector/matchLabels
   create: false
-  group: apps
   kind: Rollout
 - path: spec/template/spec/affinity/podAntiAffinity/requiredDuringSchedulingIgnoredDuringExecution/labelSelector/matchLabels
   create: false
-  group: apps
   kind: Rollout
 
-# https://github.com/kubernetes-sigs/kustomize/blob/master/api/plugins/builtinconfig/consts/commonannotations.go
+# https://github.com/kubernetes-sigs/kustomize/blob/master/api/konfig/builtinpluginconsts/commonannotations.go
 commonAnnotations:
 - path: spec/template/metadata/annotations
   create: true
   kind: Rollout
 
-# https://github.com/kubernetes-sigs/kustomize/blob/master/api/plugins/builtinconfig/consts/varreference.go
+# https://github.com/kubernetes-sigs/kustomize/blob/master/api/konfig/builtinpluginconsts/varreference.go
 varReference:
 - path: spec/template/spec/containers/args
   kind: Rollout
@@ -103,7 +106,7 @@ varReference:
 - path: spec/template/spec/initContainers/volumeMounts/mountPath
   kind: Rollout
 
-# https://github.com/kubernetes-sigs/kustomize/blob/master/api/plugins/builtinconfig/consts/replicas.go
+# https://github.com/kubernetes-sigs/kustomize/blob/master/api/konfig/builtinpluginconsts/replicas.go
 replicas:
 - path: spec/replicas
   create: true

test/kustomize/rollout/expected.yaml

@@ -0,0 +1,152 @@
+apiVersion: v1
+data:
+  FOO: BAR
+kind: ConfigMap
+metadata:
+  annotations:
+    foo: bar
+  labels:
+    foo: bar
+  name: my-guestbook-cm-bt8kmct6gk
+---
+apiVersion: v1
+data:
+  password: UGE1NXcwcmQ=
+kind: Secret
+metadata:
+  annotations:
+    foo: bar
+  labels:
+    foo: bar
+  name: my-guestbook-secret-t95h96m85d
+type: Opaque
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    foo: bar
+  labels:
+    foo: bar
+  name: my-guestbook-canary-svc
+spec:
+  ports:
+  - port: 80
+    protocol: TCP
+    targetPort: 8080
+  selector:
+    app: guestbook
+    foo: bar
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    foo: bar
+  labels:
+    foo: bar
+  name: my-guestbook-stable-svc
+spec:
+  ports:
+  - port: 80
+    protocol: TCP
+    targetPort: 8080
+  selector:
+    app: guestbook
+    foo: bar
+---
+apiVersion: argoproj.io/v1alpha1
+kind: Rollout
+metadata:
+  annotations:
+    foo: bar
+  labels:
+    foo: bar
+  name: my-guestbook
+spec:
+  replicas: 3
+  selector:
+    matchLabels:
+      app: guestbook
+      foo: bar
+  strategy:
+    canary:
+      canaryService: my-guestbook-canary-svc
+      stableService: my-guestbook-stable-svc
+      trafficRouting:
+        istio:
+          virtualService:
+            name: my-guestbook-vsvc
+            routes:
+            - primary
+  template:
+    metadata:
+      annotations:
+        foo: bar
+      labels:
+        app: guestbook
+        foo: bar
+    spec:
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            podAffinityTerm:
+              labelSelector:
+                matchLabels:
+                  app: guestbook
+                  foo: bar
+      containers:
+      - command:
+        - ping my-guestbook-stable-svc
+        env:
+        - name: PASSWORD
+          valueFrom:
+            secretKeyRef:
+              key: password
+              name: my-guestbook-secret-t95h96m85d
+        - name: FOO
+          valueFrom:
+            configMapKeyRef:
+              key: FOO
+              name: my-guestbook-cm-bt8kmct6gk
+        image: guestbook:v2
+        name: guestbook
+        ports:
+        - containerPort: 8080
+          name: http
+          protocol: TCP
+        volumeMounts:
+        - mountPath: /etc/config
+          name: config-volume
+        - mountPath: /etc/secrets
+          name: secret-volume
+      volumes:
+      - configMap:
+          name: my-guestbook-cm-bt8kmct6gk
+        name: config-volume
+      - name: secret-volume
+        secret:
+          secretName: my-guestbook-secret-t95h96m85d
+---
+apiVersion: networking.istio.io/v1alpha3
+kind: VirtualService
+metadata:
+  annotations:
+    foo: bar
+  labels:
+    foo: bar
+  name: my-guestbook-vsvc
+spec:
+  gateways:
+  - istio-rollout-gateway
+  hosts:
+  - istio-rollout.dev.argoproj.io
+  http:
+  - name: primary
+    route:
+    - destination:
+        host: guestbook-stable-svc
+      weight: 100
+    - destination:
+        host: guestbook-canary-svc
+      weight: 0

test/kustomize/rollout/kustomization.yaml

@@ -0,0 +1,43 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+configurations:
+- ../../../docs/features/kustomize/rollout-transform.yaml
+
+namePrefix: my-
+
+resources:
+- rollout.yaml
+
+configMapGenerator:
+- name: guestbook-cm
+  literals:
+  - FOO=BAR
+
+secretGenerator:
+- name: guestbook-secret
+  literals:
+  - password=Pa55w0rd
+
+commonLabels:
+  foo: bar
+
+commonAnnotations:
+  foo: bar
+
+vars:
+- name: SERVICE_NAME
+  objref:
+    kind: Service
+    name: guestbook-stable-svc
+    apiVersion: v1
+  fieldref:
+    fieldpath: metadata.name
+
+replicas:
+- name: guestbook
+  count: 3
+
+images:
+- name: guestbook
+  newTag: v2