Fix support for --k8s-1.15 in generate-manifest.sh

antrea-io · Feb 9, 2021 · e752d43 · e752d43
1 parent b535177
commit e752d43
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 0 deletions.
diff --git a/build/yamls/patches/legacy/probesAgent.yml b/build/yamls/patches/legacy/probesAgent.yml
@@ -0,0 +1,19 @@
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: antrea-agent
+spec:
+  template:
+    spec:
+      containers:
+      - name: antrea-agent
+        readinessProbe:
+          failureThreshold: 5
+          httpGet:
+            host: 127.0.0.1
+            path: /healthz
+            port: api
+            scheme: HTTPS
+          initialDelaySeconds: 5
+          periodSeconds: 10
+          timeoutSeconds: 5
diff --git a/build/yamls/patches/legacy/probesController.yml b/build/yamls/patches/legacy/probesController.yml
@@ -0,0 +1,28 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: antrea-controller
+spec:
+  template:
+    spec:
+      containers:
+      - name: antrea-controller
+        livenessProbe:
+          failureThreshold: 5
+          httpGet:
+            host: 127.0.0.1
+            path: /healthz
+            port: api
+            scheme: HTTPS
+          periodSeconds: 10
+          timeoutSeconds: 5
+        readinessProbe:
+          failureThreshold: 5
+          httpGet:
+            host: 127.0.0.1
+            path: /healthz
+            port: api
+            scheme: HTTPS
+          initialDelaySeconds: 5
+          periodSeconds: 10
+          timeoutSeconds: 5
diff --git a/hack/generate-manifest.sh b/hack/generate-manifest.sh
@@ -416,6 +416,9 @@ if $K8S_115; then
     $KUSTOMIZE edit add patch --path legacy/crdClusterNetworkPolicy.json --kind CustomResourceDefinition --name clusternetworkpolicies.security.antrea.tanzu.vmware.com
     $KUSTOMIZE edit add patch --path legacy/crdNetworkPolicy.json --kind CustomResourceDefinition --name networkpolicies.security.antrea.tanzu.vmware.com
     $KUSTOMIZE edit add patch --path legacy/crdExternalEntity.json --kind CustomResourceDefinition --name externalentities.core.antrea.tanzu.vmware.com
+    # Patch for liveness and readiness probes: /livez and /readyz endpoints were introduced in 1.16
+    $KUSTOMIZE edit add patch --path legacy/probesAgent.yml
+    $KUSTOMIZE edit add patch --path legacy/probesController.yml
 fi
 
 $KUSTOMIZE build