Merge branch 'w/129.0/improvement/fix-kubernetes-post-cert-renew' int…

…o tmp/octopus/w/130.0/improvement/fix-kubernetes-post-cert-renew
scality · Jan 28, 2025 · 61b8b52 · 61b8b52
2 parents 4df3dd3 + cd508b1
commit 61b8b52
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -123,13 +123,33 @@
   image to `rockylinux:9.5-minimal`
   (PR[#4483](https://github.com/scality/metalk8s/pull/4483))
 
-## Release 128.0.1 (in development)
+## Release 128.0.3 (in development)
+
+### Enhancements
+
+- Redeploy backup, ingresses, salt-master and dex when renewing certificates
+  (PR[#4508](https://github.com/scality/metalk8s/pull/4508))
+
+## Release 128.0.2
 
 ### Enhancements
 
 - Only use modern Ciphers in Ingress configuration
   (PR[#4488](https://github.com/scality/metalk8s/pull/4488)) 
 
+### Bug fixes
+
+- Loki Grafana dashboard and datasources are enabled only
+  if Loki is enabled.
+  (PR[#4464](https://github.com/scality/metalk8s/pull/4464))
+
+## Release 128.0.1
+
+### Enhancements
+
+- Bump core-ui version to [0.145.0](https://github.com/scality/core-ui/releases/tag/0.145.0)
+  (PR[#4441](https://github.com/scality/metalk8s/pull/4441))
+
 ## Release 128.0.0
 
 ### Enhancements
@@ -243,10 +263,6 @@
 - Do no longer use `latest` for `storage-operator` image
   (PR[#4299](https://github.com/scality/metalk8s/pull/4299))
 
-- Loki Grafana dashboard and datasources are enabled only
-  if Loki is enabled.
-  (PR[#4464](https://github.com/scality/metalk8s/pull/4464))
-
 ## Release 127.0.7 (in development)
 
 ## Release 127.0.6

diff --git a/salt/metalk8s/defaults.yaml b/salt/metalk8s/defaults.yaml
@@ -267,7 +267,7 @@ certificates:
         path: /etc/kubernetes/controller-manager.conf
         renew:
           sls:
-            - metalk8s.kubernetes.controller-manager.kubeconfig
+            - metalk8s.kubernetes.controller-manager.installed
         watched: False
       kubelet:
         path: /etc/kubernetes/kubelet.conf
@@ -279,13 +279,13 @@ certificates:
         path: /etc/salt/master-kubeconfig.conf
         renew:
           sls:
-            - metalk8s.salt.master.kubeconfig
+            - metalk8s.salt.master
         watched: False
       scheduler:
         path: /etc/kubernetes/scheduler.conf
         renew:
           sls:
-            - metalk8s.kubernetes.scheduler.kubeconfig
+            - metalk8s.kubernetes.scheduler.installed
         watched: False
   server:
     days_remaining: 90
@@ -302,6 +302,9 @@ certificates:
         renew:
           sls:
             - metalk8s.backup.certs.server
+          post:
+            orch:
+              - metalk8s.backup.deployed
         watched: False
       control-plane-ingress:
         path: /etc/metalk8s/pki/nginx-ingress/control-plane-server.crt
@@ -310,7 +313,7 @@ certificates:
             - metalk8s.addons.nginx-ingress-control-plane.certs
           post:
             orch:
-              - metalk8s.addons.nginx-ingress-control-plane.deployed.tls-secret
+              - metalk8s.addons.nginx-ingress-control-plane.deployed
         watched: False
       dex:
         path: /etc/metalk8s/pki/dex/server.crt
@@ -319,7 +322,7 @@ certificates:
             - metalk8s.addons.dex.certs
           post:
             orch:
-              - metalk8s.addons.dex.deployed.tls-secret
+              - metalk8s.addons.dex.deployed
         watched: False
       etcd:
         path: /etc/kubernetes/pki/etcd/server.crt
@@ -346,5 +349,5 @@ certificates:
             - metalk8s.addons.nginx-ingress.certs
           post:
             orch:
-              - metalk8s.addons.nginx-ingress.deployed.tls-secret
+              - metalk8s.addons.nginx-ingress.deployed
         watched: False