Code Review / icn.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 143aff1)
Override passwords in emco-db release 20/4620/1
authorTodd Malsbary <todd.malsbary@intel.com>
Wed, 12 Jan 2022 22:43:25 +0000 (14:43 -0800)
committerTodd Malsbary <todd.malsbary@intel.com>
Tue, 18 Jan 2022 17:58:14 +0000 (09:58 -0800)
This allows Flux remediation to uninstall and reinstall the chart if
needed.

Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Change-Id: Idb060feeb457f86315fa07c370d7e1cfa85ab9d7

deploy/site/cluster-icn/.sops.yaml [new file with mode: 0644] patch | blob
deploy/site/cluster-icn/emco-db-release.yaml patch | blob | history
deploy/site/cluster-icn/sops.pub.asc [new file with mode: 0644] patch | blob
deploy/site/common.sh patch | blob | history
deploy/site/pod11/.sops.yaml patch | blob | history
deploy/site/pod11/pod11.sh patch | blob | history
deploy/site/pod11/site.yaml patch | blob | history
deploy/site/site.sh patch | blob | history
deploy/site/vm/.sops.yaml patch | blob | history
deploy/site/vm/site.yaml patch | blob | history
deploy/site/vm/vm.sh patch | blob | history

diff --git a/deploy/site/cluster-icn/.sops.yaml b/deploy/site/cluster-icn/.sops.yaml
new file mode 100644 (file)
index 0000000..dd9d672
--- /dev/null
+++ b/deploy/site/cluster-icn/.sops.yaml
@@ -0,0 +1,4 @@
+creation_rules:
+  - path_regex: .*.yaml
+    encrypted_regex: ^(bmcPassword|hashedPassword|emcoPassword|rootPassword)$
+    pgp: A4B4A47A1DB07DE00E8158BE411E23534CA8FAE0
diff --git a/deploy/site/cluster-icn/emco-db-release.yaml b/deploy/site/cluster-icn/emco-db-release.yaml
index 76e9ecc..6f01448 100644 (file)
--- a/deploy/site/cluster-icn/emco-db-release.yaml
+++ b/deploy/site/cluster-icn/emco-db-release.yaml
@@ -1,24 +1,59 @@
----
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: db
-  namespace: emco
+    name: db
+    namespace: emco
 spec:
-  interval: 5m
-  chart:
-    spec:
-      chart: deployments/helm/emcoOpenNESS/emco-db
-      sourceRef:
-        kind: GitRepository
-        name: emco
-      interval: 1m
-  timeout: 10m
-  dependsOn:
-  - name: podsecurity
-  values:
-    global:
-      repository: integratedcloudnative/
-      pullPolicy: IfNotPresent
-    etcd:
-      clusterDomain: cluster.local
+    interval: 5m
+    chart:
+        spec:
+            chart: deployments/helm/emcoOpenNESS/emco-db
+            sourceRef:
+                kind: GitRepository
+                name: emco
+            interval: 1m
+    timeout: 10m
+    dependsOn:
+        - name: podsecurity
+    values:
+        global:
+            repository: integratedcloudnative/
+            pullPolicy: IfNotPresent
+            db:
+                rootPassword: ENC[AES256_GCM,data:Mt3jQPpW+MhrpNDRs8bXmw==,iv:GkpEWP5nLlNVZmGFziLREA+ef56qbdc2qYLeEH2k2Mo=,tag:9Hg8JGOkOAwoWHjyrueNdQ==,type:str]
+                emcoPassword: ENC[AES256_GCM,data:GzpPkmoVhjXXM15SJvZKQw==,iv:1QP0GzRdt64nbc0wQZ2pU24LdEkDO4agjT5XiD5xkEE=,tag:skQ/iO541RTD4AqL2IiBKQ==,type:str]
+            contextdb:
+                rootPassword: ENC[AES256_GCM,data:M6Rk4DbOHEMdJQ5QXySj4g==,iv:61LJ+PkSM7fvsURo4fhUFBEow1vPgoLh80shQ9teO3o=,tag:0iUp/J6wf0fKUdsKYmM0ow==,type:str]
+        etcd:
+            clusterDomain: cluster.local
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age: []
+    lastmodified: "2022-01-13T22:30:27Z"
+    mac: ENC[AES256_GCM,data:mxeadS1wC8E5IJ4Sa++EBuiDiQHVoovscaSD2278ltcIoZmlw7OtUsk6MWHKmay8aC4XEsSu3R+kBo4w4tOyyuhuGVhRNZdHHyXcqNvKzMq8skoMfDvfyerm/n87CLqjBXjFlJ4ZSRNx0wNSpi3cj8gjS6MPWLHvA4tW2+rX5II=,iv:OkVmCe7kMsonQGUJjNY6rQWPrG0SFH9hNex0/V+IhGM=,tag:Xm098lioMSs5RCAfgiZXQA==,type:str]
+    pgp:
+        - created_at: "2022-01-13T22:30:26Z"
+          enc: |
+            -----BEGIN PGP MESSAGE-----
+
+            hQIMA4SX7nk+q+zPARAAn12AeXnARjmydU8dm7RE/4VuP5z5lNb4MrUtJ38OiTgo
+            fcrSJDFoxxy8aHPNsy9gzkSlC5Qe+cVtRrNOQNqUtJX8XWiH7Ik+9L5LBHHK6KgS
+            kJwl5/GAwtPoKctofMPBVNpDqyuktgv/ukoDKWMzygZbWIKBR5VK/mB51oEaZd+L
+            9UapbppWeyA7zMNdXEGD03eFN+tm1EBlHmV7Q/+Bkzul/U+Fkl7RG0acLyUncg1C
+            ueXMnA9D5M5gVa2Xhcx/4+LmqDc4m2zgiJLI5hyzowj6yOtF2PgLbNblbI6J5k6g
+            pbX3+Sj2PCDN9oNAdrtzd4pORoVso4uyAnyy3Ro5Wmr0c4MtGZ96whXgwXKk2cBf
+            80BaYXjwWyIrfBr25sto/Uv5dVXRcw36zQVo+O01u+9jLcMZ5m3rH+C8XBKGT0Fx
+            au9wKHQDGv+oM40JH/w3W1XshqgvggCGCCmcK3gUlRgARVhOQVx9Fh3gbwPwdkz2
+            FOvvN3Swcf/ilOBe87FmprVeycCxP4r87rvB6R8Z8KBjALvs/ImIaAW7oNjz2Z0d
+            SCVxt+g47qfZdiIYDHAZnzqsnXEAvTjsIDsj7oAuXSyrXEuj1Sf4h8uvgIq827UA
+            9bzPRDrHoENCw8xYJdhbD6uShRF+u6AYG9iLg5XtRv0TuJjvoQGNeUkbRZXIGTnS
+            XgGgDpqs7LhRvhQO1bxDQO73ZFGz31HwmDnCtticLC9ZPvxNixnbm+t+N9JlNK7U
+            3Eqs5suydbbsZEScnV7Lc2xurTfH4okPsvwC3J6sNbTvf+ODk76LZOeV+9imv6I=
+            =NfMW
+            -----END PGP MESSAGE-----
+          fp: A4B4A47A1DB07DE00E8158BE411E23534CA8FAE0
+    encrypted_regex: ^(bmcPassword|hashedPassword|emcoPassword|rootPassword)$
+    version: 3.7.1
diff --git a/deploy/site/cluster-icn/sops.pub.asc b/deploy/site/cluster-icn/sops.pub.asc
new file mode 100644 (file)
index 0000000..34a3c25
--- /dev/null
+++ b/deploy/site/cluster-icn/sops.pub.asc
@@ -0,0 +1,63 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+SqmNDCYCCn2EJbwrHQ==
+=8GKa
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/deploy/site/common.sh b/deploy/site/common.sh
index deafdae..47f82b7 100644 (file)
--- a/deploy/site/common.sh
+++ b/deploy/site/common.sh
@@ -24,36 +24,36 @@ function export_gpg_private_key {
     gpg --export-secret-keys --armor "$(_gpg_key_fp $1)"
 }
 
