Merge pull request #762 from fluxcd/label-prefix

Add e2e tests for label prefix inclusion

.github/workflows/build.yaml

@@ -1,11 +1,13 @@
 name: build
 
 on:
+  workflow_dispatch:
   pull_request:
+    branches:
+      - main
   push:
     branches:
       - main
-      - github-actions
 
 jobs:
   container:

.github/workflows/e2e.yaml

@@ -1,11 +1,13 @@
 name: e2e
 
 on:
+  workflow_dispatch:
   pull_request:
+    branches:
+      - main
   push:
     branches:
       - main
-      - github-actions
 
 jobs:
   kind:

kustomize/appmesh/patch.yaml

@@ -9,11 +9,9 @@ spec:
         - name: flagger
           args:
             - -log-level=info
+            - -include-label-prefix=app.kubernetes.io
             - -mesh-provider=appmesh
             - -metrics-server=http://appmesh-prometheus:9090
-            - -slack-user=flagger
-            - -slack-channel=
-            - -slack-url=
 ---
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding

kustomize/contour/patch.yaml

@@ -9,9 +9,7 @@ spec:
         - name: flagger
           args:
             - -log-level=info
+            - -include-label-prefix=app.kubernetes.io
             - -mesh-provider=contour
             - -ingress-class=contour
             - -metrics-server=http://flagger-prometheus:9090
-            - -slack-user=flagger
-            - -slack-channel=
-            - -slack-url=

kustomize/istio/patch.yaml

@@ -9,12 +9,9 @@ spec:
         - name: flagger
           args:
             - -log-level=info
+            - -include-label-prefix=app.kubernetes.io
             - -mesh-provider=istio
             - -metrics-server=http://prometheus:9090
-            - -slack-user=flagger
-            - -slack-channel=
-            - -slack-url=
----
 ---
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding

kustomize/kubernetes/patch.yaml

@@ -9,8 +9,6 @@ spec:
         - name: flagger
           args:
             - -log-level=info
+            - -include-label-prefix=app.kubernetes.io
             - -mesh-provider=kubernetes
             - -metrics-server=http://flagger-prometheus:9090
-            - -slack-user=flagger
-            - -slack-channel=
-            - -slack-url=

kustomize/linkerd/patch.yaml

@@ -9,11 +9,9 @@ spec:
         - name: flagger
           args:
             - -log-level=info
+            - -include-label-prefix=app.kubernetes.io
             - -mesh-provider=linkerd
             - -metrics-server=http://linkerd-prometheus:9090
-            - -slack-user=flagger
-            - -slack-channel=
-            - -slack-url=
 ---
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding

test/kubernetes/install.sh

@@ -12,4 +12,4 @@ kubectl apply -k ${REPO_ROOT}/kustomize/kubernetes
 kubectl -n flagger-system set image deployment/flagger flagger=test/flagger:latest
 
 kubectl -n flagger-system rollout status deployment/flagger
-kubectl -n flagger-system rollout status deployment/flagger-prometheus
+kubectl -n flagger-system rollout status deployment/flagger-prometheus

test/kubernetes/test-deployment.sh

@@ -72,6 +72,17 @@ until ${ok}; do
     fi
 done
 
+passed=$(kubectl -n test get deploy/podinfo-primary -oyaml 2>&1 | { grep test-label-prefix || true; })
+if [ -z "$passed" ]; then
+  echo -e '\u2716 primary copy labels by prefix test failed'
+  exit 1
+fi
+passed=$(kubectl -n test get deploy/podinfo-primary -oyaml 2>&1 | { grep test-annotation-prefix || true; })
+if [ -z "$passed" ]; then
+  echo -e '\u2716 primary copy annotations by prefix test failed'
+  exit 1
+fi
+
 echo '✔ Canary initialization test passed'
 
 echo '>>> Triggering canary deployment'

test/workloads/deployment.yaml

@@ -4,7 +4,10 @@ metadata:
   name: podinfo
   namespace: test
   labels:
-    app: podinfo
+    app.kubernetes.io/name: podinfo
+    app.kubernetes.io/managed-by: test-label-prefix
+  annotations:
+    app.kubernetes.io/instance: test-annotation-prefix
 spec:
   minReadySeconds: 5
   revisionHistoryLimit: 5