Fix: Remove PDB for single replica deployment

Signed-off-by: Daishan Peng <[email protected]>

pkg/controller/appdefinition/deploy.go

@@ -980,7 +980,10 @@ func ToFunctions(req router.Request, appInstance *v1.AppInstance, tag name.Refer
 			}
 			result = append(result, perms...)
 		}
-		result = append(result, sa, dep, pdb.ToPodDisruptionBudget(dep))
+		result = append(result, sa, dep)
+		if dep.Spec.Replicas != nil && *dep.Spec.Replicas > 1 {
+			result = append(result, pdb.ToPodDisruptionBudget(dep))
+		}
 	}
 
 	return result, nil
@@ -1036,7 +1039,11 @@ func ToDeployments(req router.Request, appInstance *v1.AppInstance, tag name.Ref
 			}
 			result = append(result, perms...)
 		}
-		result = append(result, sa, dep, pdb.ToPodDisruptionBudget(dep))
+		result = append(result, sa, dep)
+
+		if dep.Spec.Replicas != nil && *dep.Spec.Replicas > 1 {
+			result = append(result, pdb.ToPodDisruptionBudget(dep))
+		}
 	}
 
 	return result, nil

pkg/controller/appdefinition/deploy_test.go

@@ -353,7 +353,7 @@ func TestFiles(t *testing.T) {
 	assert.Equal(t, "/a/b2/c", dep.Spec.Template.Spec.Containers[1].VolumeMounts[1].MountPath)
 	assert.Equal(t, toHash("ZA=="), dep.Spec.Template.Spec.Containers[1].VolumeMounts[1].SubPath)
 
-	configMap := objs[6].(*corev1.Secret)
+	configMap := objs[4].(*corev1.Secret)
 
 	assert.Len(t, configMap.Data, 2)
 	assert.Equal(t, []byte("d"), configMap.Data[toHash("ZA==")])

pkg/controller/appdefinition/router.go

@@ -160,7 +160,7 @@ func toRouter(appInstance *v1.AppInstance, routerName string, router v1.Router,
 		dep.Spec.Replicas = new(int32)
 	}
 
-	return []kclient.Object{
+	objects := []kclient.Object{
 		dep,
 		&corev1.ConfigMap{
 			TypeMeta: metav1.TypeMeta{},
@@ -180,8 +180,13 @@ func toRouter(appInstance *v1.AppInstance, routerName string, router v1.Router,
 				Annotations: deploymentAnnotations,
 			},
 		},
-		pdb.ToPodDisruptionBudget(dep),
-	}, nil
+	}
+
+	if dep.Spec.Replicas != nil && *dep.Spec.Replicas > 1 {
+		objects = append(objects, pdb.ToPodDisruptionBudget(dep))
+	}
+
+	return objects, nil
 }
 
 func toNginxConf(internalClusterDomain, namespace, routerName string, router v1.Router) (string, string) {

pkg/controller/appdefinition/testdata/computeclass/all-set-overwrite-computeclass/expected.golden

@@ -112,36 +112,6 @@ spec:
       terminationGracePeriodSeconds: 10
 status: {}
 
----
-apiVersion: policy/v1
-kind: PodDisruptionBudget
-metadata:
-  annotations:
-    acorn.io/config-hash: ""
-  creationTimestamp: null
-  labels:
-    acorn.io/app-name: app-name
-    acorn.io/app-namespace: app-namespace
-    acorn.io/app-public-name: app-name
-    acorn.io/container-name: oneimage
-    acorn.io/managed: "true"
-    acorn.io/project-name: app-namespace
-  name: oneimage
-  namespace: app-created-namespace
-spec:
-  maxUnavailable: 25%
-  selector:
-    matchLabels:
-      acorn.io/app-name: app-name
-      acorn.io/app-namespace: app-namespace
-      acorn.io/container-name: oneimage
-      acorn.io/managed: "true"
-status:
-  currentHealthy: 0
-  desiredHealthy: 0
-  disruptionsAllowed: 0
-  expectedPods: 0
-
 ---
 apiVersion: internal.acorn.io/v1
 kind: ServiceInstance

pkg/controller/appdefinition/testdata/computeclass/all-set/expected.golden

@@ -112,36 +112,6 @@ spec:
       terminationGracePeriodSeconds: 10
 status: {}
 
----
-apiVersion: policy/v1
-kind: PodDisruptionBudget
-metadata:
-  annotations:
-    acorn.io/config-hash: ""
-  creationTimestamp: null
-  labels:
-    acorn.io/app-name: app-name
-    acorn.io/app-namespace: app-namespace
-    acorn.io/app-public-name: app-name
-    acorn.io/container-name: oneimage
-    acorn.io/managed: "true"
-    acorn.io/project-name: app-namespace
-  name: oneimage
-  namespace: app-created-namespace
-spec:
-  maxUnavailable: 25%
-  selector:
-    matchLabels:
-      acorn.io/app-name: app-name
-      acorn.io/app-namespace: app-namespace
-      acorn.io/container-name: oneimage
-      acorn.io/managed: "true"
-status:
-  currentHealthy: 0
-  desiredHealthy: 0
-  disruptionsAllowed: 0
-  expectedPods: 0
-
 ---
 apiVersion: internal.acorn.io/v1
 kind: ServiceInstance

pkg/controller/appdefinition/testdata/computeclass/container/expected.golden

@@ -112,36 +112,6 @@ spec:
       terminationGracePeriodSeconds: 10
 status: {}
 
----
-apiVersion: policy/v1
-kind: PodDisruptionBudget
-metadata:
-  annotations:
-    acorn.io/config-hash: ""
-  creationTimestamp: null
-  labels:
-    acorn.io/app-name: app-name
-    acorn.io/app-namespace: app-namespace
-    acorn.io/app-public-name: app-name
-    acorn.io/container-name: oneimage
-    acorn.io/managed: "true"
-    acorn.io/project-name: app-namespace
-  name: oneimage
-  namespace: app-created-namespace
-spec:
-  maxUnavailable: 25%
-  selector:
-    matchLabels:
-      acorn.io/app-name: app-name
-      acorn.io/app-namespace: app-namespace
-      acorn.io/container-name: oneimage
-      acorn.io/managed: "true"
-status:
-  currentHealthy: 0
-  desiredHealthy: 0
-  disruptionsAllowed: 0
-  expectedPods: 0
-
 ---
 apiVersion: internal.acorn.io/v1
 kind: ServiceInstance

pkg/controller/appdefinition/testdata/computeclass/different-computeclass/expected.golden

@@ -112,36 +112,6 @@ spec:
       terminationGracePeriodSeconds: 10
 status: {}
 
----
-apiVersion: policy/v1
-kind: PodDisruptionBudget
-metadata:
-  annotations:
-    acorn.io/config-hash: ""
-  creationTimestamp: null
-  labels:
-    acorn.io/app-name: app-name
-    acorn.io/app-namespace: app-namespace
-    acorn.io/app-public-name: app-name
-    acorn.io/container-name: oneimage
-    acorn.io/managed: "true"
-    acorn.io/project-name: app-namespace
-  name: oneimage
-  namespace: app-created-namespace
-spec:
-  maxUnavailable: 25%
-  selector:
-    matchLabels:
-      acorn.io/app-name: app-name
-      acorn.io/app-namespace: app-namespace
-      acorn.io/container-name: oneimage
-      acorn.io/managed: "true"
-status:
-  currentHealthy: 0
-  desiredHealthy: 0
-  disruptionsAllowed: 0
-  expectedPods: 0
-
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -229,36 +199,6 @@ spec:
       terminationGracePeriodSeconds: 10
 status: {}
 
----
-apiVersion: policy/v1
-kind: PodDisruptionBudget
-metadata:
-  annotations:
-    acorn.io/config-hash: ""
-  creationTimestamp: null
-  labels:
-    acorn.io/app-name: app-name
-    acorn.io/app-namespace: app-namespace
-    acorn.io/app-public-name: app-name
-    acorn.io/container-name: twoimage
-    acorn.io/managed: "true"
-    acorn.io/project-name: app-namespace
-  name: twoimage
-  namespace: app-created-namespace
-spec:
-  maxUnavailable: 25%
-  selector:
-    matchLabels:
-      acorn.io/app-name: app-name
-      acorn.io/app-namespace: app-namespace
-      acorn.io/container-name: twoimage
-      acorn.io/managed: "true"
-status:
-  currentHealthy: 0
-  desiredHealthy: 0
-  disruptionsAllowed: 0
-  expectedPods: 0
-
 ---
 apiVersion: internal.acorn.io/v1
 kind: ServiceInstance

pkg/controller/appdefinition/testdata/computeclass/generic-resources/expected.golden

@@ -114,36 +114,6 @@ spec:
       terminationGracePeriodSeconds: 10
 status: {}
 
----
-apiVersion: policy/v1
-kind: PodDisruptionBudget
-metadata:
-  annotations:
-    acorn.io/config-hash: ""
-  creationTimestamp: null
-  labels:
-    acorn.io/app-name: app-name
-    acorn.io/app-namespace: app-namespace
-    acorn.io/app-public-name: app-name
-    acorn.io/container-name: oneimage
-    acorn.io/managed: "true"
-    acorn.io/project-name: app-namespace
-  name: oneimage
-  namespace: app-created-namespace
-spec:
-  maxUnavailable: 25%
-  selector:
-    matchLabels:
-      acorn.io/app-name: app-name
-      acorn.io/app-namespace: app-namespace
-      acorn.io/container-name: oneimage
-      acorn.io/managed: "true"
-status:
-  currentHealthy: 0
-  desiredHealthy: 0
-  disruptionsAllowed: 0
-  expectedPods: 0
-
 ---
 apiVersion: internal.acorn.io/v1
 kind: ServiceInstance

pkg/controller/appdefinition/testdata/computeclass/overwrite-acornfile-computeclass/expected.golden

@@ -112,36 +112,6 @@ spec:
       terminationGracePeriodSeconds: 10
 status: {}
 
----
-apiVersion: policy/v1
-kind: PodDisruptionBudget
-metadata:
-  annotations:
-    acorn.io/config-hash: ""
-  creationTimestamp: null
-  labels:
-    acorn.io/app-name: app-name
-    acorn.io/app-namespace: app-namespace
-    acorn.io/app-public-name: app-name
-    acorn.io/container-name: oneimage
-    acorn.io/managed: "true"
-    acorn.io/project-name: app-namespace
-  name: oneimage
-  namespace: app-created-namespace
-spec:
-  maxUnavailable: 25%
-  selector:
-    matchLabels:
-      acorn.io/app-name: app-name
-      acorn.io/app-namespace: app-namespace
-      acorn.io/container-name: oneimage
-      acorn.io/managed: "true"
-status:
-  currentHealthy: 0
-  desiredHealthy: 0
-  disruptionsAllowed: 0
-  expectedPods: 0
-
 ---
 apiVersion: internal.acorn.io/v1
 kind: ServiceInstance

pkg/controller/appdefinition/testdata/computeclass/two-containers/expected.golden

@@ -112,36 +112,6 @@ spec:
       terminationGracePeriodSeconds: 10
 status: {}
 
----
-apiVersion: policy/v1
-kind: PodDisruptionBudget
-metadata:
-  annotations:
-    acorn.io/config-hash: ""
-  creationTimestamp: null
-  labels:
-    acorn.io/app-name: app-name
-    acorn.io/app-namespace: app-namespace
-    acorn.io/app-public-name: app-name
-    acorn.io/container-name: oneimage
-    acorn.io/managed: "true"
-    acorn.io/project-name: app-namespace
-  name: oneimage
-  namespace: app-created-namespace
-spec:
-  maxUnavailable: 25%
-  selector:
-    matchLabels:
-      acorn.io/app-name: app-name
-      acorn.io/app-namespace: app-namespace
-      acorn.io/container-name: oneimage
-      acorn.io/managed: "true"
-status:
-  currentHealthy: 0
-  desiredHealthy: 0
-  disruptionsAllowed: 0
-  expectedPods: 0
-
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -215,36 +185,6 @@ spec:
       terminationGracePeriodSeconds: 10
 status: {}
 
----
-apiVersion: policy/v1
-kind: PodDisruptionBudget
-metadata:
-  annotations:
-    acorn.io/config-hash: ""
-  creationTimestamp: null
-  labels:
-    acorn.io/app-name: app-name
-    acorn.io/app-namespace: app-namespace
-    acorn.io/app-public-name: app-name
-    acorn.io/container-name: twoimage
-    acorn.io/managed: "true"
-    acorn.io/project-name: app-namespace
-  name: twoimage
-  namespace: app-created-namespace
-spec:
-  maxUnavailable: 25%
-  selector:
-    matchLabels:
-      acorn.io/app-name: app-name
-      acorn.io/app-namespace: app-namespace
-      acorn.io/container-name: twoimage
-      acorn.io/managed: "true"
-status:
-  currentHealthy: 0
-  desiredHealthy: 0
-  disruptionsAllowed: 0
-  expectedPods: 0
-
 ---
 apiVersion: internal.acorn.io/v1
 kind: ServiceInstance