From 9e2e5634e2d4ee8bfe44d0f194af7ceb5170a811 Mon Sep 17 00:00:00 2001 From: Dan Manners Date: Sat, 16 Sep 2023 01:30:13 -0400 Subject: [PATCH] Fixing things --- .../database/secrets/git-cluster-secret.yaml | 36 +++++++++--------- .../database/secrets/gitea-db-creds.yaml | 38 +++++++++---------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/manifests/workloads/gitea/database/secrets/git-cluster-secret.yaml b/manifests/workloads/gitea/database/secrets/git-cluster-secret.yaml index bf030dcf..afa63b75 100644 --- a/manifests/workloads/gitea/database/secrets/git-cluster-secret.yaml +++ b/manifests/workloads/gitea/database/secrets/git-cluster-secret.yaml @@ -2,23 +2,23 @@ apiVersion: v1 kind: Secret type: kubernetes.io/basic-auth metadata: - name: gitdb-superuser - namespace: git + name: gitdb-superuser + namespace: git stringData: - username: ENC[AES256_GCM,data:+sZ1lyhy1NkOaVdrsQ==,iv:ng8oh/iygXgogNe7I0hjycdS4m6qEJOR1q362tzL7Kc=,tag:SOXZEJHm9T+c33AQUZiaSA==,type:str] - password: ENC[AES256_GCM,data:EmbjV4cBJG1zRklQkiNSs+EgKyby+Kk/AGwz+MGtqg==,iv:tczYLQVGd+sBtgmpeAlXPdnDCiAFMdMS5ifJkoiiQxQ=,tag:Oc2AfsJoKQcadUbhgnz9LA==,type:str] + username: ENC[AES256_GCM,data:Kprkwb0NqII=,iv:WdxunJ6DChHPtCvHN9jYHkbxLKK1J7GIofRbXuNGIKQ=,tag:oh42apXCUGo7l7DCEd8kUw==,type:str] + password: ENC[AES256_GCM,data:EmbjV4cBJG1zRklQkiNSs+EgKyby+Kk/AGwz+MGtqg==,iv:tczYLQVGd+sBtgmpeAlXPdnDCiAFMdMS5ifJkoiiQxQ=,tag:Oc2AfsJoKQcadUbhgnz9LA==,type:str] sops: - kms: - - arn: arn:aws:kms:us-east-1:977656673179:key/7e829b85-6fed-4598-b675-8ebeea105c4c - created_at: "2023-09-16T03:07:12Z" - enc: AQICAHi1XYvA3EFEGTwFyd0NLI4cRLiZ3o2bNcK2AmDuVl/CEwFa+mz8yZWoqLmPzfKyNQIcAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMDSdGBT/V9XqvarMbAgEQgDtaHYAQwGWb5zZCdeDjAhRQywNCQlPG/6npSHBm3VO+GAVcM7H53OgBkXvHT1DvekKvLdFTlEzsw28ZvA== - aws_profile: default - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: [] - lastmodified: "2023-09-16T03:07:13Z" - mac: ENC[AES256_GCM,data:lZP0ztdO8Eo4maEO1Oa9jEwTXDIQM4cTaRcut+d3jCfR0KmvJfr0U7ziJylvE79xnb2LtZAlc9guPliJQVluTsA3iJOqUVm3BQkNCD5lNfeE9VFhhwT2d1NzZINCMcOmtTf6HmY1pLbGYQB2mzk9BlLhskSP3rGQqGkjf67g3ek=,iv:mirypfB16oBhhlBAolat+rp/JK0tCNHJlt5r08yQPjQ=,tag:DnsJorVRcCtnh6/aYJcGgQ==,type:str] - pgp: [] - encrypted_regex: ^(data|stringData)$ - version: 3.7.3 + kms: + - arn: arn:aws:kms:us-east-1:977656673179:key/7e829b85-6fed-4598-b675-8ebeea105c4c + created_at: "2023-09-16T03:07:12Z" + enc: AQICAHi1XYvA3EFEGTwFyd0NLI4cRLiZ3o2bNcK2AmDuVl/CEwFa+mz8yZWoqLmPzfKyNQIcAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMDSdGBT/V9XqvarMbAgEQgDtaHYAQwGWb5zZCdeDjAhRQywNCQlPG/6npSHBm3VO+GAVcM7H53OgBkXvHT1DvekKvLdFTlEzsw28ZvA== + aws_profile: default + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: [] + lastmodified: "2023-09-16T05:30:07Z" + mac: ENC[AES256_GCM,data:y1HfkqEOKeKC9qhKRWp5VDEW7zB6/QKhZePC7HYlOyYnjPgSn7k+dVayMiVYa70hFholohWC89HSQgz7OF7Qf8cJiUu57iEcnJtvtQqCwTcjMcVgj5jJS9WKi79zrp09tbXAfC27x6Y3PqMOvUG9edENplH9MtFcEo7hTGaDMcs=,iv:VnXV/kI5b0WQCKkMpqly6ryft/pIP3i37ChtDlWyn/g=,tag:wmJu7RucGiynakA/OPX9Vw==,type:str] + pgp: [] + encrypted_regex: ^(data|stringData)$ + version: 3.7.3 diff --git a/manifests/workloads/gitea/database/secrets/gitea-db-creds.yaml b/manifests/workloads/gitea/database/secrets/gitea-db-creds.yaml index c27b1f43..53900b79 100644 --- a/manifests/workloads/gitea/database/secrets/gitea-db-creds.yaml +++ b/manifests/workloads/gitea/database/secrets/gitea-db-creds.yaml @@ -2,24 +2,24 @@ apiVersion: v1 kind: Secret type: Opaque metadata: - name: gitdb-user-creds - namespace: git + name: gitdb-user-creds + namespace: git stringData: - POSTGRES_HOST: ENC[AES256_GCM,data:CPyxcEZuqzZgVrrXo/KogTMcoKQIcQy0Wrl7kkWq,iv:AbldU5hn+fLD0h6P79M3qOFym/jivb01aP/crXB+bf4=,tag:BZ4eqLPfTqdPOZVP+e1EBQ==,type:str] - GITEA_DB_USERNAME: ENC[AES256_GCM,data:wZoHO9zLqK8x+w==,iv:EehSIcA4Bq+qI+xZWfd29x8fKDbc9GpXt7PbTLPQUAs=,tag:9PgUydzDoP6uK+ZRRXWOBg==,type:str] - GITEA_DB_PASSWORD: ENC[AES256_GCM,data:6D08uwJWDi8xsIs/JpiLQfqzqUuPmK9bUSI5KpQ=,iv:S674LrV/lZEPdYDIBtWVNfQjxYhBCjbvF6tSHkc6cXo=,tag:exOE1AoQawv0DDBMI6oYEw==,type:str] + POSTGRES_HOST: ENC[AES256_GCM,data:CPyxcEZuqzZgVrrXo/KogTMcoKQIcQy0Wrl7kkWq,iv:AbldU5hn+fLD0h6P79M3qOFym/jivb01aP/crXB+bf4=,tag:BZ4eqLPfTqdPOZVP+e1EBQ==,type:str] + GITEA_DB_USERNAME: ENC[AES256_GCM,data:wZoHO9zLqK8x+w==,iv:EehSIcA4Bq+qI+xZWfd29x8fKDbc9GpXt7PbTLPQUAs=,tag:9PgUydzDoP6uK+ZRRXWOBg==,type:str] + GITEA_DB_PASSWORD: ENC[AES256_GCM,data:6D08uwJWDi8xsIs/JpiLQfqzqUuPmK9bUSI5KpQ=,iv:S674LrV/lZEPdYDIBtWVNfQjxYhBCjbvF6tSHkc6cXo=,tag:exOE1AoQawv0DDBMI6oYEw==,type:str] sops: - kms: - - arn: arn:aws:kms:us-east-1:977656673179:key/7e829b85-6fed-4598-b675-8ebeea105c4c - created_at: "2023-09-16T04:55:28Z" - enc: AQICAHi1XYvA3EFEGTwFyd0NLI4cRLiZ3o2bNcK2AmDuVl/CEwGSbXgz9LlZEKpkV7IkLX+8AAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMeUbM23bn/cQujNwUAgEQgDsoYWSL4Oy20YYzYiC5wGCUV4UzqJxSXxYQu9XO1+QU6PMM1CiI+t+r44+SA8tJbpPSCy5+IwljIVxyiA== - aws_profile: default - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: [] - lastmodified: "2023-09-16T05:19:24Z" - mac: ENC[AES256_GCM,data:AHcckk2lknrqKwSt1UgH1zMqfRZ3/VPWpm6b5rOkK0nUHjwUTNt9EjehZOS9IWpoqi4akQLEijqFk4mRAhkraMVwbPlYfIdE33yaBAQ/UhvsI3iiw1hPxem/CTTDE6P9TDnvJ48549BkvrmriGPsHG8wiso0j7LRw/ExKQYuLnM=,iv:lME/WGVkzL/94FgWybHwxZJrjXe0TAs8Izowcf68vtQ=,tag:MEp3HAoEfEgD6N1zx7Gdfw==,type:str] - pgp: [] - encrypted_regex: ^(data|stringData)$ - version: 3.7.3 + kms: + - arn: arn:aws:kms:us-east-1:977656673179:key/7e829b85-6fed-4598-b675-8ebeea105c4c + created_at: "2023-09-16T04:55:28Z" + enc: AQICAHi1XYvA3EFEGTwFyd0NLI4cRLiZ3o2bNcK2AmDuVl/CEwGSbXgz9LlZEKpkV7IkLX+8AAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMeUbM23bn/cQujNwUAgEQgDsoYWSL4Oy20YYzYiC5wGCUV4UzqJxSXxYQu9XO1+QU6PMM1CiI+t+r44+SA8tJbpPSCy5+IwljIVxyiA== + aws_profile: default + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: [] + lastmodified: "2023-09-16T05:19:24Z" + mac: ENC[AES256_GCM,data:AHcckk2lknrqKwSt1UgH1zMqfRZ3/VPWpm6b5rOkK0nUHjwUTNt9EjehZOS9IWpoqi4akQLEijqFk4mRAhkraMVwbPlYfIdE33yaBAQ/UhvsI3iiw1hPxem/CTTDE6P9TDnvJ48549BkvrmriGPsHG8wiso0j7LRw/ExKQYuLnM=,iv:lME/WGVkzL/94FgWybHwxZJrjXe0TAs8Izowcf68vtQ=,tag:MEp3HAoEfEgD6N1zx7Gdfw==,type:str] + pgp: [] + encrypted_regex: ^(data|stringData)$ + version: 3.7.3