From 54925d0306da31b1b75b9c0c73235de3ef72da4f Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 23 Aug 2021 17:37:06 +1000 Subject: [PATCH 1/2] Update Calico to 3.19.2 to fix https://github.com/projectcalico/calico/issues/4518 --- stable/aws-calico/Chart.yaml | 4 ++-- stable/aws-calico/templates/pod-disruption-budget.yaml | 2 +- stable/aws-calico/values.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stable/aws-calico/Chart.yaml b/stable/aws-calico/Chart.yaml index 5f4a4d6..274cc3d 100755 --- a/stable/aws-calico/Chart.yaml +++ b/stable/aws-calico/Chart.yaml @@ -3,6 +3,6 @@ description: A Helm chart for installing Calico on AWS # Commenting `website` as it fails Yamale strict mode # website: https://docs.aws.amazon.com/eks/latest/userguide/calico.html name: aws-calico -version: 0.0.11 -appVersion: 3.15.1 +version: 0.0.12 +appVersion: 3.19.2 icon: https://www.projectcalico.org/wp-content/uploads/2019/09/Calico_Logo_Large_Calico.png diff --git a/stable/aws-calico/templates/pod-disruption-budget.yaml b/stable/aws-calico/templates/pod-disruption-budget.yaml index 8972399..701afa5 100644 --- a/stable/aws-calico/templates/pod-disruption-budget.yaml +++ b/stable/aws-calico/templates/pod-disruption-budget.yaml @@ -1,6 +1,6 @@ # This manifest creates a Pod Disruption Budget for Typha to allow K8s Cluster Autoscaler to evict {{- if .Values.calico.typha.podDisruptionBudget.enabled }} -apiVersion: policy/v1beta1 +apiVersion: policy/v1 kind: PodDisruptionBudget metadata: name: "{{ include "aws-calico.fullname" . }}-typha" diff --git a/stable/aws-calico/values.yaml b/stable/aws-calico/values.yaml index a2b939c..487927f 100755 --- a/stable/aws-calico/values.yaml +++ b/stable/aws-calico/values.yaml @@ -7,7 +7,7 @@ podSecurityPolicy: create: false calico: - tag: v3.15.5 + tag: v3.19.2 typha: logseverity: Info # Debug, Info, Warning, Error, Fatal From 1ba39bddc9d7c05c3d0f6f392d5603444afa8d0a Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 23 Aug 2021 17:40:39 +1000 Subject: [PATCH 2/2] Update k8s api version for PodDisruptionBudget --- stable/airflow/Chart.yaml | 2 +- .../templates/pgbouncer/pgbouncer-poddisruptionbudget.yaml | 2 +- .../templates/scheduler/scheduler-poddisruptionbudget.yaml | 2 +- stable/aws-calico/README.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stable/airflow/Chart.yaml b/stable/airflow/Chart.yaml index a27fbc3..8b9dc50 100644 --- a/stable/airflow/Chart.yaml +++ b/stable/airflow/Chart.yaml @@ -19,7 +19,7 @@ --- apiVersion: v1 name: airflow -version: 1.0.0-rc3 +version: 1.0.0-rc4 description: Helm chart to deploy Apache Airflow icon: https://airflow.apache.org/docs/apache-airflow/stable/_images/pin_large.png keywords: diff --git a/stable/airflow/templates/pgbouncer/pgbouncer-poddisruptionbudget.yaml b/stable/airflow/templates/pgbouncer/pgbouncer-poddisruptionbudget.yaml index 37c64c2..994cc38 100644 --- a/stable/airflow/templates/pgbouncer/pgbouncer-poddisruptionbudget.yaml +++ b/stable/airflow/templates/pgbouncer/pgbouncer-poddisruptionbudget.yaml @@ -20,7 +20,7 @@ ################################# {{- if and .Values.pgbouncer.enabled .Values.pgbouncer.podDisruptionBudget.enabled }} kind: PodDisruptionBudget -apiVersion: policy/v1beta1 +apiVersion: policy/v1 metadata: name: {{ .Release.Name }}-pgbouncer-pdb labels: diff --git a/stable/airflow/templates/scheduler/scheduler-poddisruptionbudget.yaml b/stable/airflow/templates/scheduler/scheduler-poddisruptionbudget.yaml index 967c2cf..c4eb871 100644 --- a/stable/airflow/templates/scheduler/scheduler-poddisruptionbudget.yaml +++ b/stable/airflow/templates/scheduler/scheduler-poddisruptionbudget.yaml @@ -20,7 +20,7 @@ ################################# {{- if .Values.scheduler.podDisruptionBudget.enabled }} kind: PodDisruptionBudget -apiVersion: policy/v1beta1 +apiVersion: policy/v1 metadata: name: {{ .Release.Name }}-scheduler-pdb labels: diff --git a/stable/aws-calico/README.md b/stable/aws-calico/README.md index c3555c2..2e7de75 100755 --- a/stable/aws-calico/README.md +++ b/stable/aws-calico/README.md @@ -51,7 +51,7 @@ The following table lists the configurable parameters for this chart and their d | `calico.node.nodeSelector` | Calico Node Node Selector | `{ beta.kubernetes.io/os: linux }` | | `calico.typha_autoscaler.resources` | Calico Typha Autoscaler Resources | `requests.memory: 16Mi, requests.cpu: 10m, limits.memory: 32Mi, limits.cpu: 10m` | | `calico.typha_autoscaler.nodeSelector` | Calico Typha Autoscaler Node Selector | `{ beta.kubernetes.io/os: linux }` | -| `calico.tag` | Calico version | `v3.15.5` | +| `calico.tag` | Calico version | `v3.19.2` | | `fullnameOverride` | Override the fullname of the chart | `calico` | | `podSecurityPolicy.create` | Specifies whether podSecurityPolicy and related rbac objects should be created | `false` | | `serviceAccount.name` | The name of the ServiceAccount to use | `nil` |