Fix issues after rebasing

openshift-kni · Jan 10, 2024 · 934d559 · 934d559
1 parent e5157a8
commit 934d559
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 13 deletions.
diff --git a/cnf-app-mac-operator/config/manager/manager.yaml b/cnf-app-mac-operator/config/manager/manager.yaml
@@ -23,8 +23,6 @@ spec:
         image: controller:latest
         imagePullPolicy: Always
         name: manager
-        ports:
-        - containerPort: 8095
         resources:
           limits:
             cpu: 100m
@@ -53,19 +51,12 @@ spec:
         readinessProbe:
           httpGet:
             path: /readyz
-          tcpSocket:
-            port: 8095
-          initialDelaySeconds: 15
-          periodSeconds: 20
-        readinessProbe:
-          tcpSocket:
             port: 8095
           initialDelaySeconds: 5
           periodSeconds: 10
         startupProbe:
           httpGet:
             path: /startz
-          tcpSocket:
             port: 8095
           initialDelaySeconds: 30
           periodSeconds: 10

diff --git a/testpmd-lb-operator/config/manager/manager.yaml b/testpmd-lb-operator/config/manager/manager.yaml
@@ -31,6 +31,13 @@ spec:
             - name: ANSIBLE_GATHERING
               value: explicit
           image: controller:latest
+          lifecycle:
+            postStart:
+              exec:
+                command: ["/bin/sh", "-c", "echo Hello from the postStart handler"]
+            preStop:
+              exec:
+                command: ["/bin/sh", "-c", "echo Hello from the preStop handler"]
           livenessProbe:
             httpGet:
               path: /healthz
@@ -43,9 +50,11 @@ spec:
               port: 6789
             initialDelaySeconds: 5
             periodSeconds: 10
+          # operator-sdk is not implementing startup probe up to now, using liveness probe endpoint
+          # while this feature is developed
           startupProbe:
             httpGet:
-              path: /startupz
+              path: /healthz
               port: 6789
             initialDelaySeconds: 5
             periodSeconds: 10

diff --git a/testpmd-lb-operator/roles/loadbalancer/templates/deployment.yml b/testpmd-lb-operator/roles/loadbalancer/templates/deployment.yml
@@ -154,7 +154,6 @@ spec:
         - name: {{ key }}
           value: "{{ value }}"
 {% endfor %}
-<<<<<<< HEAD
         lifecycle:
           postStart:
             exec:

diff --git a/testpmd-operator/config/manager/manager.yaml b/testpmd-operator/config/manager/manager.yaml
@@ -43,9 +43,11 @@ spec:
               port: 6789
             initialDelaySeconds: 5
             periodSeconds: 10
+          # operator-sdk is not implementing startup probe up to now, using liveness probe endpoint
+          # while this feature is developed
           startupProbe:
             httpGet:
-              path: /startupz
+              path: /healthz
               port: 6789
             initialDelaySeconds: 5
             periodSeconds: 10

diff --git a/testpmd-operator/testpmd-allinone.yaml b/testpmd-operator/testpmd-allinone.yaml
@@ -205,7 +205,27 @@ spec:
           preStop:
             exec:
               command: ["/bin/sh", "-c", "echo Hello from the preStop handler"]
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: 6789
+          initialDelaySeconds: 15
+          periodSeconds: 20
         name: manager
+        readinessProbe:
+          httpGet:
+            path: /readyz
+            port: 6789
+          initialDelaySeconds: 5
+          periodSeconds: 10
+        # operator-sdk is not implementing startup probe up to now, using liveness probe endpoint
+        # while this feature is developed
+        startupProbe:
+          httpGet:
+            path: /healthz
+            port: 6789
+          initialDelaySeconds: 5
+          periodSeconds: 10
         terminationMessagePolicy: FallbackToLogsOnError
       serviceAccountName: testpmd-operator-controller-manager
       terminationGracePeriodSeconds: 10
diff --git a/trex-operator/config/manager/manager.yaml b/trex-operator/config/manager/manager.yaml
@@ -24,6 +24,13 @@ spec:
             - "--max-concurrent-reconciles=1"
           image: controller:latest
           imagePullPolicy: IfNotPresent
+          lifecycle:
+            postStart:
+              exec:
+                command: ["/bin/sh", "-c", "echo Hello from the postStart handler"]
+            preStop:
+              exec:
+                command: ["/bin/sh", "-c", "echo Hello from the preStop handler"]
           livenessProbe:
             httpGet:
               path: /healthz
@@ -36,9 +43,11 @@ spec:
               port: 6789
             initialDelaySeconds: 5
             periodSeconds: 10
+          # operator-sdk is not implementing startup probe up to now, using liveness probe endpoint
+          # while this feature is developed
           startupProbe:
             httpGet:
-              path: /startupz
+              path: /healthz
               port: 6789
             initialDelaySeconds: 5
             periodSeconds: 10