From 7141be74f834712b8a3f9fc334892b0b57b2d75b Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Fri, 21 Jan 2022 23:51:02 +0100
Subject: [PATCH] fix(system-upgrades): Rework script to install config in
proper location
This patch moves the config into the `registries.conf.d` directory and
recovers from the old mistake by reinstalling the package providing
`registries.conf`.
---
clusters/k8s01/system-upgrades/registry.yaml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/clusters/k8s01/system-upgrades/registry.yaml b/clusters/k8s01/system-upgrades/registry.yaml
index 286dbd169..04117823f 100644
--- a/clusters/k8s01/system-upgrades/registry.yaml
+++ b/clusters/k8s01/system-upgrades/registry.yaml
@@ -5,16 +5,16 @@ metadata:
namespace: system-upgrade
type: Opaque
stringData:
- upgrade.sh: ENC[AES256_GCM,data:RqiUeZtM4uviw672/UYAbzuyi1XOIYXVtLTkRu5xZBAraphy6jVvtsXKad+we6uRpA9cbw2za6BLx96/44tNgABrqLkBsZkjYFGXOGPJP3Rf/hvC8Krt51TuJybAXghFdIBdjyec4b6mPznu9g6Df8NxTO+YnKB9YCyk7pb4Pt0oUB39yvXcDfBYfQiEQ8QkmGfX7Tag3tKy7qVEmTNdaf1Le6c=,iv:2XVmI9TbEuiPOH5lnIJppychpfAlJ61gp+QtzWT7iMQ=,tag:04/yatnkPPP/Jh+UIZaZqg==,type:str]
- registries.conf: ENC[AES256_GCM,data:oIQbz9X6laf6sEseMp1Vv0HU+ymfNjjCSuIyi3NhdPP9XzGRnsoCuCfJMb1G79dywt0iVid0+MaT9djm61x0TgnyVF9yFdM4vsRi2xYGsTWMWmdceAQxShheR9QCsFnW7CVDDH6p4hqe9C5DqOimT7vBDR1cci2JpjMkEmspsB5HBSCKm1wgiZP3sLR0NUplhi64VqVVK8CsM9CJJRLHQkKaO+PomZFOT2nN/BKO5n0AbNUNuVIC4iVphrKHhW78oo1QmPkJh3o2LQmIeQahRIw/k492WQAwVEninMJTMZvqzPzbfhpq8/hWYOvg0X11G5yzCuccDiBG+9fwGBu8CNegviPI1ZoKayqycBNud7uxmnv8dJbyeljOo4a7ruJjqnVvQ+sb4b7t9xHQ3tigoS1L9oC/0d/nhZvaye9g5jBEYq8agxse3N/dwsSYbB4v+Gfh1l4dM0qVjUHBeUWEVELlB85pwllWaje08xOBlUkju7CZaqZSIyLd1RGimuJrHREMqGM/i+ZbrmvXFm1GyYPOBUga9PgfcrnVGA9IbKK7VlDsLl8vjTPaXEeRlTnBM1QBpSKoxtO0IzyIlWCURnpsegkNc9HZOAuysLyHTd0TRS/2WWp1KkRTy/ocziGKdcQs2YU/pn4aB1cAoIxXw+xxm0VpTMzuvCOshGIX+qM6X2Z16Ww1qhCJlIJPDWGSxtPGNRB+hISQs56TJXrQxUV/p/mCbv4vzLNAK5U6B3eNjdEN1wHhxDimXDLgksVsL9d8R9nz5u2NhNgGYslVfcymFuXvpHjFhcxiFdWU+tol9JCvpBLpIvzVYabelRpS/uTWPqe43CLKHg4k5HotwAh5T4xFqrrui9VC/Vb4RmtgniLB/ozZmwQqPoOCpq1VxF77qMQARe2pYMMU9HB8mv26lYPZsjHf3h7a44A=,iv:IQJiCpBsWyCceQS6HwxYF3UxZWo39opIp/HVZY0KXHY=,tag:WLckaQ5/pbraymRo0Z/BJw==,type:str]
+ upgrade.sh: ENC[AES256_GCM,data:rAyMmvFidojPknSuoq/KsphUxR51g8ao0lY8bRQi5IRnyyCFOk+nM8GTpAfee+xY0e2ab5Pzp024NqsKD6f+hRXq6WsJDmKRqW9agMIvHJgkk/dYvEcul1mlgMCegJ52lNdf4RrQ9l1vXrgzMtETx20GjdzELtn7kLp87DeS1zIBaLctVcPD1QborjXxVag6Rd1J+dhcV1sNi4yKYrgfvvYe85aZ4xtksey8LlEpkcZxSSIV7J83iXizmJ8giyPBNgB/o/xG6Pm/cI66CUNU9RwHI9S98xn6OB2zqrajQQFs2rtmew+7bzpLxhU3HEpHSvrE6jpZ2LBOw6L/XqeS9QTH0rvPhc1CUx6L53Yrc4P1AX7YH4dsJBpLa5sqN3XZLx+FBAFHXc5PN37aA+qUnvVzrXAf7TeeJh3gcd3mh2QcUHnEeieBUb4d8QZ6OZjRvu+iS+3f3Oi87Rw5maH8WrjoDoJDqyjDKh506hKKfvKWYjJvSvLV2nPbguiYhj6Acd75OWpvKXLkrLJB/2HOVOqfSC6CxHiU0FQjnOMyycjg/U/JpTkhTGGXWD9fIgh6j83bTEfxFOYxshf1fXPSI6BlgxBvFpITK3ffudj5p88KOw==,iv:w+94V+ycxxhPUmaivk5jsxM7nGoy6V7MgO8GwwDCtqU=,tag:bnh8iDQCzSWiS4Zf/znYzg==,type:str]
+ registries.conf: ENC[AES256_GCM,data:xc4JWiFNh+ACuN+vYv5QlefBgd6pCi0hyXPT67U9E+LZpqq9//jon14Q9NBPOuS98Ft5kFmpnKXfxKuqw2M7w6u7u+gcrgMTEgf3NAm/2HcYmhNweX9/O3DQnpOwjUe/t2LXNecRpwiorjfSVCLTyCkEoc3woQxyrcaP2Dmg9P8RyZuY5ZVar3xY9cl917R8VotBLNL4K9WefMkyZTkW9SvPdi1aH4jQ7hfmPpJhQqcBQKYb97szSSIeb13+z50O1+4WuOGMykboE0xeuquH/WJkfeIF3aGnX9v02aEMKacYD3FvOu/CYPyVdQg5/E4LtuV/xh4OSblcEFmEK1xSNLB/yzMtbqSE3JanLn656DO+o3hj/A5RQvxLkwEyxRevpFSs4wTRvh8cAgMB6ri9PKdxBb2N9fr19KOAHIBfuypyt6RMldp9UMDoq5EO31tXlDemwOnstK8lWHytpXYMCwwJ4nzyQ0yKulyCydBmUkXL7lc2p8F/OE9E1O63U9vgdBd0MlNC5EENobNv1/G2kC6+iB3I/3KOQRZ93GDGCAZIFutIVaFsb5xySZ4G2hsf9PMVBHRfDQygghutQvfA0QpcwwXGPI03olMScSOCunIh1eQDLRQEAusGtxOWqRh0tGsiEV5z6hYeS23oSg61DNzKXfSR4YgR2wWpl+VWWth5x5DidTp6ujwQb1wIrsXX+wUWuXB4S6cVQmREtFmIeqCBJG00bw==,iv:KUUZ6BeLJSZXQqoTJRNmO1IV45UZen+FNngZ9cYDyF0=,tag:3FrD2VGndFzUuhTJN+pHGQ==,type:str]
sops:
kms: []
gcp_kms: []
azure_kv: []
hc_vault: []
age: []
- lastmodified: "2022-01-21T22:38:51Z"
- mac: ENC[AES256_GCM,data:VgbJ+VJKnpiHoQdvFC23QgYzcc3nlLpXfKUs6a4XvwkP1rjArtvssU5rBS5k4aOAChcp4OmKcJIRAt2ULtAgKNKAJCcdPIWFZ/AKdOqDEIFBdth1HwBipWbdghkZhsTom1TbE5XM48mt0QX0K8k1WzxS+s1xTMsNNbfDFOdM/WI=,iv:PPvID1zYnNG/+nkk13WT5Wfwa6slrZ/uxuoOl0dLII4=,tag:/LpJNhMkm2orN75YExXwKw==,type:str]
+ lastmodified: "2022-01-21T22:50:55Z"
+ mac: ENC[AES256_GCM,data:3mTnPBod5PrLvB1esGaG5Ilm0RC12/FjAl3xkRvZYmaUjRquerE4qmA4vR31zubHbufe6geu73Rj9/sZwwxlj8TLf2BVkaYyuJrDZ0Gb5xy+3zX/59QuH0tfx7Bzdstwn4umfP5BGLJDmFuLGFTMZYOhtFNhG9I1x/YcsApi7kw=,iv:XmqsWjEHijOeiCqRb3FhJzsjhBxpmxUPc3jjtffDFTQ=,tag:uBeqFiKOCL43LazEoDj/cA==,type:str]
pgp:
- created_at: "2022-01-21T21:30:49Z"
enc: |-
@@ -77,7 +77,7 @@ spec:
secrets:
- name: crio-registry-config
path: /host/run/system-upgrade/secrets/crio-registry-config
- version: 1.0.2
+ version: 1.0.3
upgrade:
image: registry.shivering-isles.com/fedora/fedora:35
command:
@@ -92,8 +92,8 @@ sops:
azure_kv: []
hc_vault: []
age: []
- lastmodified: "2022-01-21T22:38:51Z"
- mac: ENC[AES256_GCM,data:VgbJ+VJKnpiHoQdvFC23QgYzcc3nlLpXfKUs6a4XvwkP1rjArtvssU5rBS5k4aOAChcp4OmKcJIRAt2ULtAgKNKAJCcdPIWFZ/AKdOqDEIFBdth1HwBipWbdghkZhsTom1TbE5XM48mt0QX0K8k1WzxS+s1xTMsNNbfDFOdM/WI=,iv:PPvID1zYnNG/+nkk13WT5Wfwa6slrZ/uxuoOl0dLII4=,tag:/LpJNhMkm2orN75YExXwKw==,type:str]
+ lastmodified: "2022-01-21T22:50:55Z"
+ mac: ENC[AES256_GCM,data:3mTnPBod5PrLvB1esGaG5Ilm0RC12/FjAl3xkRvZYmaUjRquerE4qmA4vR31zubHbufe6geu73Rj9/sZwwxlj8TLf2BVkaYyuJrDZ0Gb5xy+3zX/59QuH0tfx7Bzdstwn4umfP5BGLJDmFuLGFTMZYOhtFNhG9I1x/YcsApi7kw=,iv:XmqsWjEHijOeiCqRb3FhJzsjhBxpmxUPc3jjtffDFTQ=,tag:uBeqFiKOCL43LazEoDj/cA==,type:str]
pgp:
- created_at: "2022-01-21T21:30:49Z"
enc: |-
--
GitLab