Merge pull request #722 from GoogleCloudPlatform/revert-710-readiness…

…-probe Revert "Add readiness and liveness probe"
GoogleCloudPlatform · May 8, 2024 · f5e5ee2 · f5e5ee2
2 parents 37a0ccd + 270493a
commit f5e5ee2
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 106 deletions.
diff --git a/custom-metrics-stackdriver-adapter/adapter-beta.yaml b/custom-metrics-stackdriver-adapter/adapter-beta.yaml
@@ -99,7 +99,7 @@ spec:
   ports:
   - port: 443
     protocol: TCP
-    targetPort: 6443
+    targetPort: 443
   selector:
     run: custom-metrics-stackdriver-adapter
     k8s-app: custom-metrics-stackdriver-adapter

diff --git a/custom-metrics-stackdriver-adapter/deploy/production/adapter.yaml b/custom-metrics-stackdriver-adapter/deploy/production/adapter.yaml
@@ -78,26 +78,6 @@ spec:
         command:
         - /adapter
         - --use-new-resource-model=false
-        - --secure-port=6443
-        ports:
-        - containerPort: 6443
-          name: https
-        readinessProbe:
-          failureThreshold: 5
-          httpGet:
-            path: /readyz
-            port: https
-            scheme: HTTPS
-          initialDelaySeconds: 30
-          periodSeconds: 5
-        livenessProbe:
-          failureThreshold: 5
-          httpGet:
-            path: /livez
-            port: https
-            scheme: HTTPS
-          initialDelaySeconds: 30
-          periodSeconds: 5
         resources:
           limits:
             cpu: 250m
@@ -120,7 +100,7 @@ spec:
   ports:
   - port: 443
     protocol: TCP
-    targetPort: 6443
+    targetPort: 443
   selector:
     run: custom-metrics-stackdriver-adapter
     k8s-app: custom-metrics-stackdriver-adapter

diff --git a/custom-metrics-stackdriver-adapter/deploy/production/adapter_new_resource_model.yaml b/custom-metrics-stackdriver-adapter/deploy/production/adapter_new_resource_model.yaml
@@ -96,26 +96,6 @@ spec:
         - /adapter
         - --use-new-resource-model=true
         - --fallback-for-container-metrics=true
-        - --secure-port=6443
-        ports:
-        - containerPort: 6443
-          name: https
-        readinessProbe:
-          failureThreshold: 5
-          httpGet:
-            path: /readyz
-            port: https
-            scheme: HTTPS
-          initialDelaySeconds: 30
-          periodSeconds: 5
-        livenessProbe:
-          failureThreshold: 5
-          httpGet:
-            path: /livez
-            port: https
-            scheme: HTTPS
-          initialDelaySeconds: 30
-          periodSeconds: 5
         resources:
           limits:
             cpu: 250m
@@ -138,7 +118,7 @@ spec:
   ports:
   - port: 443
     protocol: TCP
-    targetPort: 6443
+    targetPort: 443
   selector:
     run: custom-metrics-stackdriver-adapter
     k8s-app: custom-metrics-stackdriver-adapter

diff --git a/custom-metrics-stackdriver-adapter/deploy/staging/adapter_new_resource_model.yaml b/custom-metrics-stackdriver-adapter/deploy/staging/adapter_new_resource_model.yaml
@@ -100,26 +100,6 @@ spec:
         - /adapter
         - --use-new-resource-model=true
         - --fallback-for-container-metrics=true
-        - --secure-port=6443
-        ports:
-        - containerPort: 6443
-          name: https
-        readinessProbe:
-          failureThreshold: 5
-          httpGet:
-            path: /readyz
-            port: https
-            scheme: HTTPS
-          initialDelaySeconds: 30
-          periodSeconds: 5
-        livenessProbe:
-          failureThreshold: 5
-          httpGet:
-            path: /livez
-            port: https
-            scheme: HTTPS
-          initialDelaySeconds: 30
-          periodSeconds: 5
         resources:
           limits:
             cpu: 250m
@@ -142,7 +122,7 @@ spec:
   ports:
   - port: 443
     protocol: TCP
-    targetPort: 6443
+    targetPort: 443
   selector:
     run: custom-metrics-stackdriver-adapter
     k8s-app: custom-metrics-stackdriver-adapter

diff --git a/custom-metrics-stackdriver-adapter/deploy/staging/adapter_old_resource_model.yaml b/custom-metrics-stackdriver-adapter/deploy/staging/adapter_old_resource_model.yaml
@@ -82,26 +82,6 @@ spec:
         command:
         - /adapter
         - --use-new-resource-model=false
-        - --secure-port=6443
-        ports:
-        - containerPort: 6443
-          name: https
-        readinessProbe:
-          failureThreshold: 5
-          httpGet:
-            path: /readyz
-            port: https
-            scheme: HTTPS
-          initialDelaySeconds: 30
-          periodSeconds: 5
-        livenessProbe:
-          failureThreshold: 5
-          httpGet:
-            path: /livez
-            port: https
-            scheme: HTTPS
-          initialDelaySeconds: 30
-          periodSeconds: 5
         resources:
           limits:
             cpu: 250m
@@ -124,7 +104,7 @@ spec:
   ports:
   - port: 443
     protocol: TCP
-    targetPort: 6443
+    targetPort: 443
   selector:
     run: custom-metrics-stackdriver-adapter
     k8s-app: custom-metrics-stackdriver-adapter

diff --git a/...metrics-stackdriver-adapter/deploy/test/adapter_new_resource_model_with_core_metrics.yaml b/...metrics-stackdriver-adapter/deploy/test/adapter_new_resource_model_with_core_metrics.yaml
@@ -100,26 +100,6 @@ spec:
         - /adapter
         - --use-new-resource-model=true
         - --enable-core-metrics-api
-        - --secure-port=6443
-        ports:
-        - containerPort: 6443
-          name: https
-        readinessProbe:
-          failureThreshold: 5
-          httpGet:
-            path: /readyz
-            port: https
-            scheme: HTTPS
-          initialDelaySeconds: 30
-          periodSeconds: 5
-        livenessProbe:
-          failureThreshold: 5
-          httpGet:
-            path: /livez
-            port: https
-            scheme: HTTPS
-          initialDelaySeconds: 30
-          periodSeconds: 5
         resources:
           limits:
             cpu: 250m
@@ -142,7 +122,7 @@ spec:
   ports:
   - port: 443
     protocol: TCP
-    targetPort: 6443
+    targetPort: 443
   selector:
     run: custom-metrics-stackdriver-adapter
     k8s-app: custom-metrics-stackdriver-adapter