upgrade v2.43 and remove disableAnnotationTimestamp (#26)

hasura · Sep 30, 2024 · 64c7d1f · 64c7d1f
1 parent c13c617
commit 64c7d1f
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 40 deletions.
diff --git a/charts/graphql-data-connector/Chart.yaml b/charts/graphql-data-connector/Chart.yaml
@@ -17,8 +17,8 @@ type: application
 
 # 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.
-version: 0.6.0
+version: 0.7.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 2.41.0
+appVersion: 2.43.0
diff --git a/charts/graphql-data-connector/README.md b/charts/graphql-data-connector/README.md
@@ -6,7 +6,7 @@ This chart deploys the GraphQL Data Connector service.
 
 1. Helm (preferably v3) installed – instructions are [here](https://helm.sh/docs/intro/install/).
 2. Hasura helm repo configured.
-  
+
 ```bash
 helm repo add hasura https://hasura.github.io/helm-charts
 helm repo update
@@ -19,11 +19,12 @@ helm repo update
 ```bash
 helm install [RELEASE_NAME] hasura/graphql-data-connector
 ```
+
 See [configuration](#parameters) below.
 
 See [helm install](https://helm.sh/docs/helm/helm_install/) for command documentation.
 
-## Parameters 
+## Parameters
 
 | Name                                              | Description                                                                                                | Value                           |
 | ------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ------------------------------- |
@@ -32,7 +33,6 @@ See [helm install](https://helm.sh/docs/helm/helm_install/) for command document
 | `global.prefixOverride`                           | Override the naming prefix instead of the release name                                                     | `{{ .Release.Name }}`           |
 | `nameOverride`                                    | String to override the deployment name                                                                     | `""`                            |
 | `namespaceOverride`                               | String to override the namespace                                                                           | `""`                            |
-| `disableAnnotationTimestamp`                      | Disable the current timestamp annotation that force the pod to roll out                                    | `true`                          |
 | `labels`                                          | Add labels to the deployment resource                                                                      | `{}`                            |
 | `annotations`                                     | Add annotations to the deployment resource                                                                 | `{}`                            |
 | `command`                                         | Customize the execution command                                                                            | `[]`                            |

diff --git a/charts/graphql-data-connector/templates/deployment.yaml b/charts/graphql-data-connector/templates/deployment.yaml
@@ -29,9 +29,6 @@ spec:
   template:
     metadata:
       annotations:
-      {{- if not .Values.disableAnnotationTimestamp }}
-        deployment-timestamp: "{{ date "20060102150405" now }}"
-      {{- end }}
       {{- if .Values.annotations }}
         {{- toYaml .Values.annotations | nindent 8 }}
       {{- end }}

diff --git a/charts/graphql-engine/Chart.yaml b/charts/graphql-engine/Chart.yaml
@@ -17,11 +17,11 @@ type: application
 
 # 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.
-version: 0.6.0
+version: 0.7.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 2.41.0
+appVersion: 2.43.0
 
 dependencies:
   - name: postgres

diff --git a/charts/graphql-engine/README.md b/charts/graphql-engine/README.md
@@ -7,7 +7,7 @@ This chart deploys the GraphQL Engine service with a Postgres instance for metad
 1. Kubernetes 1.16+
 2. Helm (preferably v3) installed – instructions are [here](https://helm.sh/docs/intro/install/).
 3. Hasura helm repo configured.
-  
+
 ```bash
 helm repo add hasura https://hasura.github.io/helm-charts
 helm repo update
@@ -22,13 +22,14 @@ helm repo update
 ```bash
 helm install [RELEASE_NAME] hasura/graphql-engine
 ```
+
 See [configuration](#parameters) below.
 
 See [helm install](https://helm.sh/docs/helm/helm_install/) for command documentation.
 
 ### Configuration Examples
 
-See configuration examples [here](./examples). 
+See configuration examples [here](./examples).
 
 ### Uninstall Helm Chart
 
@@ -40,7 +41,7 @@ This removes all the Kubernetes components associated with the chart and deletes
 
 See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command documentation.
 
-## Parameters 
+## Parameters
 
 ### Global parameters
 
@@ -56,7 +57,6 @@ See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command docu
 | ------------------------------------------------- | --------------------------------------------------------------------------------------------------------- | ----------------------- |
 | `nameOverride`                                    | String to override the deployment name                                                                    | `""`                    |
 | `namespaceOverride`                               | String to override the namespace                                                                          | `""`                    |
-| `disableAnnotationTimestamp`                      | Disable the current timestamp annotation that force the pod to roll out                                   | `true`                  |
 | `labels`                                          | Add labels to the deployment resource                                                                     | `{}`                    |
 | `annotations`                                     | Add annotations to the deployment resource                                                                | `{}`                    |
 | `command`                                         | Customize the execution command                                                                           | `[]`                    |
@@ -154,7 +154,7 @@ See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command docu
 
 ### Postgres parameters
 
-See the [PostgreSQL helm chart](../postgres) for full list of parameters. 
+See the [PostgreSQL helm chart](../postgres) for full list of parameters.
 
 | Name               | Description                      | Value  |
 | ------------------ | -------------------------------- | ------ |
@@ -167,4 +167,3 @@ See the [PostgreSQL helm chart](../postgres) for full list of parameters.
 | `podMonitor.enabled`       | Enable the Prometheus PodMonitor resource. Require [Prometheus Operator](https://github.com/prometheus-operator/prometheus-operator) to be installed | `false` |
 | `podMonitor.interval`      | The monitor scrape interval                                                                                                                          | `15s`   |
 | `podMonitor.scrapeTimeout` | The monitor scrape timeout                                                                                                                           | `10s`   |
-
diff --git a/charts/graphql-engine/templates/_helpers.tpl b/charts/graphql-engine/templates/_helpers.tpl
@@ -42,7 +42,7 @@
 {{- end }}
 
 {{- define "common.secretsName" -}}
-{{- $secretName := coalesce (.Values.secret).name (.Values.secrets).name -}}
+{{- $secretName := (.Values.secret).name -}}
 {{- if $secretName -}}
   {{- print $secretName }}
 {{- else -}}

diff --git a/charts/graphql-engine/templates/secrets.yaml b/charts/graphql-engine/templates/secrets.yaml
@@ -1,7 +1,7 @@
 # This file and its contents are licensed under the Apache License 2.0.
 # Please see the included NOTICE for copyright information and LICENSE for a copy of the license.
 
-{{- with coalesce .Values.secret .Values.secrets }}
+{{- with .Values.secret }}
 {{- if or .enabled ($.Values.postgres).enabled }}
 {{ $hgeRedisUrl := tpl .redisUrl $ }}
 {{ $hgeRateLimitRedisUrl := tpl .rateLimitRedisUrl $ }}

diff --git a/charts/hasura-enterprise-stack/Chart.lock b/charts/hasura-enterprise-stack/Chart.lock
@@ -1,13 +1,13 @@
 dependencies:
 - name: graphql-engine
   repository: file://../graphql-engine
-  version: 0.6.0
+  version: 0.7.0
 - name: graphql-data-connector
   repository: file://../graphql-data-connector
-  version: 0.6.0
+  version: 0.7.0
 - name: mongo-data-connector
   repository: file://../mongo-data-connector
-  version: 0.6.0
+  version: 0.7.0
 - name: redis
   repository: oci://registry-1.docker.io/bitnamicharts
   version: 17.15.2
@@ -20,5 +20,5 @@ dependencies:
 - name: jaeger
   repository: https://jaegertracing.github.io/helm-charts
   version: 0.71.18
-digest: sha256:4b8ee7c2ce67c32fa5baee383b03f8547e81b74f1c82994a133605082ca7a84a
-generated: "2024-07-30T23:56:40.079366979+07:00"
+digest: sha256:cb356632fadad8122729fa36547f0dd87a554cf75197cedbb636cc7ec260d126
+generated: "2024-09-30T23:37:04.099500562+07:00"
diff --git a/charts/hasura-enterprise-stack/Chart.yaml b/charts/hasura-enterprise-stack/Chart.yaml
@@ -17,23 +17,23 @@ type: application
 
 # 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.
-version: 0.6.0
+version: 0.7.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 2.41.0
+appVersion: 2.43.0
 
 dependencies:
   - name: graphql-engine
-    version: 0.6.0
+    version: 0.7.0
     repository: file://../graphql-engine
     condition: graphql-engine.enabled
   - name: graphql-data-connector
-    version: 0.6.0
+    version: 0.7.0
     repository: file://../graphql-data-connector
     condition: global.connector.graphql.enabled
   - name: mongo-data-connector
-    version: 0.6.0
+    version: 0.7.0
     repository: file://../mongo-data-connector
     condition: global.connector.mongo.enabled
   - name: redis

diff --git a/charts/mongo-data-connector/Chart.yaml b/charts/mongo-data-connector/Chart.yaml
@@ -17,8 +17,8 @@ type: application
 
 # 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.
-version: 0.6.0
+version: 0.7.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 2.41.0
+appVersion: 2.43.0
diff --git a/charts/mongo-data-connector/README.md b/charts/mongo-data-connector/README.md
@@ -6,7 +6,7 @@ This chart deploys the GraphQL Data Connector service.
 
 1. Helm (preferably v3) installed – instructions are [here](https://helm.sh/docs/intro/install/).
 2. Hasura helm repo configured.
-  
+
 ```bash
 helm repo add hasura https://hasura.github.io/helm-charts
 helm repo update
@@ -19,11 +19,12 @@ helm repo update
 ```bash
 helm install [RELEASE_NAME] hasura/mongo-data-connector
 ```
+
 See [configuration](#parameters) below.
 
 See [helm install](https://helm.sh/docs/helm/helm_install/) for command documentation.
 
-## Parameters 
+## Parameters
 
 | Name                                              | Description                                                                                     | Value                         |
 | ------------------------------------------------- | ----------------------------------------------------------------------------------------------- | ----------------------------- |
@@ -32,7 +33,6 @@ See [helm install](https://helm.sh/docs/helm/helm_install/) for command document
 | `global.prefixOverride`                           | Override the naming prefix instead of the release name                                          | `{{ .Release.Name }}`         |
 | `nameOverride`                                    | String to override the deployment name                                                          | `""`                          |
 | `namespaceOverride`                               | String to override the namespace                                                                | `""`                          |
-| `disableAnnotationTimestamp`                      | Disable the current timestamp annotation that force the pod to roll out                         | `true`                        |
 | `labels`                                          | Add labels to the deployment resource                                                           | `{}`                          |
 | `annotations`                                     | Add annotations to the deployment resource                                                      | `{}`                          |
 | `command`                                         | Customize the execution command                                                                 | `[]`                          |

diff --git a/charts/mongo-data-connector/templates/deployment.yaml b/charts/mongo-data-connector/templates/deployment.yaml
@@ -29,9 +29,6 @@ spec:
   template:
     metadata:
       annotations:
-      {{- if not .Values.disableAnnotationTimestamp }}
-        deployment-timestamp: "{{ date "20060102150405" now }}"
-      {{- end }}
       {{- if .Values.annotations }}
         {{- toYaml .Values.annotations | nindent 8 }}
       {{- end }}

diff --git a/charts/mongo-data-connector/values.yaml b/charts/mongo-data-connector/values.yaml
@@ -90,10 +90,6 @@ serviceAccount:
 ##
 annotations: {}
 
-## Disable the deploy timestamp annotation to skip force rollout
-##
-disableAnnotationTimestamp: true
-
 ## The deployment strategy to use to replace existing pods with new ones.
 ## DeploymentStrategy describes how to replace existing pods with new ones.
 strategy: {}