Reverted redundant changes in yamls

Signed-off-by: Patryk Strusiewicz-Surmacki <[email protected]>
telekom · Apr 3, 2024 · 6c79808 · 6c79808
1 parent aefb8d3
commit 6c79808
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 6 deletions.
diff --git a/config/certmanager/kustomization.yaml b/config/certmanager/kustomization.yaml
@@ -1,5 +1,3 @@
-namespace: kube-system
-
 resources:
 - certificate.yaml
 

diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
@@ -44,8 +44,8 @@ resources:
 - ../rbac
 - ../manager
 - ../configurator
-# - ../webhook
-# - ../prometheus
+- ../webhook
+- ../prometheus
 labels:
 - includeSelectors: true
   pairs:

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -18,7 +18,7 @@ kind: Kustomization
 images:
 - name: controller
   newName: ghcr.io/telekom/das-schiff-network-operator
-  newTag: v27
+  newTag: latest
 - name: frr-exporter
   newName: ghcr.io/telekom/frr-exporter
-  newTag: v27
+  newTag: latest
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -49,6 +49,18 @@ spec:
         securityContext:
           privileged: true
           runAsUser: 0
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: 7081
+          initialDelaySeconds: 15
+          periodSeconds: 20
+        readinessProbe:
+          httpGet:
+            path: /readyz
+            port: 7081
+          initialDelaySeconds: 5
+          periodSeconds: 10
         # TODO(user): Configure the resources accordingly based on the project requirements.
         # More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
         resources:
@@ -64,6 +76,8 @@ spec:
           subPath: config.yaml
         - mountPath: /etc/frr
           name: frr-config
+        - mountPath: /var/run/dbus/system_bus_socket
+          name: dbus-socket
       - command:
         - /frr-exporter
         env:
@@ -99,6 +113,10 @@ spec:
         hostPath:
           path: /var/run/frr
           type: Directory
+      - name: dbus-socket
+        hostPath:
+          path: /var/run/dbus/system_bus_socket
+          type: Socket
       - configMap:
           name: network-operator-config
         name: network-config
diff --git a/config/manager/manager_master.yaml b/config/manager/manager_master.yaml
@@ -53,6 +53,18 @@ spec:
         securityContext:
           privileged: true
           runAsUser: 0
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: 7081
+          initialDelaySeconds: 15
+          periodSeconds: 20
+        readinessProbe:
+          httpGet:
+            path: /readyz
+            port: 7081
+          initialDelaySeconds: 5
+          periodSeconds: 10
         # TODO(user): Configure the resources accordingly based on the project requirements.
         # More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
         resources: