From 304d785a61fdfc0ab2b92021f36c65372c74e3d5 Mon Sep 17 00:00:00 2001 From: Csaky Date: Wed, 27 Nov 2024 16:06:57 -0800 Subject: [PATCH] more changes to pvc size after stack upgrade --- .github/environments/values.prod.yaml | 4 ++-- .github/environments/values.test.yaml | 4 ++-- charts/ches/Chart.yaml | 4 ++-- charts/ches/README.md | 8 ++++---- charts/ches/templates/networkpolicy.yaml | 5 +---- charts/ches/values.yaml | 4 ++-- charts/postgres/Chart.yaml | 2 +- charts/postgres/README.md | 2 +- .../templates/postgres-bootstrap-sql-configmap.yaml | 2 ++ 9 files changed, 17 insertions(+), 18 deletions(-) diff --git a/.github/environments/values.prod.yaml b/.github/environments/values.prod.yaml index 679901b..db1ce73 100644 --- a/.github/environments/values.prod.yaml +++ b/.github/environments/values.prod.yaml @@ -159,7 +159,7 @@ redis: persistence: enabled: true accessMode: ReadWriteOnce - size: 250Mi + size: 25Mi resources: limits: cpu: 50m @@ -177,7 +177,7 @@ redis: persistence: enabled: true accessMode: ReadWriteOnce - size: 250Mi + size: 25Mi storageClass: netapp-block-standard persistentVolumeClaimRetentionPolicy: enabled: true diff --git a/.github/environments/values.test.yaml b/.github/environments/values.test.yaml index 65b6f83..fb5fa29 100644 --- a/.github/environments/values.test.yaml +++ b/.github/environments/values.test.yaml @@ -149,7 +149,7 @@ redis: persistence: enabled: true accessMode: ReadWriteOnce - size: 250Mi + size: 25Mi resources: limits: cpu: 50m @@ -167,7 +167,7 @@ redis: persistence: enabled: true accessMode: ReadWriteOnce - size: 250Mi + size: 25Mi storageClass: netapp-block-standard persistentVolumeClaimRetentionPolicy: enabled: true diff --git a/charts/ches/Chart.yaml b/charts/ches/Chart.yaml index eb13dca..14d469a 100644 --- a/charts/ches/Chart.yaml +++ b/charts/ches/Chart.yaml @@ -3,7 +3,7 @@ name: common-hosted-email-service # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.4 +version: 1.0.5 kubeVersion: ">= 1.13.0" description: A microservice for managing access control to S3 Objects # A chart can be either an 'application' or a 'library' chart. @@ -28,7 +28,7 @@ sources: - https://github.com/bcgov/common-hosted-email-service dependencies: - name: postgrescluster - version: 2.0.1 + version: 2.0.2 repository: "file://../postgres" condition: postgres.enabled alias: postgres diff --git a/charts/ches/README.md b/charts/ches/README.md index a347d90..d97d4a8 100644 --- a/charts/ches/README.md +++ b/charts/ches/README.md @@ -1,6 +1,6 @@ # common-hosted-email-service -![Version: 1.0.4](https://img.shields.io/badge/Version-1.0.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.8.0](https://img.shields.io/badge/AppVersion-0.8.0-informational?style=flat-square) +![Version: 1.0.5](https://img.shields.io/badge/Version-1.0.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.8.0](https://img.shields.io/badge/AppVersion-0.8.0-informational?style=flat-square) A microservice for managing access control to S3 Objects @@ -22,7 +22,7 @@ Kubernetes: `>= 1.13.0` | Repository | Name | Version | |------------|------|---------| -| file://../postgres | postgres(postgrescluster) | 2.0.1 | +| file://../postgres | postgres(postgrescluster) | 2.0.2 | | https://charts.bitnami.com/bitnami | redis(redis) | 20.0.3 | ## Values @@ -99,7 +99,7 @@ Kubernetes: `>= 1.13.0` | redis.image.registry | string | `"artifacts.developer.gov.bc.ca/docker-remote"` | | | redis.replica.persistence.accessMode | string | `"ReadWriteOnce"` | | | redis.replica.persistence.enabled | bool | `true` | | -| redis.replica.persistence.size | string | `"250Mi"` | | +| redis.replica.persistence.size | string | `"25Mi"` | | | redis.replica.persistentVolumeClaimRetentionPolicy.enabled | bool | `true` | | | redis.replica.persistentVolumeClaimRetentionPolicy.whenDeleted | string | `"Delete"` | | | redis.replica.replicaCount | int | `2` | | @@ -113,7 +113,7 @@ Kubernetes: `>= 1.13.0` | redis.sentinel.image.registry | string | `"artifacts.developer.gov.bc.ca/docker-remote"` | | | redis.sentinel.persistence.accessMode | string | `"ReadWriteOnce"` | | | redis.sentinel.persistence.enabled | bool | `true` | | -| redis.sentinel.persistence.size | string | `"250Mi"` | | +| redis.sentinel.persistence.size | string | `"25Mi"` | | | redis.sentinel.persistence.storageClass | string | `"netapp-block-standard"` | | | redis.sentinel.persistentVolumeClaimRetentionPolicy.enabled | bool | `true` | | | redis.sentinel.persistentVolumeClaimRetentionPolicy.whenDeleted | string | `"Delete"` | | diff --git a/charts/ches/templates/networkpolicy.yaml b/charts/ches/templates/networkpolicy.yaml index 152938e..a4f8d01 100644 --- a/charts/ches/templates/networkpolicy.yaml +++ b/charts/ches/templates/networkpolicy.yaml @@ -116,10 +116,7 @@ kind: NetworkPolicy metadata: name: metabase-b160aa-tools-to-postgres spec: - podSelector: - matchLabels: - postgres-operator.crunchydata.com/cluster: postgres-master - postgres-operator.crunchydata.com/role: replica + podSelector: {} ingress: - ports: - protocol: TCP diff --git a/charts/ches/values.yaml b/charts/ches/values.yaml index c1c1158..52200c5 100644 --- a/charts/ches/values.yaml +++ b/charts/ches/values.yaml @@ -158,7 +158,7 @@ redis: persistence: enabled: true accessMode: ReadWriteOnce - size: 250Mi + size: 25Mi resources: limits: cpu: 50m @@ -176,7 +176,7 @@ redis: persistence: enabled: true accessMode: ReadWriteOnce - size: 250Mi + size: 25Mi storageClass: netapp-block-standard persistentVolumeClaimRetentionPolicy: enabled: true diff --git a/charts/postgres/Chart.yaml b/charts/postgres/Chart.yaml index 3892b55..0f51590 100644 --- a/charts/postgres/Chart.yaml +++ b/charts/postgres/Chart.yaml @@ -3,6 +3,6 @@ name: postgrescluster description: A Helm chart for Kubernetes type: application # postgrescluster Helm Chart version -version: 2.0.1 +version: 2.0.2 # PostgresCluster CRD version appVersion: 5.5.1 diff --git a/charts/postgres/README.md b/charts/postgres/README.md index 2ba76f8..69f1a73 100644 --- a/charts/postgres/README.md +++ b/charts/postgres/README.md @@ -1,6 +1,6 @@ # postgrescluster -![Version: 2.0.1](https://img.shields.io/badge/Version-2.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5.5.1](https://img.shields.io/badge/AppVersion-5.5.1-informational?style=flat-square) +![Version: 2.0.2](https://img.shields.io/badge/Version-2.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5.5.1](https://img.shields.io/badge/AppVersion-5.5.1-informational?style=flat-square) A Helm chart for Kubernetes diff --git a/charts/postgres/templates/postgres-bootstrap-sql-configmap.yaml b/charts/postgres/templates/postgres-bootstrap-sql-configmap.yaml index e2fbcc5..44f99ba 100644 --- a/charts/postgres/templates/postgres-bootstrap-sql-configmap.yaml +++ b/charts/postgres/templates/postgres-bootstrap-sql-configmap.yaml @@ -6,6 +6,8 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ .Values.databaseInitSQL.name }} + annotations: + "helm.sh/resource-policy": keep data: bootstrap.sql: {{ toYaml .Values.databaseInitSQL.sql | indent 2 }}