fluxcd · stefanprodan · Feb 26, 2020 · Feb 23, 2020 · Feb 23, 2020 · Feb 23, 2020
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -82,7 +82,7 @@ jobs:
       - run: test/e2e-istio.sh
       - run: test/e2e-tests.sh
 
-  e2e-kubernetes-testing:
+  e2e-kubernetes-daemonset-testing:
     machine: true
     steps:
       - checkout
@@ -91,7 +91,18 @@ jobs:
       - run: test/container-build.sh
       - run: test/e2e-kind.sh v1.17.0
       - run: test/e2e-kubernetes.sh
-      - run: test/e2e-kubernetes-tests.sh
+      - run: test/e2e-kubernetes-tests-daemonset.sh
+
+  e2e-kubernetes-deployment-testing:
+    machine: true
+    steps:
+      - checkout
+      - attach_workspace:
+          at: /tmp/bin
+      - run: test/container-build.sh
+      - run: test/e2e-kind.sh v1.17.0
+      - run: test/e2e-kubernetes.sh
+      - run: test/e2e-kubernetes-tests-deployment.sh
 
   e2e-kubernetes-svc-testing:
     machine: true
@@ -215,7 +226,10 @@ workflows:
       - e2e-istio-testing:
           requires:
             - build-binary
-      - e2e-kubernetes-testing:
+      - e2e-kubernetes-daemonset-testing:
+          requires:
+            - build-binary
+      - e2e-kubernetes-deployment-testing:
           requires:
             - build-binary
       - e2e-gloo-testing:
@@ -234,7 +248,8 @@ workflows:
           requires:
             - build-binary
             - e2e-istio-testing
-            - e2e-kubernetes-testing
+            - e2e-kubernetes-daemonset-testing
+            - e2e-kubernetes-deployment-testing
             - e2e-gloo-testing
             - e2e-nginx-testing
             - e2e-linkerd-testing

diff --git a/artifacts/flagger/account.yaml b/artifacts/flagger/account.yaml
@@ -24,6 +24,7 @@ rules:
   - apiGroups:
       - apps
     resources:
+      - daemonsets
       - deployments
     verbs: ["*"]
   - apiGroups:

diff --git a/artifacts/flagger/crd.yaml b/artifacts/flagger/crd.yaml
@@ -87,6 +87,7 @@ spec:
                 kind:
                   type: string
                   enum:
+                    - DaemonSet
                     - Deployment
                     - Service
                 name:

diff --git a/charts/flagger/crds/crd.yaml b/charts/flagger/crds/crd.yaml
@@ -87,6 +87,7 @@ spec:
                 kind:
                   type: string
                   enum:
+                    - DaemonSet
                     - Deployment
                     - Service
                 name:

diff --git a/charts/flagger/templates/rbac.yaml b/charts/flagger/templates/rbac.yaml
@@ -20,6 +20,7 @@ rules:
   - apiGroups:
       - apps
     resources:
+      - daemonsets
       - deployments
     verbs: ["*"]
   - apiGroups:

diff --git a/kustomize/base/flagger/crd.yaml b/kustomize/base/flagger/crd.yaml
@@ -87,6 +87,7 @@ spec:
                 kind:
                   type: string
                   enum:
+                    - DaemonSet
                     - Deployment
                     - Service
                 name:

diff --git a/kustomize/base/flagger/rbac.yaml b/kustomize/base/flagger/rbac.yaml
@@ -14,6 +14,7 @@ rules:
   - apiGroups:
       - apps
     resources:
+      - daemonsets
       - deployments
     verbs: ["*"]
   - apiGroups:

diff --git a/pkg/canary/config_tracker.go b/pkg/canary/config_tracker.go
@@ -93,16 +93,36 @@ func (ct *ConfigTracker) getRefFromSecret(name string, namespace string) (*Confi
 func (ct *ConfigTracker) GetTargetConfigs(cd *flaggerv1.Canary) (map[string]ConfigRef, error) {
 	res := make(map[string]ConfigRef)
 	targetName := cd.Spec.TargetRef.Name
-	targetDep, err := ct.KubeClient.AppsV1().Deployments(cd.Namespace).Get(targetName, metav1.GetOptions{})
-	if err != nil {
-		if errors.IsNotFound(err) {
-			return res, fmt.Errorf("deployment %s.%s not found", targetName, cd.Namespace)
+
+	var vs []corev1.Volume
+	var cs []corev1.Container
+	switch cd.Spec.TargetRef.Kind {
+	case "Deployment":
+		targetDep, err := ct.KubeClient.AppsV1().Deployments(cd.Namespace).Get(targetName, metav1.GetOptions{})
+		if err != nil {
+			if errors.IsNotFound(err) {
+				return res, fmt.Errorf("deployment %s.%s not found", targetName, cd.Namespace)
+			}
+			return res, fmt.Errorf("deployment %s.%s query error %v", targetName, cd.Namespace, err)
+		}
+		vs = targetDep.Spec.Template.Spec.Volumes
+		cs = targetDep.Spec.Template.Spec.Containers
+	case "DaemonSet":
+		targetDae, err := ct.KubeClient.AppsV1().DaemonSets(cd.Namespace).Get(targetName, metav1.GetOptions{})
+		if err != nil {
+			if errors.IsNotFound(err) {
+				return res, fmt.Errorf("daemonset %s.%s not found", targetName, cd.Namespace)
+			}
+			return res, fmt.Errorf("daemonset %s.%s query error %v", targetName, cd.Namespace, err)
 		}
-		return res, fmt.Errorf("deployment %s.%s query error %v", targetName, cd.Namespace, err)
+		vs = targetDae.Spec.Template.Spec.Volumes
+		cs = targetDae.Spec.Template.Spec.Containers
+	default:
+		return nil, fmt.Errorf("TargetRef.Kind invalid: %s", cd.Spec.TargetRef.Kind)
 	}
 
 	// scan volumes
-	for _, volume := range targetDep.Spec.Template.Spec.Volumes {
+	for _, volume := range vs {
 		if cmv := volume.ConfigMap; cmv != nil {
 			config, err := ct.getRefFromConfigMap(cmv.Name, cd.Namespace)
 			if err != nil {
@@ -152,7 +172,7 @@ func (ct *ConfigTracker) GetTargetConfigs(cd *flaggerv1.Canary) (map[string]Conf
 		}
 	}
 	// scan containers
-	for _, container := range targetDep.Spec.Template.Spec.Containers {
+	for _, container := range cs {
 		// scan env
 		for _, env := range container.Env {
 			if env.ValueFrom != nil {
-Original file line number
+Diff line change
@@ Expand Up / @@ -87,6 +87,7 @@ spec: @@
                     kind:
                       type: string
                       enum:
+                        - DaemonSet
                         - Deployment
                         - Service
                     name:
@@ Expand Down @@