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/charts/gitops-getting-started/Chart.yaml b/charts/gitops-getting-started/Chart.yaml index a15a7e26f552d7ae12eee1de43ee5622c18e9ed2..f78a6ac44db70cef7791ed9e7ed3c30c8f381d42 100644 --- a/charts/gitops-getting-started/Chart.yaml +++ b/charts/gitops-getting-started/Chart.yaml @@ -4,8 +4,8 @@ name: gitops-getting-started version: 0.1.0 dependencies: - name: wordpress - version: ~8.1.1 - repository: https://kubernetes-charts.storage.googleapis.com + version: ~9.3.3 + repository: https://charts.bitnami.com/bitnami maintainers: - name: Ricardo Rocha email: ricardo.rocha@cern.ch diff --git a/charts/gitops-getting-started/values.yaml b/charts/gitops-getting-started/values.yaml index 77936f2be50012cfb673b8591049d1d33f97eb17..e7003d84533754d5abcf3e74f3754615c1800616 100644 --- a/charts/gitops-getting-started/values.yaml +++ b/charts/gitops-getting-started/values.yaml @@ -6,7 +6,12 @@ wordpress: persistence: enabled: false service: - type: "NodePort" + type: "LoadBalancer" + port: 80 + annotations: + loadbalancer.openstack.org/network-id: "798d00f3-2af9-48a0-a7c3-a26d909a2d64" + service.beta.kubernetes.io/openstack-internal-load-balancer: "true" + loadbalancer.openstack.org/cascade-delete: "false" mariadb: enabled: true diff --git a/helm-operator-values.yaml b/helm-operator-values.yaml index 252e17a7636e6a68c8d7f62c2482dec0e839a3fa..bd008a7ed4039db5552c983790ba8b283abbbe50 100644 --- a/helm-operator-values.yaml +++ b/helm-operator-values.yaml @@ -1,21 +1,14 @@ chartsSyncInterval: 1m -configureRepositories: - enable: true - repositories: - - name: stable - url: https://kubernetes-charts.storage.googleapis.com - - name: cern - url: https://registry.cern.ch/chartrepo/cern rbac: create: true git: - pollInterval: 5m + pollInterval: 1m 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..bfbfa437fca93fb66492f28112c447f4e1df6d89 100644 --- a/releases/prod/values.yaml +++ b/releases/prod/values.yaml @@ -8,32 +8,30 @@ metadata: spec: releaseName: gitops-getting-started-prod chart: - git: https://gitlab.cern.ch/helm/releases/gitops-getting-started.git + git: https://gitlab.cern.ch/rbritoda/gitops-getting-started.git path: charts/gitops-getting-started - ref: helm3 + ref: master values: wordpress: - service: - nodePorts: - http: "32700" + wordpressBlogName: Blog Production 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-19T13:25:56Z' + mac: ENC[AES256_GCM,data:7RDsdYTNB91zPVwP6HZrbYXExcbfTlq1cO/2iZkOSdJNE13fAUG21HqkJ9uY0q/r3Ue9vSRkHoZ2Jgi3nZ4GA04ou9jeJvJ+MNabY0dHXOGzyCoZKBJJHb2PYWyLY8OIACjRr254cuybAPif+4bg/PIRlUAbuK4SGLS2ni7bY2k=,iv:Gn0oXpmt2MJI5qZd/Pkb9I+Q0609ueQWf1ZnZ8PWcek=,tag:tVlz91ifmCEMMAPtMyfqhg==,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..83c95468365601990ba47e7762282b917a01d101 100644 --- a/releases/stg/values.yaml +++ b/releases/stg/values.yaml @@ -8,32 +8,30 @@ metadata: spec: releaseName: gitops-getting-started-stg chart: - git: https://gitlab.cern.ch/helm/releases/gitops-getting-started.git + git: https://gitlab.cern.ch/rbritoda/gitops-getting-started.git path: charts/gitops-getting-started - ref: helm3 + ref: master values: wordpress: - service: - nodePorts: - http: "32701" + wordpressBlogName: Blog Staging 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-19T13:26:23Z' + mac: ENC[AES256_GCM,data:hoXBnLaTCJdclHv2Iv8hyrnPjlFdOJ5ynUz9Wl7RoL94IZMT/YUeb1dguo2sWdECQhIs+VBtY7fT6fO/P0PZs5acOsqUtWt0EFbnlwK/UHD4MOV6SJkbFQYuTYwqTlRYzhbuQY3613Wz+1pSzA9vtjpNIi5Rs227LRpT207Hxs0=,iv:CECNWReTfpikC/WIuPFynJIOjzPAWRcotTecfBWd/6Q=,tag:fpVMNlQOSnppL6InK3Fw4A==,type:str] pgp: [] - encrypted_regex: ^(password)$ + encrypted_regex: ^(password)|(.*key)$ version: 3.5.0