-function sops_encrypt_site {
-    local -r site_yaml=$1
+function sops_encrypt {
+    local -r yaml=$1
     local -r key_name=$2
 
-    local -r site_dir=$(dirname ${site_yaml})
+    local -r yaml_dir=$(dirname ${yaml})
     local -r key_fp=$(_gpg_key_fp ${key_name})
 
     # Commit the public key to the repository so that team members who
     # clone the repo can encrypt new files
-    echo "Creating ${site_dir}/sops.pub.asc with public key used to encrypt secrets"
-    gpg --export --armor "${key_fp}" >${site_dir}/sops.pub.asc
+    echo "Creating ${yaml_dir}/sops.pub.asc with public key used to encrypt secrets"
+    gpg --export --armor "${key_fp}" >${yaml_dir}/sops.pub.asc
 
     # Add .sops.yaml so users won't have to worry about specifying the
     # proper key for the target cluster or namespace
-    echo "Creating ${site_dir}/.sops.yaml SOPS configuration file"
-    cat <<EOF > ${site_dir}/.sops.yaml
+    echo "Creating ${yaml_dir}/.sops.yaml SOPS configuration file"
+    cat <<EOF > ${yaml_dir}/.sops.yaml
 creation_rules:
   - path_regex: .*.yaml
-    encrypted_regex: ^(bmcPassword|hashedPassword)$
+    encrypted_regex: ^(bmcPassword|decryptionSecret|hashedPassword|emcoPassword|rootPassword)$
     pgp: ${key_fp}
 EOF
 
-    sops --encrypt --in-place --config=${site_dir}/.sops.yaml ${site_yaml}
+    sops --encrypt --in-place --config=${yaml_dir}/.sops.yaml ${yaml}
 }
 
-function sops_decrypt_site {
-    local -r site_yaml=$1
+function sops_decrypt {
+    local -r yaml=$1
 
-    local -r site_dir=$(dirname ${site_yaml})
-    sops --decrypt --in-place --config=${site_dir}/.sops.yaml ${site_yaml}
+    local -r yaml_dir=$(dirname ${yaml})
+    sops --decrypt --in-place --config=${yaml_dir}/.sops.yaml ${yaml}
 }
 
 function flux_site_source_name {
diff --git a/deploy/site/pod11/.sops.yaml b/deploy/site/pod11/.sops.yaml
index 60dfb57..25b4a37 100644 (file)
--- a/deploy/site/pod11/.sops.yaml
+++ b/deploy/site/pod11/.sops.yaml
@@ -1,4 +1,4 @@
 creation_rules:
   - path_regex: .*.yaml
-    encrypted_regex: ^(bmcPassword|hashedPassword)$
+    encrypted_regex: ^(bmcPassword|decryptionSecret|hashedPassword|emcoPassword|rootPassword)$
     pgp: A4B4A47A1DB07DE00E8158BE411E23534CA8FAE0
diff --git a/deploy/site/pod11/pod11.sh b/deploy/site/pod11/pod11.sh
index 96fd7c2..0c2428d 100755 (executable)
--- a/deploy/site/pod11/pod11.sh
+++ b/deploy/site/pod11/pod11.sh
@@ -17,7 +17,7 @@ SITE_PATH=${SITE_PATH:-"deploy/site/pod11"}
 FLUX_SOPS_KEY_NAME=${FLUX_SOPS_KEY_NAME:-"icn-site-vm"} # TODO Replace ICN test key with real key
 
 function build_source {
-    sops_encrypt_site ${SCRIPTDIR}/site.yaml ${FLUX_SOPS_KEY_NAME}
+    sops_encrypt ${SCRIPTDIR}/site.yaml ${FLUX_SOPS_KEY_NAME}
 }
 
 function deploy {
diff --git a/deploy/site/pod11/site.yaml b/deploy/site/pod11/site.yaml
index 569f3ed..cbec281 100644 (file)
--- a/deploy/site/pod11/site.yaml
+++ b/deploy/site/pod11/site.yaml
@@ -8,30 +8,30 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-01-14T00:27:59Z"
-    mac: ENC[AES256_GCM,data:BiQW5qED9uN2Qtlk4zPC/2BYfIVO2bn5RLlCGtBATLKtYkqDhPVXNZTowjJTiFoSIwVLfG/tku2rdaEmJWqgtxFA0eTtxucSR1EILeL63F9epZpi/Bd1r2rIg7f18DVqdjA5Gu1k9KUzvlEcafLADBHFebKmYUJiJ2Z/JqrccaU=,iv:Tc2DpDtLW/GRPRoSy0vSrSIKLkB3Lzka2WtfdGRIEdg=,tag:HTyD0+zgkMmNhfWn9lOU6A==,type:str]
+    lastmodified: "2022-01-14T00:40:10Z"
+    mac: ENC[AES256_GCM,data:U7jpHmRztgu9vmeRVf4DlfVfmBjBPHq+IGxZham9jGrzoYx5upeYg2RWrpFdgNZeOX5Tquz4qzr+LmiMGYbeXmpH7qshh9jZ/TP8LGYnqp5jc8qzxTjh/VHdOGGtR5OfQ7e5UbYZDGddKsmimA2pT9FKBBwpwqATx/qglz7y6Mo=,iv:yWx9zVc/Efflrw0vW4tebLkbdMzaZ8AqeUtHR5ZR9R4=,tag:QNT46MQ80a5mpGHEaHjZ7w==,type:str]
     pgp:
-        - created_at: "2022-01-14T00:27:58Z"
+        - created_at: "2022-01-14T00:40:09Z"
           enc: |
             -----BEGIN PGP MESSAGE-----
 
-            hQIMA4SX7nk+q+zPAQ//S9KkZ9Ixs3aBMqnhDjHa5URzxerpkY2I3h5ONsmCrh/u
-            MEa51MgVot01ebq81d6o13qXKckooKMPILpBUGUjdebpUmz6/U6/Iz+EjZJssmw9
-            QFJQPqzrUfvmpAxXCvUHZ81bdH/0xC0AcC+QA7W/nyz9BIjidyRyOu216Z+/CdIM
-            lOr9JXmz0wmwDvTWW3Gwbp86lN0v0MdZISgZVD8JM0HxQiR60DDTVUD0FRkFVvns
-            obdcttNqEVTLqCpu5TYdDw+WewkmYgPGDC4evnoGD/XAhSwqJVEtY/AWKI/Oa1rm
-            mW/7AxMMrE49wf2Mh2NR0fVDysW+113dwT8NF3/OmQYCTWyLw9Gx2Q2SYRcKN0J3
-            heirz0b6vdjoofks+RWAqwCCNZLUHYImTq/9ayxSVbGVdV8AKZB8IdN6E71YhB/A
-            7DIvu5nzNg3lSu/7oePrM2WURdy/SGVN7SsYISB2OrOx/PqkOnyGPkMZPJq7nmF+
-            tvD8v3c5k7WV/uEX6ET8zIeOZExqhRIYnLn5Y0n6R4e0S3oJHYewai9OhWHe66fK
-            dZjw0Vb1iWmQMG/ypXO8i14WqD74AQO8/QFkd2Ltfvru+BgJhLyUg4woX2BnMWIe
-            1A2NC7hQTCuqdbd74QzbZWaBtDG2zjpT3EH2DseDa8CKcDWv/Oz7wPXi55948DDS
-            XAEQEnZcx4qMa2iWYoJQEieE3/X1tqtO4Pu8xMT6k1OV11JqvHzQ1avvk8K78oew
-            1FVbfAmHtv14rPujr/hO7pXnLjkz81YCuXxnP2/L1jNd6zVo7qYKpuOO0Bya
-            =IvqJ
+            hQIMA4SX7nk+q+zPAQ//dBfdlHOOTQovmy73obZW69dc+jo5sYM78zOeSj3RznSS
+            4cljtooebf/QsAnlqUSqzbeZiT6kueOgBx/O9/p/M2pvCEqYuuxeKqwzK9iN3uPn
+            m1ACoUpAxsFSMl5g7gVylMnQfL2Y6UoPOMLFYfUREoF09csM7LyQ0256wxKYg5cS
+            3NSfgdM8Y2xQJEiEYwOsqXkKdFTcfKjJueDU0XEVvp3xnL9/08909L1Yg8N+HSdN
+            z1MAzTPCV5QRUgZ0e0KFntFDp0WT6M08Q7RkesMPCarfZ5h3jOTntfmUcKo42dGW
+            9lA+MJWQEuCggBIMXB2aF+5wW9Go3dZIYyNWzNv32RcpwhhEkwmqESoQ39bW0TYt
+            1GeAb5sbSWEhLOyEU9dt2cIuvbeMxZ8vjZB7bviOHsgpe5ofl9yqjoeOJcEcFwwU
+            4C+K/Z4Y9nTvSq5jzYzakiRtFxew56pwv06OZCaBljHenCyNa+XwYlrqakKR0N1h
+            bRK5NMhqfnVjIQFuh54Jt4KA6OKWe6xtzPEKZCktgoQ/u3LRa0lArGs2lqvxGnls
+            EoGmaSqx6u3mtMyF/xpzM7fPe+Z5t3m/fir5ce6fB0j1E8lI/4xYMuMir6xufrUu
+            JajkF5abYjcjRdbFHezjvQrmjpZYT/zIEpNvMbMkKG7bSibFoKMuvGEXkigc14PS
+            XAGelhfU2lKqPGckNDgXYx0/tvwOS5t7tw9G3H7K66BlXKvjdEPfyxOCVpzJO4Fi
+            biTA0IZ71Xk72pBgrUsx/ol8/d30ZmJ6gJ0oGc/667QRyCzuC30RfuGxGD7S
+            =r88F
             -----END PGP MESSAGE-----
           fp: A4B4A47A1DB07DE00E8158BE411E23534CA8FAE0
-    encrypted_regex: ^(bmcPassword|hashedPassword)$
+    encrypted_regex: ^(bmcPassword|decryptionSecret|hashedPassword|emcoPassword|rootPassword)$
     version: 3.7.1
 ---
 apiVersion: source.toolkit.fluxcd.io/v1beta1
@@ -52,30 +52,30 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-01-14T00:27:59Z"
-    mac: ENC[AES256_GCM,data:BiQW5qED9uN2Qtlk4zPC/2BYfIVO2bn5RLlCGtBATLKtYkqDhPVXNZTowjJTiFoSIwVLfG/tku2rdaEmJWqgtxFA0eTtxucSR1EILeL63F9epZpi/Bd1r2rIg7f18DVqdjA5Gu1k9KUzvlEcafLADBHFebKmYUJiJ2Z/JqrccaU=,iv:Tc2DpDtLW/GRPRoSy0vSrSIKLkB3Lzka2WtfdGRIEdg=,tag:HTyD0+zgkMmNhfWn9lOU6A==,type:str]
+    lastmodified: "2022-01-14T00:40:10Z"
+    mac: ENC[AES256_GCM,data:U7jpHmRztgu9vmeRVf4DlfVfmBjBPHq+IGxZham9jGrzoYx5upeYg2RWrpFdgNZeOX5Tquz4qzr+LmiMGYbeXmpH7qshh9jZ/TP8LGYnqp5jc8qzxTjh/VHdOGGtR5OfQ7e5UbYZDGddKsmimA2pT9FKBBwpwqATx/qglz7y6Mo=,iv:yWx9zVc/Efflrw0vW4tebLkbdMzaZ8AqeUtHR5ZR9R4=,tag:QNT46MQ80a5mpGHEaHjZ7w==,type:str]
     pgp:
-        - created_at: "2022-01-14T00:27:58Z"
+        - created_at: "2022-01-14T00:40:09Z"
           enc: |
             -----BEGIN PGP MESSAGE-----
 
-            hQIMA4SX7nk+q+zPAQ//S9KkZ9Ixs3aBMqnhDjHa5URzxerpkY2I3h5ONsmCrh/u
-            MEa51MgVot01ebq81d6o13qXKckooKMPILpBUGUjdebpUmz6/U6/Iz+EjZJssmw9
-            QFJQPqzrUfvmpAxXCvUHZ81bdH/0xC0AcC+QA7W/nyz9BIjidyRyOu216Z+/CdIM
-            lOr9JXmz0wmwDvTWW3Gwbp86lN0v0MdZISgZVD8JM0HxQiR60DDTVUD0FRkFVvns
-            obdcttNqEVTLqCpu5TYdDw+WewkmYgPGDC4evnoGD/XAhSwqJVEtY/AWKI/Oa1rm
-            mW/7AxMMrE49wf2Mh2NR0fVDysW+113dwT8NF3/OmQYCTWyLw9Gx2Q2SYRcKN0J3
-            heirz0b6vdjoofks+RWAqwCCNZLUHYImTq/9ayxSVbGVdV8AKZB8IdN6E71YhB/A
-            7DIvu5nzNg3lSu/7oePrM2WURdy/SGVN7SsYISB2OrOx/PqkOnyGPkMZPJq7nmF+
-            tvD8v3c5k7WV/uEX6ET8zIeOZExqhRIYnLn5Y0n6R4e0S3oJHYewai9OhWHe66fK
-            dZjw0Vb1iWmQMG/ypXO8i14WqD74AQO8/QFkd2Ltfvru+BgJhLyUg4woX2BnMWIe
-            1A2NC7hQTCuqdbd74QzbZWaBtDG2zjpT3EH2DseDa8CKcDWv/Oz7wPXi55948DDS
-            XAEQEnZcx4qMa2iWYoJQEieE3/X1tqtO4Pu8xMT6k1OV11JqvHzQ1avvk8K78oew
-            1FVbfAmHtv14rPujr/hO7pXnLjkz81YCuXxnP2/L1jNd6zVo7qYKpuOO0Bya
-            =IvqJ
+            hQIMA4SX7nk+q+zPAQ//dBfdlHOOTQovmy73obZW69dc+jo5sYM78zOeSj3RznSS
+            4cljtooebf/QsAnlqUSqzbeZiT6kueOgBx/O9/p/M2pvCEqYuuxeKqwzK9iN3uPn
+            m1ACoUpAxsFSMl5g7gVylMnQfL2Y6UoPOMLFYfUREoF09csM7LyQ0256wxKYg5cS
+            3NSfgdM8Y2xQJEiEYwOsqXkKdFTcfKjJueDU0XEVvp3xnL9/08909L1Yg8N+HSdN
+            z1MAzTPCV5QRUgZ0e0KFntFDp0WT6M08Q7RkesMPCarfZ5h3jOTntfmUcKo42dGW
+            9lA+MJWQEuCggBIMXB2aF+5wW9Go3dZIYyNWzNv32RcpwhhEkwmqESoQ39bW0TYt
+            1GeAb5sbSWEhLOyEU9dt2cIuvbeMxZ8vjZB7bviOHsgpe5ofl9yqjoeOJcEcFwwU
+            4C+K/Z4Y9nTvSq5jzYzakiRtFxew56pwv06OZCaBljHenCyNa+XwYlrqakKR0N1h
+            bRK5NMhqfnVjIQFuh54Jt4KA6OKWe6xtzPEKZCktgoQ/u3LRa0lArGs2lqvxGnls
+            EoGmaSqx6u3mtMyF/xpzM7fPe+Z5t3m/fir5ce6fB0j1E8lI/4xYMuMir6xufrUu
+            JajkF5abYjcjRdbFHezjvQrmjpZYT/zIEpNvMbMkKG7bSibFoKMuvGEXkigc14PS
+            XAGelhfU2lKqPGckNDgXYx0/tvwOS5t7tw9G3H7K66BlXKvjdEPfyxOCVpzJO4Fi
+            biTA0IZ71Xk72pBgrUsx/ol8/d30ZmJ6gJ0oGc/667QRyCzuC30RfuGxGD7S
+            =r88F
             -----END PGP MESSAGE-----
           fp: A4B4A47A1DB07DE00E8158BE411E23534CA8FAE0
-    encrypted_regex: ^(bmcPassword|hashedPassword)$
+    encrypted_regex: ^(bmcPassword|decryptionSecret|hashedPassword|emcoPassword|rootPassword)$
     version: 3.7.1
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
@@ -98,7 +98,7 @@ spec:
             machine: pod11-node2
         bmcAddress: ipmi://10.10.110.12
         bmcUsername: root
-        bmcPassword: ENC[AES256_GCM,data:tx+M4A==,iv:s/RHH/psL6t5uUnwIZKLHRealGMf/sSmteTVx9lVmLM=,tag:N7ejAgRi/jnu1sqR9/7sxA==,type:str]
+        bmcPassword: ENC[AES256_GCM,data:CSjNZA==,iv:7uJkzKZM5pNF11+KO/JCRXr+LSvJMGoV+i0im0tGqAk=,tag:8HYBxOOdPb2cP6/4kcdlng==,type:str]
         networks:
             baremetal:
                 macAddress: 00:1e:67:fe:f4:19
@@ -120,30 +120,30 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-01-14T00:27:59Z"
-    mac: ENC[AES256_GCM,data:BiQW5qED9uN2Qtlk4zPC/2BYfIVO2bn5RLlCGtBATLKtYkqDhPVXNZTowjJTiFoSIwVLfG/tku2rdaEmJWqgtxFA0eTtxucSR1EILeL63F9epZpi/Bd1r2rIg7f18DVqdjA5Gu1k9KUzvlEcafLADBHFebKmYUJiJ2Z/JqrccaU=,iv:Tc2DpDtLW/GRPRoSy0vSrSIKLkB3Lzka2WtfdGRIEdg=,tag:HTyD0+zgkMmNhfWn9lOU6A==,type:str]
+    lastmodified: "2022-01-14T00:40:10Z"
+    mac: ENC[AES256_GCM,data:U7jpHmRztgu9vmeRVf4DlfVfmBjBPHq+IGxZham9jGrzoYx5upeYg2RWrpFdgNZeOX5Tquz4qzr+LmiMGYbeXmpH7qshh9jZ/TP8LGYnqp5jc8qzxTjh/VHdOGGtR5OfQ7e5UbYZDGddKsmimA2pT9FKBBwpwqATx/qglz7y6Mo=,iv:yWx9zVc/Efflrw0vW4tebLkbdMzaZ8AqeUtHR5ZR9R4=,tag:QNT46MQ80a5mpGHEaHjZ7w==,type:str]
     pgp:
-        - created_at: "2022-01-14T00:27:58Z"
+        - created_at: "2022-01-14T00:40:09Z"
           enc: |
             -----BEGIN PGP MESSAGE-----
 
-            hQIMA4SX7nk+q+zPAQ//S9KkZ9Ixs3aBMqnhDjHa5URzxerpkY2I3h5ONsmCrh/u
-            MEa51MgVot01ebq81d6o13qXKckooKMPILpBUGUjdebpUmz6/U6/Iz+EjZJssmw9
-            QFJQPqzrUfvmpAxXCvUHZ81bdH/0xC0AcC+QA7W/nyz9BIjidyRyOu216Z+/CdIM
-            lOr9JXmz0wmwDvTWW3Gwbp86lN0v0MdZISgZVD8JM0HxQiR60DDTVUD0FRkFVvns
-            obdcttNqEVTLqCpu5TYdDw+WewkmYgPGDC4evnoGD/XAhSwqJVEtY/AWKI/Oa1rm
-            mW/7AxMMrE49wf2Mh2NR0fVDysW+113dwT8NF3/OmQYCTWyLw9Gx2Q2SYRcKN0J3
-            heirz0b6vdjoofks+RWAqwCCNZLUHYImTq/9ayxSVbGVdV8AKZB8IdN6E71YhB/A
-            7DIvu5nzNg3lSu/7oePrM2WURdy/SGVN7SsYISB2OrOx/PqkOnyGPkMZPJq7nmF+
-            tvD8v3c5k7WV/uEX6ET8zIeOZExqhRIYnLn5Y0n6R4e0S3oJHYewai9OhWHe66fK
-            dZjw0Vb1iWmQMG/ypXO8i14WqD74AQO8/QFkd2Ltfvru+BgJhLyUg4woX2BnMWIe
-            1A2NC7hQTCuqdbd74QzbZWaBtDG2zjpT3EH2DseDa8CKcDWv/Oz7wPXi55948DDS
-            XAEQEnZcx4qMa2iWYoJQEieE3/X1tqtO4Pu8xMT6k1OV11JqvHzQ1avvk8K78oew
-            1FVbfAmHtv14rPujr/hO7pXnLjkz81YCuXxnP2/L1jNd6zVo7qYKpuOO0Bya
-            =IvqJ
+            hQIMA4SX7nk+q+zPAQ//dBfdlHOOTQovmy73obZW69dc+jo5sYM78zOeSj3RznSS
+            4cljtooebf/QsAnlqUSqzbeZiT6kueOgBx/O9/p/M2pvCEqYuuxeKqwzK9iN3uPn
+            m1ACoUpAxsFSMl5g7gVylMnQfL2Y6UoPOMLFYfUREoF09csM7LyQ0256wxKYg5cS
+            3NSfgdM8Y2xQJEiEYwOsqXkKdFTcfKjJueDU0XEVvp3xnL9/08909L1Yg8N+HSdN
+            z1MAzTPCV5QRUgZ0e0KFntFDp0WT6M08Q7RkesMPCarfZ5h3jOTntfmUcKo42dGW
+            9lA+MJWQEuCggBIMXB2aF+5wW9Go3dZIYyNWzNv32RcpwhhEkwmqESoQ39bW0TYt
+            1GeAb5sbSWEhLOyEU9dt2cIuvbeMxZ8vjZB7bviOHsgpe5ofl9yqjoeOJcEcFwwU
+            4C+K/Z4Y9nTvSq5jzYzakiRtFxew56pwv06OZCaBljHenCyNa+XwYlrqakKR0N1h
+            bRK5NMhqfnVjIQFuh54Jt4KA6OKWe6xtzPEKZCktgoQ/u3LRa0lArGs2lqvxGnls
+            EoGmaSqx6u3mtMyF/xpzM7fPe+Z5t3m/fir5ce6fB0j1E8lI/4xYMuMir6xufrUu
+            JajkF5abYjcjRdbFHezjvQrmjpZYT/zIEpNvMbMkKG7bSibFoKMuvGEXkigc14PS
+            XAGelhfU2lKqPGckNDgXYx0/tvwOS5t7tw9G3H7K66BlXKvjdEPfyxOCVpzJO4Fi
+            biTA0IZ71Xk72pBgrUsx/ol8/d30ZmJ6gJ0oGc/667QRyCzuC30RfuGxGD7S
+            =r88F
             -----END PGP MESSAGE-----
           fp: A4B4A47A1DB07DE00E8158BE411E23534CA8FAE0
-    encrypted_regex: ^(bmcPassword|hashedPassword)$
+    encrypted_regex: ^(bmcPassword|decryptionSecret|hashedPassword|emcoPassword|rootPassword)$
     version: 3.7.1
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
@@ -166,7 +166,7 @@ spec:
             machine: pod11-node3
         bmcAddress: ipmi://10.10.110.13
         bmcUsername: root
-        bmcPassword: ENC[AES256_GCM,data:yj9elQ==,iv:QZpUsJ9RYp/8GKSX9zIU2QaZYx+XfGg+mpOn6y2iHlI=,tag:GO2UDFGDL1belWhf49d1ZQ==,type:str]
+        bmcPassword: ENC[AES256_GCM,data:AeaXHw==,iv:2BDv6kksS8mgWvyr2hmWuWAq37vUiDHn5ay0Cwem2zs=,tag:gGdGx++vXctU5n0Co7+NdQ==,type:str]
         networks:
             baremetal:
                 macAddress: 00:1e:67:f1:5b:90
@@ -188,30 +188,30 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-01-14T00:27:59Z"
-    mac: ENC[AES256_GCM,data:BiQW5qED9uN2Qtlk4zPC/2BYfIVO2bn5RLlCGtBATLKtYkqDhPVXNZTowjJTiFoSIwVLfG/tku2rdaEmJWqgtxFA0eTtxucSR1EILeL63F9epZpi/Bd1r2rIg7f18DVqdjA5Gu1k9KUzvlEcafLADBHFebKmYUJiJ2Z/JqrccaU=,iv:Tc2DpDtLW/GRPRoSy0vSrSIKLkB3Lzka2WtfdGRIEdg=,tag:HTyD0+zgkMmNhfWn9lOU6A==,type:str]
+    lastmodified: "2022-01-14T00:40:10Z"
+    mac: ENC[AES256_GCM,data:U7jpHmRztgu9vmeRVf4DlfVfmBjBPHq+IGxZham9jGrzoYx5upeYg2RWrpFdgNZeOX5Tquz4qzr+LmiMGYbeXmpH7qshh9jZ/TP8LGYnqp5jc8qzxTjh/VHdOGGtR5OfQ7e5UbYZDGddKsmimA2pT9FKBBwpwqATx/qglz7y6Mo=,iv:yWx9zVc/Efflrw0vW4tebLkbdMzaZ8AqeUtHR5ZR9R4=,tag:QNT46MQ80a5mpGHEaHjZ7w==,type:str]
     pgp:
-        - created_at: "2022-01-14T00:27:58Z"
+        - created_at: "2022-01-14T00:40:09Z"
           enc: |
             -----BEGIN PGP MESSAGE-----
 
-            hQIMA4SX7nk+q+zPAQ//S9KkZ9Ixs3aBMqnhDjHa5URzxerpkY2I3h5ONsmCrh/u
-            MEa51MgVot01ebq81d6o13qXKckooKMPILpBUGUjdebpUmz6/U6/Iz+EjZJssmw9
-            QFJQPqzrUfvmpAxXCvUHZ81bdH/0xC0AcC+QA7W/nyz9BIjidyRyOu216Z+/CdIM
-            lOr9JXmz0wmwDvTWW3Gwbp86lN0v0MdZISgZVD8JM0HxQiR60DDTVUD0FRkFVvns
-            obdcttNqEVTLqCpu5TYdDw+WewkmYgPGDC4evnoGD/XAhSwqJVEtY/AWKI/Oa1rm
-            mW/7AxMMrE49wf2Mh2NR0fVDysW+113dwT8NF3/OmQYCTWyLw9Gx2Q2SYRcKN0J3
-            heirz0b6vdjoofks+RWAqwCCNZLUHYImTq/9ayxSVbGVdV8AKZB8IdN6E71YhB/A
-            7DIvu5nzNg3lSu/7oePrM2WURdy/SGVN7SsYISB2OrOx/PqkOnyGPkMZPJq7nmF+
-            tvD8v3c5k7WV/uEX6ET8zIeOZExqhRIYnLn5Y0n6R4e0S3oJHYewai9OhWHe66fK
-            dZjw0Vb1iWmQMG/ypXO8i14WqD74AQO8/QFkd2Ltfvru+BgJhLyUg4woX2BnMWIe
-            1A2NC7hQTCuqdbd74QzbZWaBtDG2zjpT3EH2DseDa8CKcDWv/Oz7wPXi55948DDS
-            XAEQEnZcx4qMa2iWYoJQEieE3/X1tqtO4Pu8xMT6k1OV11JqvHzQ1avvk8K78oew
-            1FVbfAmHtv14rPujr/hO7pXnLjkz81YCuXxnP2/L1jNd6zVo7qYKpuOO0Bya
-            =IvqJ
+            hQIMA4SX7nk+q+zPAQ//dBfdlHOOTQovmy73obZW69dc+jo5sYM78zOeSj3RznSS
+            4cljtooebf/QsAnlqUSqzbeZiT6kueOgBx/O9/p/M2pvCEqYuuxeKqwzK9iN3uPn
+            m1ACoUpAxsFSMl5g7gVylMnQfL2Y6UoPOMLFYfUREoF09csM7LyQ0256wxKYg5cS
+            3NSfgdM8Y2xQJEiEYwOsqXkKdFTcfKjJueDU0XEVvp3xnL9/08909L1Yg8N+HSdN
+            z1MAzTPCV5QRUgZ0e0KFntFDp0WT6M08Q7RkesMPCarfZ5h3jOTntfmUcKo42dGW
+            9lA+MJWQEuCggBIMXB2aF+5wW9Go3dZIYyNWzNv32RcpwhhEkwmqESoQ39bW0TYt
+            1GeAb5sbSWEhLOyEU9dt2cIuvbeMxZ8vjZB7bviOHsgpe5ofl9yqjoeOJcEcFwwU
+            4C+K/Z4Y9nTvSq5jzYzakiRtFxew56pwv06OZCaBljHenCyNa+XwYlrqakKR0N1h
+            bRK5NMhqfnVjIQFuh54Jt4KA6OKWe6xtzPEKZCktgoQ/u3LRa0lArGs2lqvxGnls
+            EoGmaSqx6u3mtMyF/xpzM7fPe+Z5t3m/fir5ce6fB0j1E8lI/4xYMuMir6xufrUu
+            JajkF5abYjcjRdbFHezjvQrmjpZYT/zIEpNvMbMkKG7bSibFoKMuvGEXkigc14PS
+            XAGelhfU2lKqPGckNDgXYx0/tvwOS5t7tw9G3H7K66BlXKvjdEPfyxOCVpzJO4Fi
+            biTA0IZ71Xk72pBgrUsx/ol8/d30ZmJ6gJ0oGc/667QRyCzuC30RfuGxGD7S
+            =r88F
             -----END PGP MESSAGE-----
           fp: A4B4A47A1DB07DE00E8158BE411E23534CA8FAE0
-    encrypted_regex: ^(bmcPassword|hashedPassword)$
+    encrypted_regex: ^(bmcPassword|decryptionSecret|hashedPassword|emcoPassword|rootPassword)$
     version: 3.7.1
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
@@ -240,40 +240,41 @@ spec:
             matchLabels:
                 machine: pod11-node2
         userData:
-            hashedPassword: ENC[AES256_GCM,data:Hm7QQL5TZAZdMv/27lVZ65mnHbLi2RMQWKo+Tf1vwYvNn8heWYOYTUYhWN/s6N8r7udBTUGYFhmealQ/PvpS5AJWCImkMqAErzL/th2hOWU8yVwzgAfuXnLNiJ1mjXbPloRUFH13fjeHS+uwAFskc8WFzouL,iv:9SbDYNtX8j4Y7BIoAITBcE/aYryQEuL6hzjpOUexPuQ=,tag:FtWSwJt+bkReIXUyJcF88Q==,type:str]
+            hashedPassword: ENC[AES256_GCM,data:cARgD645pnTNZas4q8SnKJCYJtwpSv7cYZ/e1vitOPgHjZwxGk+XwB7VG316VZw0Db+1sek70s5oOFjLBDDm7wcrCr5RfXlD4qOcj11Yw2+Qa/yNFjYvY4+NLsLhCnrbIWdhCvCmBA/gwbFFOtFwejZok0Up,iv:wTyghvx83aO63zYYNVJ74lmtWd0VmLVK8v7q4V80zwQ=,tag:0wPe8hwjNGxXjeVA2wk8Rw==,type:str]
             sshAuthorizedKey: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwLj/ekRDjp354W8kcGLagjudjTBZO8qBffJ4mNb01EJueUbLvM8EwCv2zu9lFKHD+nGkc1fkB3RyCn5OqzQDTAIpp82nOHXtrbKAZPg2ob8BlfVAz34h5r1bG78lnMH1xk7HKNbf73h9yzUEKiyrd8DlhJcJrsOZTPuTdRrIm7jxScDJpHFjy8tGISNMcnBGrNS9ukaRLK+PiEfDpuRtw/gOEf58NXgu38BcNm4tYfacHYuZFUbNCqj9gKi3btZawgybICcqrNqF36E/XXMfCS1qxZ7j9xfKjxWFgD9gW/HkRtV6K11NZFEvaYBFBA9S/GhLtk9aY+EsztABthE0J root@pod11-node5
         flux:
             url: https://gerrit.akraino.org/r/icn
             branch: master
             path: ./deploy/site/cluster-icn
+            decryptionSecret: ENC[AES256_GCM,data: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,iv:h5zM+3pbuhOnRmC3ieuWT1/rEUu1efj3W06+qlB3Sas=,tag:EBJz7LPaWFYN/moCYTAtLw==,type:str]
 sops:
     kms: []
     gcp_kms: []
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-01-14T00:27:59Z"
-    mac: ENC[AES256_GCM,data:BiQW5qED9uN2Qtlk4zPC/2BYfIVO2bn5RLlCGtBATLKtYkqDhPVXNZTowjJTiFoSIwVLfG/tku2rdaEmJWqgtxFA0eTtxucSR1EILeL63F9epZpi/Bd1r2rIg7f18DVqdjA5Gu1k9KUzvlEcafLADBHFebKmYUJiJ2Z/JqrccaU=,iv:Tc2DpDtLW/GRPRoSy0vSrSIKLkB3Lzka2WtfdGRIEdg=,tag:HTyD0+zgkMmNhfWn9lOU6A==,type:str]
+    lastmodified: "2022-01-14T00:40:10Z"
+    mac: ENC[AES256_GCM,data:U7jpHmRztgu9vmeRVf4DlfVfmBjBPHq+IGxZham9jGrzoYx5upeYg2RWrpFdgNZeOX5Tquz4qzr+LmiMGYbeXmpH7qshh9jZ/TP8LGYnqp5jc8qzxTjh/VHdOGGtR5OfQ7e5UbYZDGddKsmimA2pT9FKBBwpwqATx/qglz7y6Mo=,iv:yWx9zVc/Efflrw0vW4tebLkbdMzaZ8AqeUtHR5ZR9R4=,tag:QNT46MQ80a5mpGHEaHjZ7w==,type:str]
     pgp:
-        - created_at: "2022-01-14T00:27:58Z"
+        - created_at: "2022-01-14T00:40:09Z"
           enc: |
             -----BEGIN PGP MESSAGE-----
 
-            hQIMA4SX7nk+q+zPAQ//S9KkZ9Ixs3aBMqnhDjHa5URzxerpkY2I3h5ONsmCrh/u
-            MEa51MgVot01ebq81d6o13qXKckooKMPILpBUGUjdebpUmz6/U6/Iz+EjZJssmw9
-            QFJQPqzrUfvmpAxXCvUHZ81bdH/0xC0AcC+QA7W/nyz9BIjidyRyOu216Z+/CdIM
-            lOr9JXmz0wmwDvTWW3Gwbp86lN0v0MdZISgZVD8JM0HxQiR60DDTVUD0FRkFVvns
-            obdcttNqEVTLqCpu5TYdDw+WewkmYgPGDC4evnoGD/XAhSwqJVEtY/AWKI/Oa1rm
-            mW/7AxMMrE49wf2Mh2NR0fVDysW+113dwT8NF3/OmQYCTWyLw9Gx2Q2SYRcKN0J3
-            heirz0b6vdjoofks+RWAqwCCNZLUHYImTq/9ayxSVbGVdV8AKZB8IdN6E71YhB/A
-            7DIvu5nzNg3lSu/7oePrM2WURdy/SGVN7SsYISB2OrOx/PqkOnyGPkMZPJq7nmF+
-            tvD8v3c5k7WV/uEX6ET8zIeOZExqhRIYnLn5Y0n6R4e0S3oJHYewai9OhWHe66fK
-            dZjw0Vb1iWmQMG/ypXO8i14WqD74AQO8/QFkd2Ltfvru+BgJhLyUg4woX2BnMWIe
-            1A2NC7hQTCuqdbd74QzbZWaBtDG2zjpT3EH2DseDa8CKcDWv/Oz7wPXi55948DDS
-            XAEQEnZcx4qMa2iWYoJQEieE3/X1tqtO4Pu8xMT6k1OV11JqvHzQ1avvk8K78oew
-            1FVbfAmHtv14rPujr/hO7pXnLjkz81YCuXxnP2/L1jNd6zVo7qYKpuOO0Bya
-            =IvqJ
+            hQIMA4SX7nk+q+zPAQ//dBfdlHOOTQovmy73obZW69dc+jo5sYM78zOeSj3RznSS
+            4cljtooebf/QsAnlqUSqzbeZiT6kueOgBx/O9/p/M2pvCEqYuuxeKqwzK9iN3uPn
+            m1ACoUpAxsFSMl5g7gVylMnQfL2Y6UoPOMLFYfUREoF09csM7LyQ0256wxKYg5cS
+            3NSfgdM8Y2xQJEiEYwOsqXkKdFTcfKjJueDU0XEVvp3xnL9/08909L1Yg8N+HSdN
+            z1MAzTPCV5QRUgZ0e0KFntFDp0WT6M08Q7RkesMPCarfZ5h3jOTntfmUcKo42dGW
+            9lA+MJWQEuCggBIMXB2aF+5wW9Go3dZIYyNWzNv32RcpwhhEkwmqESoQ39bW0TYt
+            1GeAb5sbSWEhLOyEU9dt2cIuvbeMxZ8vjZB7bviOHsgpe5ofl9yqjoeOJcEcFwwU
+            4C+K/Z4Y9nTvSq5jzYzakiRtFxew56pwv06OZCaBljHenCyNa+XwYlrqakKR0N1h
+            bRK5NMhqfnVjIQFuh54Jt4KA6OKWe6xtzPEKZCktgoQ/u3LRa0lArGs2lqvxGnls
+            EoGmaSqx6u3mtMyF/xpzM7fPe+Z5t3m/fir5ce6fB0j1E8lI/4xYMuMir6xufrUu
+            JajkF5abYjcjRdbFHezjvQrmjpZYT/zIEpNvMbMkKG7bSibFoKMuvGEXkigc14PS
+            XAGelhfU2lKqPGckNDgXYx0/tvwOS5t7tw9G3H7K66BlXKvjdEPfyxOCVpzJO4Fi
+            biTA0IZ71Xk72pBgrUsx/ol8/d30ZmJ6gJ0oGc/667QRyCzuC30RfuGxGD7S
+            =r88F
             -----END PGP MESSAGE-----
           fp: A4B4A47A1DB07DE00E8158BE411E23534CA8FAE0
-    encrypted_regex: ^(bmcPassword|hashedPassword)$
+    encrypted_regex: ^(bmcPassword|decryptionSecret|hashedPassword|emcoPassword|rootPassword)$
     version: 3.7.1
diff --git a/deploy/site/site.sh b/deploy/site/site.sh
index d0c970a..ca117cb 100755 (executable)
--- a/deploy/site/site.sh
+++ b/deploy/site/site.sh
@@ -9,8 +9,8 @@ source $SCRIPTDIR/common.sh
 
 case $1 in
     "create-gpg-key") create_gpg_key $2 ;;
-    "sops-encrypt-site") sops_encrypt_site $2 $3 ;;
-    "sops-decrypt-site") sops_decrypt_site $2 ;;
+    "sops-encrypt-site") sops_encrypt $2 $3 ;;
+    "sops-decrypt-site") sops_decrypt $2 ;;
     "flux-create-site") flux_create_site $2 $3 $4 $5;;
     *) cat <<EOF
 Usage: $(basename $0) COMMAND
