From aa76370c884ad1ebd26c88dd61e6ff45e51056ad Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 18 Mar 2023 19:28:18 +0100
Subject: [PATCH] fix(system-upgrade): Update outdated version selectors
---
clusters/k8s01/system-upgrades/dns.yaml | 18 +++++++-----------
clusters/k8s01/system-upgrades/registry.yaml | 10 +++++-----
.../system-upgrades/disable-syslog.yaml | 2 +-
.../fedora-temperature-management.yaml | 2 +-
infrastructure/system-upgrades/fedora.yaml | 2 +-
infrastructure/system-upgrades/kubelet.yaml | 2 +-
infrastructure/system-upgrades/kubernetes.yaml | 2 +-
infrastructure/system-upgrades/logrotate.yaml | 1 +
.../system-upgrades/longhorn-setup.yaml | 2 +-
9 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/clusters/k8s01/system-upgrades/dns.yaml b/clusters/k8s01/system-upgrades/dns.yaml
index bdaef0728..9fdfa946d 100644
--- a/clusters/k8s01/system-upgrades/dns.yaml
+++ b/clusters/k8s01/system-upgrades/dns.yaml
@@ -14,8 +14,8 @@ sops:
azure_kv: []
hc_vault: []
age: []
- lastmodified: "2022-04-29T22:19:48Z"
- mac: ENC[AES256_GCM,data:c0tCRkhQv45B42LC1ZPIl+6VewVQLJIcSkE/v41zjujUqpX5mofbJ06bTbnU69OFsYTekKnRYdprd1uzy+SyYn0qHqSOeSVfSGBtX3qS7sCC15JnthE+VlBfBi/xQo4DP6oJCBX64OJW1Mj+k0keCg+v6TpDhZhwER/xkbZYeVY=,iv:U9KxCvuTcOW4gEfZDZfG9pnixe4goVDGl9pSjJ2iAsM=,tag:C8mvcZ2cQKn23v+O+apg+A==,type:str]
+ lastmodified: "2023-03-18T18:27:42Z"
+ mac: ENC[AES256_GCM,data:5MqduGX/jfJFIJl3xEQZdXJl7/qDcigDEe5tWglV6s5oJNYBp++eO8+6dQkI5VB/iL67LQzKYDG8tWTPKwgkBzlBJNpketA/A23/bNLmhZpIORY+ppaqOpJvh+GNgNJDMVHahfptk0WxSuVwg02j70h+UcvQ6rD/EeCcJjfbJ3I=,iv:Aryc/Irz/VC+SgSjwQnAxw9hLFUad1siYJVB28zsnI8=,tag:sMtNEIj5tIHzqXKKK+I2mg==,type:str]
pgp:
- created_at: "2022-04-28T22:36:58Z"
enc: |-
@@ -59,7 +59,7 @@ sops:
-----END PGP MESSAGE-----
fp: B137EE1549DFAF960DD1E2B15147025FB9F09E07
encrypted_regex: ^(data|stringData|email|dnsZones?|dnsNames?|.*(H|h)osts?|tang|externalURL|.*-secret|.*-url|.*Secrets?|.*-domain|password|subjects|node|apiURL|.*(S|s)erverNames?|.*SecretKey)$
- version: 3.7.1
+ version: 3.7.3
---
apiVersion: upgrade.cattle.io/v1
kind: Plan
@@ -74,10 +74,6 @@ spec:
operator: In
values:
- fedora
- - key: feature.node.kubernetes.io/system-os_release.VERSION_ID.major
- operator: In
- values:
- - "35"
serviceAccountName: system-upgrade
secrets:
- name: fedora-configure-dns
@@ -88,7 +84,7 @@ spec:
force: false
version: 1.0.0
upgrade:
- image: quay.io/fedora/fedora:36
+ image: quay.io/fedora/fedora:37
command:
- chroot
- /host
@@ -101,8 +97,8 @@ sops:
azure_kv: []
hc_vault: []
age: []
- lastmodified: "2022-04-29T22:19:48Z"
- mac: ENC[AES256_GCM,data:c0tCRkhQv45B42LC1ZPIl+6VewVQLJIcSkE/v41zjujUqpX5mofbJ06bTbnU69OFsYTekKnRYdprd1uzy+SyYn0qHqSOeSVfSGBtX3qS7sCC15JnthE+VlBfBi/xQo4DP6oJCBX64OJW1Mj+k0keCg+v6TpDhZhwER/xkbZYeVY=,iv:U9KxCvuTcOW4gEfZDZfG9pnixe4goVDGl9pSjJ2iAsM=,tag:C8mvcZ2cQKn23v+O+apg+A==,type:str]
+ lastmodified: "2023-03-18T18:27:42Z"
+ mac: ENC[AES256_GCM,data:5MqduGX/jfJFIJl3xEQZdXJl7/qDcigDEe5tWglV6s5oJNYBp++eO8+6dQkI5VB/iL67LQzKYDG8tWTPKwgkBzlBJNpketA/A23/bNLmhZpIORY+ppaqOpJvh+GNgNJDMVHahfptk0WxSuVwg02j70h+UcvQ6rD/EeCcJjfbJ3I=,iv:Aryc/Irz/VC+SgSjwQnAxw9hLFUad1siYJVB28zsnI8=,tag:sMtNEIj5tIHzqXKKK+I2mg==,type:str]
pgp:
- created_at: "2022-04-28T22:36:58Z"
enc: |-
@@ -146,4 +142,4 @@ sops:
-----END PGP MESSAGE-----
fp: B137EE1549DFAF960DD1E2B15147025FB9F09E07
encrypted_regex: ^(data|stringData|email|dnsZones?|dnsNames?|.*(H|h)osts?|tang|externalURL|.*-secret|.*-url|.*Secrets?|.*-domain|password|subjects|node|apiURL|.*(S|s)erverNames?|.*SecretKey)$
- version: 3.7.1
+ version: 3.7.3
diff --git a/clusters/k8s01/system-upgrades/registry.yaml b/clusters/k8s01/system-upgrades/registry.yaml
index e81a22edf..0f804575a 100644
--- a/clusters/k8s01/system-upgrades/registry.yaml
+++ b/clusters/k8s01/system-upgrades/registry.yaml
@@ -13,8 +13,8 @@ sops:
azure_kv: []
hc_vault: []
age: []
- lastmodified: "2022-11-13T14:09:09Z"
- mac: ENC[AES256_GCM,data:WAEW/HN37jRXi9gPjInzyP9qFbJFv14Zai06JrT3hWClHyjAnpgPZP2oC3xdeKb3+8+jqO8xx/oCqBAlxrXbP5ihgFj98+8QDG7bV9O4i6jd6VfG71U3ETOATF9+wSV8zfgvheSww2GpH4wJho417UFyACiwrdEVAuRgknRdrAA=,iv:VaPnUbziyLCOYhprpLFbAuqkEO2wI1yyO54nsAJXfdw=,tag:7HAaLTDfAPovMV6Y0L6F/g==,type:str]
+ lastmodified: "2023-03-18T18:28:08Z"
+ mac: ENC[AES256_GCM,data:SVU3XUNB5dGrhMBfeMXchdMAUK3JiG4UppcPjHKYJCLdplbOCkxauwe2WdPzMcHx1CSNho2tFL+tbMqIdzZRp7pw0HMfL/m+5cSrnLEwdlhOubevf6h3zyiA/WaO9LpvsZp+OBcFUNHqlbGi74GDJwhna3aizr5qbvCX4KybTac=,iv:qRFVg/0IAgO3eMXCKo57pVdq28DRlQkjkkn3Acn5lKM=,tag:gcrkIVLhhL+Jag5g3pUlEg==,type:str]
pgp:
- created_at: "2022-01-21T21:30:49Z"
enc: |-
@@ -79,7 +79,7 @@ spec:
path: /host/run/system-upgrade/secrets/crio-registry-config
version: 1.0.5
upgrade:
- image: quay.io/fedora/fedora:36
+ image: quay.io/fedora/fedora:37
command:
- chroot
- /host
@@ -92,8 +92,8 @@ sops:
azure_kv: []
hc_vault: []
age: []
- lastmodified: "2022-11-13T14:09:09Z"
- mac: ENC[AES256_GCM,data:WAEW/HN37jRXi9gPjInzyP9qFbJFv14Zai06JrT3hWClHyjAnpgPZP2oC3xdeKb3+8+jqO8xx/oCqBAlxrXbP5ihgFj98+8QDG7bV9O4i6jd6VfG71U3ETOATF9+wSV8zfgvheSww2GpH4wJho417UFyACiwrdEVAuRgknRdrAA=,iv:VaPnUbziyLCOYhprpLFbAuqkEO2wI1yyO54nsAJXfdw=,tag:7HAaLTDfAPovMV6Y0L6F/g==,type:str]
+ lastmodified: "2023-03-18T18:28:08Z"
+ mac: ENC[AES256_GCM,data:SVU3XUNB5dGrhMBfeMXchdMAUK3JiG4UppcPjHKYJCLdplbOCkxauwe2WdPzMcHx1CSNho2tFL+tbMqIdzZRp7pw0HMfL/m+5cSrnLEwdlhOubevf6h3zyiA/WaO9LpvsZp+OBcFUNHqlbGi74GDJwhna3aizr5qbvCX4KybTac=,iv:qRFVg/0IAgO3eMXCKo57pVdq28DRlQkjkkn3Acn5lKM=,tag:gcrkIVLhhL+Jag5g3pUlEg==,type:str]
pgp:
- created_at: "2022-01-21T21:30:49Z"
enc: |-
diff --git a/infrastructure/system-upgrades/disable-syslog.yaml b/infrastructure/system-upgrades/disable-syslog.yaml
index a8fad0b78..41c3b429f 100644
--- a/infrastructure/system-upgrades/disable-syslog.yaml
+++ b/infrastructure/system-upgrades/disable-syslog.yaml
@@ -30,8 +30,8 @@ spec:
- key: feature.node.kubernetes.io/system-os_release.VERSION_ID.major
operator: In
values:
- - "35"
- "36"
+ - "37"
serviceAccountName: system-upgrade
secrets:
- name: disable-syslog
diff --git a/infrastructure/system-upgrades/fedora-temperature-management.yaml b/infrastructure/system-upgrades/fedora-temperature-management.yaml
index bf6702fc7..f4e6d0af8 100644
--- a/infrastructure/system-upgrades/fedora-temperature-management.yaml
+++ b/infrastructure/system-upgrades/fedora-temperature-management.yaml
@@ -55,8 +55,8 @@ spec:
- key: feature.node.kubernetes.io/system-os_release.VERSION_ID.major
operator: In
values:
- - "35"
- "36"
+ - "37"
serviceAccountName: system-upgrade
secrets:
- name: fedora-install-temperature-management
diff --git a/infrastructure/system-upgrades/fedora.yaml b/infrastructure/system-upgrades/fedora.yaml
index 8b7c10bb4..2d9bf2a0b 100644
--- a/infrastructure/system-upgrades/fedora.yaml
+++ b/infrastructure/system-upgrades/fedora.yaml
@@ -34,8 +34,8 @@ spec:
- key: feature.node.kubernetes.io/system-os_release.VERSION_ID.major
operator: In
values:
- - "35"
- "36"
+ - "37"
serviceAccountName: system-upgrade
secrets:
- name: fedora-dnf-upgrade
diff --git a/infrastructure/system-upgrades/kubelet.yaml b/infrastructure/system-upgrades/kubelet.yaml
index b480938ca..a48a00b16 100644
--- a/infrastructure/system-upgrades/kubelet.yaml
+++ b/infrastructure/system-upgrades/kubelet.yaml
@@ -35,8 +35,8 @@ spec:
- key: feature.node.kubernetes.io/system-os_release.VERSION_ID.major
operator: In
values:
- - "35"
- "36"
+ - "37"
serviceAccountName: system-upgrade
drain:
deleteLocalData: true
diff --git a/infrastructure/system-upgrades/kubernetes.yaml b/infrastructure/system-upgrades/kubernetes.yaml
index 91f225da3..1510319f4 100644
--- a/infrastructure/system-upgrades/kubernetes.yaml
+++ b/infrastructure/system-upgrades/kubernetes.yaml
@@ -82,8 +82,8 @@ spec:
- key: feature.node.kubernetes.io/system-os_release.VERSION_ID.major
operator: In
values:
- - "35"
- "36"
+ - "37"
- key: node-role.kubernetes.io/control-plane
operator: Exists
serviceAccountName: system-upgrade
diff --git a/infrastructure/system-upgrades/logrotate.yaml b/infrastructure/system-upgrades/logrotate.yaml
index 918351a3d..f311a5eb6 100644
--- a/infrastructure/system-upgrades/logrotate.yaml
+++ b/infrastructure/system-upgrades/logrotate.yaml
@@ -47,6 +47,7 @@ spec:
values:
- "35"
- "36"
+ - "37"
serviceAccountName: system-upgrade
secrets:
- name: logrotate-setup
diff --git a/infrastructure/system-upgrades/longhorn-setup.yaml b/infrastructure/system-upgrades/longhorn-setup.yaml
index 148f77e65..21cce2ff9 100644
--- a/infrastructure/system-upgrades/longhorn-setup.yaml
+++ b/infrastructure/system-upgrades/longhorn-setup.yaml
@@ -32,8 +32,8 @@ spec:
- key: feature.node.kubernetes.io/system-os_release.VERSION_ID.major
operator: In
values:
- - "35"
- "36"
+ - "37"
serviceAccountName: system-upgrade
secrets:
- name: longhorn-setup
--
GitLab