diff --git a/.sops.yaml b/.sops.yaml index 30e4bac75eafe5d15b2734c89d017fb627766944..081ba18f1346665acb4f342807f8c8257a1689a5 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -1,3 +1,3 @@ creation_rules: - encrypted_regex: '^(password)|(.*key)$' - barbican_secret_href: "https://openstack.cern.ch:9311/v1/secrets/44270a95-0589-4853-bd7a-c7aaa51be101" + barbican_secret_href: "https://openstack.cern.ch:9311/v1/secrets/7c51e3d9-ef84-429d-8dd2-518903cf6962" diff --git a/helm-operator-values.yaml b/helm-operator-values.yaml index 252e17a7636e6a68c8d7f62c2482dec0e839a3fa..f61cf2641cf37292fe2cbc3aa3a2bacac16c2128 100644 --- a/helm-operator-values.yaml +++ b/helm-operator-values.yaml @@ -13,9 +13,9 @@ git: helm: versions: v3 prometheus: - enabled: true + enabled: false serviceMonitor: - create: true + create: false additionalLabels: release: prometheus-operator rbac: diff --git a/releases/prod/values.yaml b/releases/prod/values.yaml index 0719ed3e18a19878ec373f96cc68353e12b85da5..697bf8f0e245d964c55538df512391664677d5e4 100644 --- a/releases/prod/values.yaml +++ b/releases/prod/values.yaml @@ -18,22 +18,22 @@ spec: http: "32700" mariadb: db: - password: ENC[AES256_GCM,data:Eb8P039e,iv:U3Wm071CkxtbYI1emL8vY/CLGUOTj1UEFPrRLNVAAwU=,tag:ov+yNdrgaRkNEUmc6TNaFA==,type:str] + password: ENC[AES256_GCM,data:lZlFLjJn,iv:11pB5EUj6QVOjCBIFi2HqCfChEwmXDWlfcWBDz9cQk4=,tag:Rq25GBurmamQxI/uDFX7rg==,type:str] image: tag: 10.3.21 rootUser: - password: ENC[AES256_GCM,data:aDkNe1Mp,iv:nHbHEEJOBd5X4mzJpD+KfSfKrLk09wBFBrlpmNXe/Js=,tag:H18U9Kd8nQdRzAvZaFusXA==,type:str] + password: ENC[AES256_GCM,data:nGkHWUuC,iv:BM9H2tfvTGAo9+vVRUxUb3RWRYkIDYCblys3bkhnRk8=,tag:fJ+z5X92p8WQ4cglFGqH4w==,type:str] sops: kms: [] gcp_kms: [] azure_kv: [] hc_vault: [] barbican: - - secret_href: https://openstack.cern.ch:9311/v1/secrets/44270a95-0589-4853-bd7a-c7aaa51be101 - created_at: '2020-06-16T21:03:16Z' - enc: 7477IcFTrV5LuIhqJJadIGge3txOs6um6g0WLFJlMkLWDByTm5rcOXa6lGQLhBKD - lastmodified: '2020-06-16T21:03:35Z' - mac: ENC[AES256_GCM,data:63G5b9dUsviZFxezspl15yVdrw4EiyYPE0wrqB3kUO5AbPZqhK2EuLdYLs5GYJtqg1U1juBm6uEq4z1AwRzss0xi09tUjDsb9GgHG1YMiYtSdyk5WrHb+bxvtLp9ZT3ThDgAaLbaUttIQCB7rDmMo5WkVORUYjCtiq09OHGTF6s=,iv:ccbkHyngiVDcMiK78/X1mj+5Vt7NSnwoTZZP/XE5SCU=,tag:y4GgI8kIp0PlbmPHDHmnHw==,type:str] + - secret_href: https://openstack.cern.ch:9311/v1/secrets/7c51e3d9-ef84-429d-8dd2-518903cf6962 + created_at: '2020-06-19T11:49:00Z' + enc: wefcYoIlTFBXq7miJrwZzvaDnMjEQXxP1TMCjoZewDIUtvaL8eIU9YTo/uYuW1j9 + lastmodified: '2020-06-19T11:50:51Z' + mac: ENC[AES256_GCM,data:2L36O8tZFwwjMBDiqToOlWSP0d0AY8p3J2me848+WeuiENZwLS7UfwCFbxxCg38dlv6oabKHau6oezpzPNIZJhWDX1+ahRbjB3XtJdt301vi4ybeoQrzjBNPVqZNYD1nt+5/hEU5dintjlovQBGeB05oYS+Nb2OZY7Gov/zzuCI=,iv:DIVDinNaaQqT7c0w87GsKEmaczo73vPAltYdb/HBDo8=,tag:HqYZNfjOb8oAWMyyzq0HGA==,type:str] pgp: [] encrypted_regex: ^(password)|(.*key)$ version: 3.5.0 diff --git a/releases/stg/values.yaml b/releases/stg/values.yaml index 346e3fb3332451e95fd5a94bf17cc6d5391b5f28..c3ae07a43d57263ca12d7f30a453bb60c653b83d 100644 --- a/releases/stg/values.yaml +++ b/releases/stg/values.yaml @@ -2,11 +2,11 @@ apiVersion: helm.fluxcd.io/v1 kind: HelmRelease metadata: name: gitops-getting-started - namespace: stg + namespace: prod annotations: fluxcd.io/automated: "true" spec: - releaseName: gitops-getting-started-stg + releaseName: gitops-getting-started-prod chart: git: https://gitlab.cern.ch/helm/releases/gitops-getting-started.git path: charts/gitops-getting-started @@ -15,25 +15,25 @@ spec: wordpress: service: nodePorts: - http: "32701" + http: "32700" mariadb: db: - password: ENC[AES256_GCM,data:HVXBIzqj,iv:O/CiU4KiRxDLzhCEM8j5U9OjOIGg+JirbpVTm7InN9E=,tag:fFCImjhEOzql+3vZLONXog==,type:str] + password: ENC[AES256_GCM,data:s1ic5mBp,iv:BfDjevh9WZmR3MonZixb0OlShHpcKahfDx2X2YpVJDk=,tag:8suoCrVugzHEOYqzJ1WDsA==,type:str] image: tag: 10.3.21 rootUser: - password: ENC[AES256_GCM,data:JjPRbqb/,iv:1dxjc0SApAs10XmAWR6VleITkZl1BlhvsLUWS9hvlt4=,tag:nG5YIrFSt0KhfHR8BVBFsA==,type:str] + password: ENC[AES256_GCM,data:fdinDkJ9,iv:OON0zzB8r5nvZ8oFPxXn+mCZDGGOL3T3rUSacNBqcMo=,tag:SaZLjUzTQtIem8PmpyBi4A==,type:str] sops: kms: [] gcp_kms: [] azure_kv: [] hc_vault: [] barbican: - - secret_href: https://openstack.cern.ch:9311/v1/secrets/44270a95-0589-4853-bd7a-c7aaa51be101 - created_at: '2020-06-16T20:09:35Z' - enc: xpNcKbW4Ad5MNafkwxVRjRn2vXyeab0TnrDdb6yKU1fbMzbrdXPK8lhmovfGk8ng - lastmodified: '2020-06-16T20:10:09Z' - mac: ENC[AES256_GCM,data:9/19HdMWyNTmhXWRF68UGWeUAD+ykSFpnxEH+Jg1FWPD4DBIU5PvmHqV2nW5VRlOyHVAydIdoF4FkVzTA6h9CApu5BGAYWTi1rz7Iey5Wan82+ek1IsnDz6itEc2x44+OFzZDCAxfmajwaSIXv9ehBhRKBsAGsA6/Kj10TPlytk=,iv:voAC3rjBtek6mRSmchH+tQY771DP5jsJ3UY/ryuQXF8=,tag:dCuukYTOb7I5hdGrXxkOyg==,type:str] + - secret_href: https://openstack.cern.ch:9311/v1/secrets/7c51e3d9-ef84-429d-8dd2-518903cf6962 + created_at: '2020-06-19T11:51:56Z' + enc: WQ7X3lGgqaICUTPACNHvgrR33hr4pvrSwyjQRFAcK+hjMV2y+Cd5P5gWeLE2b5lw + lastmodified: '2020-06-19T11:52:03Z' + mac: ENC[AES256_GCM,data:QnZz/zMzslle3A+ZDO5FkRfB4NeCU7WRxX02RNMJIOeaVilfbmHGqZwlWjireXw7vydxzQbczyj/fwFdPkz1baUjfj0guVWA576KTLxJfcXvdjajVdeDF2xU+S6voWFrCYuBAcCwbVjuLeuqF1siASOF1y3r0dJI4YhOgrjZlA4=,iv:l6vF+4p+2ppu6Nw9xKQzTN5eSRKhiaTnKPsq89rTiRo=,tag:BKeZKmV6OlJofZtfPpw2KA==,type:str] pgp: [] - encrypted_regex: ^(password)$ + encrypted_regex: ^(password)|(.*key)$ version: 3.5.0