diff --git a/deploy/site/vm/.sops.yaml b/deploy/site/vm/.sops.yaml
index 60dfb57..25b4a37 100644 (file)
--- a/deploy/site/vm/.sops.yaml
+++ b/deploy/site/vm/.sops.yaml
@@ -1,4 +1,4 @@
 creation_rules:
   - path_regex: .*.yaml
-    encrypted_regex: ^(bmcPassword|hashedPassword)$
+    encrypted_regex: ^(bmcPassword|decryptionSecret|hashedPassword|emcoPassword|rootPassword)$
     pgp: A4B4A47A1DB07DE00E8158BE411E23534CA8FAE0
diff --git a/deploy/site/vm/site.yaml b/deploy/site/vm/site.yaml
index 3aa7faf..06de621 100644 (file)
--- a/deploy/site/vm/site.yaml
+++ b/deploy/site/vm/site.yaml
@@ -8,30 +8,30 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-01-14T00:28:28Z"
-    mac: ENC[AES256_GCM,data:jJIX4bdrrwThZWYJMG9zRSzf/85nxxBf7SZSw/uQkmhS7sLjEXQRbfUNIZpw/JblQBM7Ar/B+YiTz1pJP3vx6PE67uTbegTHIHQ1XA0+ZXrLlFEMLn4XSTlAQwWTFKXgey8+ogSuwxpjmPQcHMJaTitKJWvJVnPaA6HFyp802I4=,iv:sRbFks+///V+vg3wLldBKAEb/IexHihyXHPswQ5rbOQ=,tag:D0z7ZjQztNT9iaweV8HuEg==,type:str]
+    lastmodified: "2022-01-14T00:40:14Z"
+    mac: ENC[AES256_GCM,data:ZX/9UrVCQOPDMFLnLW8pvije38MZrQkRJe7pDwAKvJHGbG6rIY2ia62S8z5lvyK07Caz6sZeYqTesTQftbtnXw6wLa24EVOT7JzEWvH2lmwW0LuqoCPfuNJA7LtHO2BFtGu8n9IA4au3c5ytUXgDQwUrot57l8IVXI8oAUOncsA=,iv:hVCVf6y0yaKW0p2/FF27Wi53xYtHidaCjF1Hdwx3ToU=,tag:zL8U+Ns1HUwoPa0JGNSJvQ==,type:str]
     pgp:
-        - created_at: "2022-01-14T00:28:26Z"
+        - created_at: "2022-01-14T00:40:13Z"
           enc: |
             -----BEGIN PGP MESSAGE-----
 
-            hQIMA4SX7nk+q+zPAQ/5AdqdpaOussjQ3xbKVuEWRanMeFDZHSjdkOxInf7x2NMY
-            dmxRW/fWmUqmIkwT6oFW1166o9ZUWjUYMRiseXwVFfl6Erl6d2P06n/pAmWKIbzY
-            5tmv4NS+HnGoqD1y98QfiIEonQ4LgNg1V0B14R1C3Ct2bAvXpEkOeGV3N5o0EF6Y
-            YUYK22G98G5Br1vaXJ9Jmn6yAzDUZQmtA/qC5gUNPLVvJAncjegGofarNVovJwRR
-            LjmRnOPTGbQLoJDS35KfOf8cU9Hp3QWwUTyLgEbggROhfLO5UpVozOLj10M597qd
-            MI2HqPkJiPg2PMnSf+8Qw9oCTUyV2+saXK/OmQxHDQeHQBROqJtLUnMRfDdHDkNs
-            pCyvcH66jJBHC5e8bB5bDlKMZnXf4cqubBVRj+vdhkPmYuIWRF5DATMe4pTvuGuL
-            3CgN4sf0fdUg/Q/El5vSCCqG+cRMtjWbawLGD1YtZEx8XCHERNl9SL8I4ChcFo9N
-            TE5s5BzJBuScsKEEW6UPhSSGB4vENQ6sUD1LmhT2sKBh0/0+43L/B6ujG1BJWTPN
-            QYGbbNjqgsg4bLE4aKn5UZp1dtC2uVAAkeRiMPn6PUelxwZW4Ei9S+D5jZZxE4ZP
-            pT/DZQBAmtdJbKc03eci325IblWKIWRpRhuNE5Mz2+/GYpNM/cy2wcPcX2NSoK7S
-            XgGI/ei/LChXeo/J5rfX7ut/FAXQh5G9bBVeAaVXMITc6KXepLiBTAloIFNMzF+E
-            g5GqN+yoh6bwd0nmCf5fSIDokVVKn/ozbDtgPle1RjIU0evFga4061XC2mOgilc=
-            =WPoJ
+            hQIMA4SX7nk+q+zPARAAkyNxl2zM7Rhp22+bjyD+3gG7u/8XJfrhIkFFXkGANwgb
+            NV1hz37wAHx+8TAgGuetTVE9EP63M1j+UUkfF8phCD2NU0Ck0etT8ZJK0HHEdPAY
+            6G+peFwuRUS3RYM8/gETMPgLVGvKTH9aDLnTAMBC7Zdc0ifB89Qxo9+c2fq4LYOZ
+            imTcHx0oTAHFSUdsti7dLNhJFt1WakvLJuinfMrLFZ+guwMmX367vYcyucYeAbno
+            a4qwi3Tr88p4sYSzJDUIu3qcELSgmOxzgTCLhtAxw3hmg90V8Urhp4N5xtAfwvER
+            RbGoDoMQUVb3mAXSzSaM7Cqj1I/eYmgdtnufQX8OOA5HTXw9hAy1yzADalpiYOCY
+            xmwOaBnb5SKiAYG2aopr1e6zfvLKephl11yLITZhrjPxmtn23ru//JlEkECFEMaN
+            eEUdHaQpWqwj2ywECIyFx2knBTfYCnuZb4Bq9b1+xoZMC4kLvIAsVsDsuYNVAj8D
+            JlZOWuyPmVjRcUT5SewBZOZAJEcNJf0USgxlY30SjM12J1da2MmT0ydZkyC+7lnO
+            PX07azxTLllAE5aVHtn19wrhP/qwGqKXxCfI3iHX2/nY+6sq47y9f6aZAe/pIlY5
+            zwJvvt2FtIwPhsbsExFqC9CG+MSCi4Y5LozvEyNrN1ZYQkoPT5Oi4Nhz1tvLMEfS
+            XgGaGVb+ISLps5QYydqTmm/3rdel740UOQ3mp3Uy9da5UlOtZsAFAzZYp0hQoWxT
+            sVgyJM2PGcI+CjvfUBq9cJfXwBAtDu0+T+aKOMyS6Qvt120Kb+6CeYBXssxyqJc=
+            =OZ/k
             -----END PGP MESSAGE-----
           fp: A4B4A47A1DB07DE00E8158BE411E23534CA8FAE0
-    encrypted_regex: ^(bmcPassword|hashedPassword)$
+    encrypted_regex: ^(bmcPassword|decryptionSecret|hashedPassword|emcoPassword|rootPassword)$
     version: 3.7.1
 ---
 apiVersion: source.toolkit.fluxcd.io/v1beta1
@@ -52,30 +52,30 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-01-14T00:28:28Z"
-    mac: ENC[AES256_GCM,data:jJIX4bdrrwThZWYJMG9zRSzf/85nxxBf7SZSw/uQkmhS7sLjEXQRbfUNIZpw/JblQBM7Ar/B+YiTz1pJP3vx6PE67uTbegTHIHQ1XA0+ZXrLlFEMLn4XSTlAQwWTFKXgey8+ogSuwxpjmPQcHMJaTitKJWvJVnPaA6HFyp802I4=,iv:sRbFks+///V+vg3wLldBKAEb/IexHihyXHPswQ5rbOQ=,tag:D0z7ZjQztNT9iaweV8HuEg==,type:str]
+    lastmodified: "2022-01-14T00:40:14Z"
+    mac: ENC[AES256_GCM,data:ZX/9UrVCQOPDMFLnLW8pvije38MZrQkRJe7pDwAKvJHGbG6rIY2ia62S8z5lvyK07Caz6sZeYqTesTQftbtnXw6wLa24EVOT7JzEWvH2lmwW0LuqoCPfuNJA7LtHO2BFtGu8n9IA4au3c5ytUXgDQwUrot57l8IVXI8oAUOncsA=,iv:hVCVf6y0yaKW0p2/FF27Wi53xYtHidaCjF1Hdwx3ToU=,tag:zL8U+Ns1HUwoPa0JGNSJvQ==,type:str]
     pgp:
-        - created_at: "2022-01-14T00:28:26Z"
+        - created_at: "2022-01-14T00:40:13Z"
           enc: |
             -----BEGIN PGP MESSAGE-----
 
-            hQIMA4SX7nk+q+zPAQ/5AdqdpaOussjQ3xbKVuEWRanMeFDZHSjdkOxInf7x2NMY
-            dmxRW/fWmUqmIkwT6oFW1166o9ZUWjUYMRiseXwVFfl6Erl6d2P06n/pAmWKIbzY
-            5tmv4NS+HnGoqD1y98QfiIEonQ4LgNg1V0B14R1C3Ct2bAvXpEkOeGV3N5o0EF6Y
-            YUYK22G98G5Br1vaXJ9Jmn6yAzDUZQmtA/qC5gUNPLVvJAncjegGofarNVovJwRR
-            LjmRnOPTGbQLoJDS35KfOf8cU9Hp3QWwUTyLgEbggROhfLO5UpVozOLj10M597qd
-            MI2HqPkJiPg2PMnSf+8Qw9oCTUyV2+saXK/OmQxHDQeHQBROqJtLUnMRfDdHDkNs
-            pCyvcH66jJBHC5e8bB5bDlKMZnXf4cqubBVRj+vdhkPmYuIWRF5DATMe4pTvuGuL
-            3CgN4sf0fdUg/Q/El5vSCCqG+cRMtjWbawLGD1YtZEx8XCHERNl9SL8I4ChcFo9N
-            TE5s5BzJBuScsKEEW6UPhSSGB4vENQ6sUD1LmhT2sKBh0/0+43L/B6ujG1BJWTPN
-            QYGbbNjqgsg4bLE4aKn5UZp1dtC2uVAAkeRiMPn6PUelxwZW4Ei9S+D5jZZxE4ZP
-            pT/DZQBAmtdJbKc03eci325IblWKIWRpRhuNE5Mz2+/GYpNM/cy2wcPcX2NSoK7S
-            XgGI/ei/LChXeo/J5rfX7ut/FAXQh5G9bBVeAaVXMITc6KXepLiBTAloIFNMzF+E
-            g5GqN+yoh6bwd0nmCf5fSIDokVVKn/ozbDtgPle1RjIU0evFga4061XC2mOgilc=
-            =WPoJ
+            hQIMA4SX7nk+q+zPARAAkyNxl2zM7Rhp22+bjyD+3gG7u/8XJfrhIkFFXkGANwgb
+            NV1hz37wAHx+8TAgGuetTVE9EP63M1j+UUkfF8phCD2NU0Ck0etT8ZJK0HHEdPAY
+            6G+peFwuRUS3RYM8/gETMPgLVGvKTH9aDLnTAMBC7Zdc0ifB89Qxo9+c2fq4LYOZ
+            imTcHx0oTAHFSUdsti7dLNhJFt1WakvLJuinfMrLFZ+guwMmX367vYcyucYeAbno
+            a4qwi3Tr88p4sYSzJDUIu3qcELSgmOxzgTCLhtAxw3hmg90V8Urhp4N5xtAfwvER
+            RbGoDoMQUVb3mAXSzSaM7Cqj1I/eYmgdtnufQX8OOA5HTXw9hAy1yzADalpiYOCY
+            xmwOaBnb5SKiAYG2aopr1e6zfvLKephl11yLITZhrjPxmtn23ru//JlEkECFEMaN
+            eEUdHaQpWqwj2ywECIyFx2knBTfYCnuZb4Bq9b1+xoZMC4kLvIAsVsDsuYNVAj8D
+            JlZOWuyPmVjRcUT5SewBZOZAJEcNJf0USgxlY30SjM12J1da2MmT0ydZkyC+7lnO
+            PX07azxTLllAE5aVHtn19wrhP/qwGqKXxCfI3iHX2/nY+6sq47y9f6aZAe/pIlY5
+            zwJvvt2FtIwPhsbsExFqC9CG+MSCi4Y5LozvEyNrN1ZYQkoPT5Oi4Nhz1tvLMEfS
+            XgGaGVb+ISLps5QYydqTmm/3rdel740UOQ3mp3Uy9da5UlOtZsAFAzZYp0hQoWxT
+            sVgyJM2PGcI+CjvfUBq9cJfXwBAtDu0+T+aKOMyS6Qvt120Kb+6CeYBXssxyqJc=
+            =OZ/k
             -----END PGP MESSAGE-----
           fp: A4B4A47A1DB07DE00E8158BE411E23534CA8FAE0
-    encrypted_regex: ^(bmcPassword|hashedPassword)$
+    encrypted_regex: ^(bmcPassword|decryptionSecret|hashedPassword|emcoPassword|rootPassword)$
     version: 3.7.1
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
@@ -97,37 +97,37 @@ spec:
         bootMACAddress: 52:54:00:c6:75:40
         bmcAddress: ipmi://192.168.151.1:6230
         bmcUsername: admin
-        bmcPassword: ENC[AES256_GCM,data:yUB01xLvBgo=,iv:kzL/dq8Q0y4DD9BuM+BxkB/BqpvxoiD/WJCAqQv3iZ8=,tag:Y12m+BAikOXZprDW0xFTGg==,type:str]
+        bmcPassword: ENC[AES256_GCM,data:RLQKWhGkP5U=,iv:O4b5ea3xhTu7aGJj3yn4lWqj5X2E+7s7Pd9TPBQmvfc=,tag:mIKXfp62p4gZ50Fygc+WWA==,type:str]
 sops:
     kms: []
     gcp_kms: []
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-01-14T00:28:28Z"
-    mac: ENC[AES256_GCM,data:jJIX4bdrrwThZWYJMG9zRSzf/85nxxBf7SZSw/uQkmhS7sLjEXQRbfUNIZpw/JblQBM7Ar/B+YiTz1pJP3vx6PE67uTbegTHIHQ1XA0+ZXrLlFEMLn4XSTlAQwWTFKXgey8+ogSuwxpjmPQcHMJaTitKJWvJVnPaA6HFyp802I4=,iv:sRbFks+///V+vg3wLldBKAEb/IexHihyXHPswQ5rbOQ=,tag:D0z7ZjQztNT9iaweV8HuEg==,type:str]
+    lastmodified: "2022-01-14T00:40:14Z"
+    mac: ENC[AES256_GCM,data:ZX/9UrVCQOPDMFLnLW8pvije38MZrQkRJe7pDwAKvJHGbG6rIY2ia62S8z5lvyK07Caz6sZeYqTesTQftbtnXw6wLa24EVOT7JzEWvH2lmwW0LuqoCPfuNJA7LtHO2BFtGu8n9IA4au3c5ytUXgDQwUrot57l8IVXI8oAUOncsA=,iv:hVCVf6y0yaKW0p2/FF27Wi53xYtHidaCjF1Hdwx3ToU=,tag:zL8U+Ns1HUwoPa0JGNSJvQ==,type:str]
     pgp:
-        - created_at: "2022-01-14T00:28:26Z"
+        - created_at: "2022-01-14T00:40:13Z"
           enc: |
             -----BEGIN PGP MESSAGE-----
 
-            hQIMA4SX7nk+q+zPAQ/5AdqdpaOussjQ3xbKVuEWRanMeFDZHSjdkOxInf7x2NMY
-            dmxRW/fWmUqmIkwT6oFW1166o9ZUWjUYMRiseXwVFfl6Erl6d2P06n/pAmWKIbzY
-            5tmv4NS+HnGoqD1y98QfiIEonQ4LgNg1V0B14R1C3Ct2bAvXpEkOeGV3N5o0EF6Y
-            YUYK22G98G5Br1vaXJ9Jmn6yAzDUZQmtA/qC5gUNPLVvJAncjegGofarNVovJwRR
-            LjmRnOPTGbQLoJDS35KfOf8cU9Hp3QWwUTyLgEbggROhfLO5UpVozOLj10M597qd
-            MI2HqPkJiPg2PMnSf+8Qw9oCTUyV2+saXK/OmQxHDQeHQBROqJtLUnMRfDdHDkNs
-            pCyvcH66jJBHC5e8bB5bDlKMZnXf4cqubBVRj+vdhkPmYuIWRF5DATMe4pTvuGuL
-            3CgN4sf0fdUg/Q/El5vSCCqG+cRMtjWbawLGD1YtZEx8XCHERNl9SL8I4ChcFo9N
-            TE5s5BzJBuScsKEEW6UPhSSGB4vENQ6sUD1LmhT2sKBh0/0+43L/B6ujG1BJWTPN
-            QYGbbNjqgsg4bLE4aKn5UZp1dtC2uVAAkeRiMPn6PUelxwZW4Ei9S+D5jZZxE4ZP
-            pT/DZQBAmtdJbKc03eci325IblWKIWRpRhuNE5Mz2+/GYpNM/cy2wcPcX2NSoK7S
-            XgGI/ei/LChXeo/J5rfX7ut/FAXQh5G9bBVeAaVXMITc6KXepLiBTAloIFNMzF+E
-            g5GqN+yoh6bwd0nmCf5fSIDokVVKn/ozbDtgPle1RjIU0evFga4061XC2mOgilc=
-            =WPoJ
+            hQIMA4SX7nk+q+zPARAAkyNxl2zM7Rhp22+bjyD+3gG7u/8XJfrhIkFFXkGANwgb
+            NV1hz37wAHx+8TAgGuetTVE9EP63M1j+UUkfF8phCD2NU0Ck0etT8ZJK0HHEdPAY
+            6G+peFwuRUS3RYM8/gETMPgLVGvKTH9aDLnTAMBC7Zdc0ifB89Qxo9+c2fq4LYOZ
+            imTcHx0oTAHFSUdsti7dLNhJFt1WakvLJuinfMrLFZ+guwMmX367vYcyucYeAbno
+            a4qwi3Tr88p4sYSzJDUIu3qcELSgmOxzgTCLhtAxw3hmg90V8Urhp4N5xtAfwvER
+            RbGoDoMQUVb3mAXSzSaM7Cqj1I/eYmgdtnufQX8OOA5HTXw9hAy1yzADalpiYOCY
+            xmwOaBnb5SKiAYG2aopr1e6zfvLKephl11yLITZhrjPxmtn23ru//JlEkECFEMaN
+            eEUdHaQpWqwj2ywECIyFx2knBTfYCnuZb4Bq9b1+xoZMC4kLvIAsVsDsuYNVAj8D
+            JlZOWuyPmVjRcUT5SewBZOZAJEcNJf0USgxlY30SjM12J1da2MmT0ydZkyC+7lnO
+            PX07azxTLllAE5aVHtn19wrhP/qwGqKXxCfI3iHX2/nY+6sq47y9f6aZAe/pIlY5
+            zwJvvt2FtIwPhsbsExFqC9CG+MSCi4Y5LozvEyNrN1ZYQkoPT5Oi4Nhz1tvLMEfS
+            XgGaGVb+ISLps5QYydqTmm/3rdel740UOQ3mp3Uy9da5UlOtZsAFAzZYp0hQoWxT
+            sVgyJM2PGcI+CjvfUBq9cJfXwBAtDu0+T+aKOMyS6Qvt120Kb+6CeYBXssxyqJc=
+            =OZ/k
             -----END PGP MESSAGE-----
           fp: A4B4A47A1DB07DE00E8158BE411E23534CA8FAE0
-    encrypted_regex: ^(bmcPassword|hashedPassword)$
+    encrypted_regex: ^(bmcPassword|decryptionSecret|hashedPassword|emcoPassword|rootPassword)$
     version: 3.7.1
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
@@ -149,37 +149,37 @@ spec:
         bootMACAddress: 52:54:00:6f:d6:97
         bmcAddress: ipmi://192.168.151.1:6231
         bmcUsername: admin
-        bmcPassword: ENC[AES256_GCM,data:2SwCscZW19I=,iv:DaiMRUjLejRAe2O1prOLep3jH9h4MzMQZrK23285yOI=,tag:9dAvtXDj7+r/l1XfLQniww==,type:str]
+        bmcPassword: ENC[AES256_GCM,data:CV8uVSXXTLM=,iv:TGhZCH/UpE5V45oPJ6G7JI5NcTzRzkBsuSGpAWJ9ETY=,tag:5AoJElXsl0Vmin4QiUuGeQ==,type:str]
 sops:
     kms: []
     gcp_kms: []
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-01-14T00:28:28Z"
-    mac: ENC[AES256_GCM,data:jJIX4bdrrwThZWYJMG9zRSzf/85nxxBf7SZSw/uQkmhS7sLjEXQRbfUNIZpw/JblQBM7Ar/B+YiTz1pJP3vx6PE67uTbegTHIHQ1XA0+ZXrLlFEMLn4XSTlAQwWTFKXgey8+ogSuwxpjmPQcHMJaTitKJWvJVnPaA6HFyp802I4=,iv:sRbFks+///V+vg3wLldBKAEb/IexHihyXHPswQ5rbOQ=,tag:D0z7ZjQztNT9iaweV8HuEg==,type:str]
+    lastmodified: "2022-01-14T00:40:14Z"
+    mac: ENC[AES256_GCM,data:ZX/9UrVCQOPDMFLnLW8pvije38MZrQkRJe7pDwAKvJHGbG6rIY2ia62S8z5lvyK07Caz6sZeYqTesTQftbtnXw6wLa24EVOT7JzEWvH2lmwW0LuqoCPfuNJA7LtHO2BFtGu8n9IA4au3c5ytUXgDQwUrot57l8IVXI8oAUOncsA=,iv:hVCVf6y0yaKW0p2/FF27Wi53xYtHidaCjF1Hdwx3ToU=,tag:zL8U+Ns1HUwoPa0JGNSJvQ==,type:str]
     pgp:
-        - created_at: "2022-01-14T00:28:26Z"
+        - created_at: "2022-01-14T00:40:13Z"
           enc: |
             -----BEGIN PGP MESSAGE-----
 
-            hQIMA4SX7nk+q+zPAQ/5AdqdpaOussjQ3xbKVuEWRanMeFDZHSjdkOxInf7x2NMY
-            dmxRW/fWmUqmIkwT6oFW1166o9ZUWjUYMRiseXwVFfl6Erl6d2P06n/pAmWKIbzY
-            5tmv4NS+HnGoqD1y98QfiIEonQ4LgNg1V0B14R1C3Ct2bAvXpEkOeGV3N5o0EF6Y
-            YUYK22G98G5Br1vaXJ9Jmn6yAzDUZQmtA/qC5gUNPLVvJAncjegGofarNVovJwRR
-            LjmRnOPTGbQLoJDS35KfOf8cU9Hp3QWwUTyLgEbggROhfLO5UpVozOLj10M597qd
-            MI2HqPkJiPg2PMnSf+8Qw9oCTUyV2+saXK/OmQxHDQeHQBROqJtLUnMRfDdHDkNs
-            pCyvcH66jJBHC5e8bB5bDlKMZnXf4cqubBVRj+vdhkPmYuIWRF5DATMe4pTvuGuL
-            3CgN4sf0fdUg/Q/El5vSCCqG+cRMtjWbawLGD1YtZEx8XCHERNl9SL8I4ChcFo9N
-            TE5s5BzJBuScsKEEW6UPhSSGB4vENQ6sUD1LmhT2sKBh0/0+43L/B6ujG1BJWTPN
-            QYGbbNjqgsg4bLE4aKn5UZp1dtC2uVAAkeRiMPn6PUelxwZW4Ei9S+D5jZZxE4ZP
-            pT/DZQBAmtdJbKc03eci325IblWKIWRpRhuNE5Mz2+/GYpNM/cy2wcPcX2NSoK7S
-            XgGI/ei/LChXeo/J5rfX7ut/FAXQh5G9bBVeAaVXMITc6KXepLiBTAloIFNMzF+E
-            g5GqN+yoh6bwd0nmCf5fSIDokVVKn/ozbDtgPle1RjIU0evFga4061XC2mOgilc=
-            =WPoJ
+            hQIMA4SX7nk+q+zPARAAkyNxl2zM7Rhp22+bjyD+3gG7u/8XJfrhIkFFXkGANwgb
+            NV1hz37wAHx+8TAgGuetTVE9EP63M1j+UUkfF8phCD2NU0Ck0etT8ZJK0HHEdPAY
+            6G+peFwuRUS3RYM8/gETMPgLVGvKTH9aDLnTAMBC7Zdc0ifB89Qxo9+c2fq4LYOZ
+            imTcHx0oTAHFSUdsti7dLNhJFt1WakvLJuinfMrLFZ+guwMmX367vYcyucYeAbno
+            a4qwi3Tr88p4sYSzJDUIu3qcELSgmOxzgTCLhtAxw3hmg90V8Urhp4N5xtAfwvER
+            RbGoDoMQUVb3mAXSzSaM7Cqj1I/eYmgdtnufQX8OOA5HTXw9hAy1yzADalpiYOCY
+            xmwOaBnb5SKiAYG2aopr1e6zfvLKephl11yLITZhrjPxmtn23ru//JlEkECFEMaN
+            eEUdHaQpWqwj2ywECIyFx2knBTfYCnuZb4Bq9b1+xoZMC4kLvIAsVsDsuYNVAj8D
+            JlZOWuyPmVjRcUT5SewBZOZAJEcNJf0USgxlY30SjM12J1da2MmT0ydZkyC+7lnO
+            PX07azxTLllAE5aVHtn19wrhP/qwGqKXxCfI3iHX2/nY+6sq47y9f6aZAe/pIlY5
+            zwJvvt2FtIwPhsbsExFqC9CG+MSCi4Y5LozvEyNrN1ZYQkoPT5Oi4Nhz1tvLMEfS
+            XgGaGVb+ISLps5QYydqTmm/3rdel740UOQ3mp3Uy9da5UlOtZsAFAzZYp0hQoWxT
+            sVgyJM2PGcI+CjvfUBq9cJfXwBAtDu0+T+aKOMyS6Qvt120Kb+6CeYBXssxyqJc=
+            =OZ/k
             -----END PGP MESSAGE-----
           fp: A4B4A47A1DB07DE00E8158BE411E23534CA8FAE0
-    encrypted_regex: ^(bmcPassword|hashedPassword)$
+    encrypted_regex: ^(bmcPassword|decryptionSecret|hashedPassword|emcoPassword|rootPassword)$
     version: 3.7.1
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
@@ -209,40 +209,41 @@ spec:
             provisioning:
                 interface: ens5
         userData:
-            hashedPassword: ENC[AES256_GCM,data:aZ1DIVYMdBcjxp9DYinn7wsoOgd4JFuS5ptmLuYkf7Y0k7VwrDr+5D4uqVjGYljeIOzELi7TxdUso5z8Xx6czSuumykas9kbi1by085DyTAWYeWcpGxqQvcxmFJIEuRWYfddl6Er8HbejNdFmBgFEAt4YfZr,iv:Pik3lhn3l2wLq4Rr7s3mB+v4KfBxyc/wrOvCoZn/q10=,tag:8qjDc3XX10lkcVhb4kgjxQ==,type:str]
+            hashedPassword: ENC[AES256_GCM,data:Shc+MadEoeDLJBL8j1901B1zRq4f0gmj7OG2GVQpxoGoTmT/h/rr5QV07Eeyi+gQE/xBgtoY3DH3ZoLPzwZn+Iy4n1LjNUpriOOM8g+3SacK86siemUTVwsTw1b4a5Dk9sToBNvap+BpCMOC/DHY9hxQ01hL,iv:XvMywWg8OAFx6q0aM0LZrfUiiTSA19U0WO64vtzgAFE=,tag:PeSE/UV+fgdKBcy511lMBw==,type:str]
             sshAuthorizedKey: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDP9Q+b+4tjZuSdL6kDoa2h4ikD3AG6dhxSQQjpUir8Uu2yF6u1WAHq8cBA4KuOnL1eLQqaDRNNeK42Eai7Hi5QlhbNa3MD4hEh8LM1kUDstll6TWUk1LVAX8vcHRPuhHC93yeGWzXLdxSl2jiB0snPyRuNaW9NHz8uNbFsZUtJ3J8pQov85dgCGjdHwhxdDjiprESQLseD5igKz7yhlPdAHrH+1Zmzsng1OUBYsUt62OJnVI0kkvT0H/unFl6rqkmZU8Q14NNqEkwMFGjcOcE95ZPz5Zc9EdjPce0mDLosn9x5gsKe2MairbJLYRp9qQf7JgzOuH2s9gnJ4sklkB83 root@jump
         flux:
             url: https://gerrit.akraino.org/r/icn
             branch: master
             path: ./deploy/site/cluster-icn
+            decryptionSecret: ENC[AES256_GCM,data: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,iv:kuxC6Ptn51uVvZPIgjr8XNHkWuzI7RBo96Kq+4dCA2I=,tag:2h4RzHVCFFyrXd0jr4y2Bw==,type:str]
 sops:
     kms: []
     gcp_kms: []
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-01-14T00:28:28Z"
-    mac: ENC[AES256_GCM,data:jJIX4bdrrwThZWYJMG9zRSzf/85nxxBf7SZSw/uQkmhS7sLjEXQRbfUNIZpw/JblQBM7Ar/B+YiTz1pJP3vx6PE67uTbegTHIHQ1XA0+ZXrLlFEMLn4XSTlAQwWTFKXgey8+ogSuwxpjmPQcHMJaTitKJWvJVnPaA6HFyp802I4=,iv:sRbFks+///V+vg3wLldBKAEb/IexHihyXHPswQ5rbOQ=,tag:D0z7ZjQztNT9iaweV8HuEg==,type:str]
+    lastmodified: "2022-01-14T00:40:14Z"
+    mac: ENC[AES256_GCM,data:ZX/9UrVCQOPDMFLnLW8pvije38MZrQkRJe7pDwAKvJHGbG6rIY2ia62S8z5lvyK07Caz6sZeYqTesTQftbtnXw6wLa24EVOT7JzEWvH2lmwW0LuqoCPfuNJA7LtHO2BFtGu8n9IA4au3c5ytUXgDQwUrot57l8IVXI8oAUOncsA=,iv:hVCVf6y0yaKW0p2/FF27Wi53xYtHidaCjF1Hdwx3ToU=,tag:zL8U+Ns1HUwoPa0JGNSJvQ==,type:str]
     pgp:
-        - created_at: "2022-01-14T00:28:26Z"
+        - created_at: "2022-01-14T00:40:13Z"
           enc: |
             -----BEGIN PGP MESSAGE-----
 
-            hQIMA4SX7nk+q+zPAQ/5AdqdpaOussjQ3xbKVuEWRanMeFDZHSjdkOxInf7x2NMY
-            dmxRW/fWmUqmIkwT6oFW1166o9ZUWjUYMRiseXwVFfl6Erl6d2P06n/pAmWKIbzY
-            5tmv4NS+HnGoqD1y98QfiIEonQ4LgNg1V0B14R1C3Ct2bAvXpEkOeGV3N5o0EF6Y
-            YUYK22G98G5Br1vaXJ9Jmn6yAzDUZQmtA/qC5gUNPLVvJAncjegGofarNVovJwRR
-            LjmRnOPTGbQLoJDS35KfOf8cU9Hp3QWwUTyLgEbggROhfLO5UpVozOLj10M597qd
-            MI2HqPkJiPg2PMnSf+8Qw9oCTUyV2+saXK/OmQxHDQeHQBROqJtLUnMRfDdHDkNs
-            pCyvcH66jJBHC5e8bB5bDlKMZnXf4cqubBVRj+vdhkPmYuIWRF5DATMe4pTvuGuL
-            3CgN4sf0fdUg/Q/El5vSCCqG+cRMtjWbawLGD1YtZEx8XCHERNl9SL8I4ChcFo9N
-            TE5s5BzJBuScsKEEW6UPhSSGB4vENQ6sUD1LmhT2sKBh0/0+43L/B6ujG1BJWTPN
-            QYGbbNjqgsg4bLE4aKn5UZp1dtC2uVAAkeRiMPn6PUelxwZW4Ei9S+D5jZZxE4ZP
-            pT/DZQBAmtdJbKc03eci325IblWKIWRpRhuNE5Mz2+/GYpNM/cy2wcPcX2NSoK7S
-            XgGI/ei/LChXeo/J5rfX7ut/FAXQh5G9bBVeAaVXMITc6KXepLiBTAloIFNMzF+E
-            g5GqN+yoh6bwd0nmCf5fSIDokVVKn/ozbDtgPle1RjIU0evFga4061XC2mOgilc=
-            =WPoJ
+            hQIMA4SX7nk+q+zPARAAkyNxl2zM7Rhp22+bjyD+3gG7u/8XJfrhIkFFXkGANwgb
+            NV1hz37wAHx+8TAgGuetTVE9EP63M1j+UUkfF8phCD2NU0Ck0etT8ZJK0HHEdPAY
+            6G+peFwuRUS3RYM8/gETMPgLVGvKTH9aDLnTAMBC7Zdc0ifB89Qxo9+c2fq4LYOZ
+            imTcHx0oTAHFSUdsti7dLNhJFt1WakvLJuinfMrLFZ+guwMmX367vYcyucYeAbno
+            a4qwi3Tr88p4sYSzJDUIu3qcELSgmOxzgTCLhtAxw3hmg90V8Urhp4N5xtAfwvER
+            RbGoDoMQUVb3mAXSzSaM7Cqj1I/eYmgdtnufQX8OOA5HTXw9hAy1yzADalpiYOCY
+            xmwOaBnb5SKiAYG2aopr1e6zfvLKephl11yLITZhrjPxmtn23ru//JlEkECFEMaN
+            eEUdHaQpWqwj2ywECIyFx2knBTfYCnuZb4Bq9b1+xoZMC4kLvIAsVsDsuYNVAj8D
+            JlZOWuyPmVjRcUT5SewBZOZAJEcNJf0USgxlY30SjM12J1da2MmT0ydZkyC+7lnO
+            PX07azxTLllAE5aVHtn19wrhP/qwGqKXxCfI3iHX2/nY+6sq47y9f6aZAe/pIlY5
+            zwJvvt2FtIwPhsbsExFqC9CG+MSCi4Y5LozvEyNrN1ZYQkoPT5Oi4Nhz1tvLMEfS
+            XgGaGVb+ISLps5QYydqTmm/3rdel740UOQ3mp3Uy9da5UlOtZsAFAzZYp0hQoWxT
+            sVgyJM2PGcI+CjvfUBq9cJfXwBAtDu0+T+aKOMyS6Qvt120Kb+6CeYBXssxyqJc=
+            =OZ/k
             -----END PGP MESSAGE-----
           fp: A4B4A47A1DB07DE00E8158BE411E23534CA8FAE0
-    encrypted_regex: ^(bmcPassword|hashedPassword)$
+    encrypted_regex: ^(bmcPassword|decryptionSecret|hashedPassword|emcoPassword|rootPassword)$
     version: 3.7.1
diff --git a/deploy/site/vm/vm.sh b/deploy/site/vm/vm.sh
index 20cae73..b35784d 100755 (executable)
--- a/deploy/site/vm/vm.sh
+++ b/deploy/site/vm/vm.sh
@@ -24,7 +24,7 @@ function build_source {
     # attempting to encrypt it twice below
     if [[ -f ${FLUX_SOPS_PRIVATE_KEY} ]]; then
        gpg --import ${FLUX_SOPS_PRIVATE_KEY}
-       sops_decrypt_site ${SCRIPTDIR}/site.yaml
+       sops_decrypt ${SCRIPTDIR}/site.yaml
     fi
 
     # Generate user password and authorized key in site YAML
@@ -39,7 +39,7 @@ function build_source {
 
     # Encrypt the site YAML
     create_gpg_key ${FLUX_SOPS_KEY_NAME}
-    sops_encrypt_site ${SCRIPTDIR}/site.yaml ${FLUX_SOPS_KEY_NAME}
+    sops_encrypt ${SCRIPTDIR}/site.yaml ${FLUX_SOPS_KEY_NAME}
 
     # ONLY FOR TEST ENVIRONMENT: save the private key used
     export_gpg_private_key ${FLUX_SOPS_KEY_NAME} >${FLUX_SOPS_PRIVATE_KEY}