chore: bump version up to 2.33.0

.drone.yml

@@ -1,49 +0,0 @@
----
-kind: pipeline
-type: docker
-name: default
-
-trigger:
-  event:
-    - push
-    - tag
-
-steps:
-  - name: lint
-    image: cr.grachevko.ru/docker.io/alpine/helm:latest
-    pull: always
-    commands:
-      - helm lint .
-
-  - name: version
-    image: cr.grachevko.ru/docker.io/mikefarah/yq:latest
-    pull: always
-    user: root
-    commands:
-      - yq -i '.version = "'$DRONE_TAG'"' Chart.yaml
-      - cat Chart.yaml
-    depends_on:
-      - lint
-    when:
-      event:
-        - tag
-
-  - name: release
-    image: cr.grachevko.ru/docker.io/alpine/helm:latest
-    pull: always
-    commands:
-      - helm dependency build
-      - helm plugin install https://github.com/chartmuseum/helm-push
-      - helm repo add hasura $HELM_REPO --username $HELM_REPO_USERNAME --password $HELM_REPO_PASSWORD
-      - helm cm-push . $HELM_REPO
-    environment:
-      HELM_REPO: https://harbor.grachevko.ru/chartrepo/hasura
-      HELM_REPO_USERNAME:
-        from_secret: HELM_REPO_USERNAME
-      HELM_REPO_PASSWORD:
-        from_secret: HELM_REPO_PASSWORD
-    depends_on:
-      - version
-    when:
-      event:
-        - tag

.gitea/workflows/release.yaml

@@ -0,0 +1,29 @@
+name: Release Chart
+
+on:
+  push:
+    tags:
+    - '*'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+
+    env:
+      REGISTRY: harbor.grachevko.ru
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: yokawasa/action-setup-kube-tools@v0.9.3
+      with:
+        setup-tools: helm
+    - name: deps and lint
+      run: |
+        helm dependency update
+        helm lint --strict .
+    - name: build
+      run: helm package --version ${{ gitea.ref_name }} .
+    - name: publish
+      run: |
+        echo "${{ secrets.REGISTRY_PASSWORD }}" | helm registry login ${{ env.REGISTRY }} --username "${{ secrets.REGISTRY_USERNAME }}" --password-stdin
+        helm push ./*.tgz oci://harbor.grachevko.ru/${{ gitea.repository }}

Chart.yaml

@@ -3,10 +3,10 @@ name: hasura
 description: A Helm chart for Kubernetes
 type: application
 version: 0.2.6
-appVersion: v2.16.0
+appVersion: 2.33.0
 icon: https://raw.githubusercontent.com/hasura/graphql-engine/master/assets/brand/powered_by_hasura_primary_lightbg.svg
 maintainers:
-  - email: me@grachevko.ru
-    name: Konstantin Grachev
+- email: me@grachevko.ru
+  name: Konstantin Grachev
 sources:
-  - https://git.grachevko.ru/hasura/chart
+- https://git.grachevko.ru/hasura/chart

templates/_helpers.tpl

@@ -60,3 +60,12 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{- define "hasura.image" -}}
+{{- .Values.image.registry }}/{{ .Values.image.repository }}:
+{{- if .Values.image.tag }}
+{{- .Values.image.tag -}}
+{{- else -}}
+v{{ .Chart.AppVersion }}.cli-migrations-v3
+{{- end }}
+{{- end }}

templates/deployment.yaml

@@ -28,29 +28,29 @@ spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
-        - name: {{ .Chart.Name }}
-          securityContext:
+      - name: {{ .Chart.Name }}
+        securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          envFrom:
+        image: {{ include "hasura.image" . }}
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        envFrom:
           {{- if .Values.extraEnvVarsSecret }}
-            - secretRef:
-                name: {{ .Values.extraEnvVarsSecret }}
+        - secretRef:
+            name: {{ .Values.extraEnvVarsSecret }}
           {{- end }}
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /healthz
-              port: http
-          readinessProbe:
-            httpGet:
-              path: /healthz
-              port: http
-          resources:
+        ports:
+        - name: http
+          containerPort: 8080
+          protocol: TCP
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: http
+        readinessProbe:
+          httpGet:
+            path: /healthz
+            port: http
+        resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
       nodeSelector:

templates/hpa.yaml

@@ -14,15 +14,15 @@ spec:
   maxReplicas: {{ .Values.autoscaling.maxReplicas }}
   metrics:
     {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: cpu
-        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+  - type: Resource
+    resource:
+      name: cpu
+      targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
     {{- end }}
     {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: memory
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+  - type: Resource
+    resource:
+      name: memory
+      targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
     {{- end }}
 {{- end }}

templates/ingress.yaml

@@ -29,30 +29,30 @@ spec:
   {{- if .Values.ingress.tls }}
   tls:
     {{- range .Values.ingress.tls }}
-    - hosts:
+  - hosts:
         {{- range .hosts }}
-        - {{ . | quote }}
+    - {{ . | quote }}
         {{- end }}
-      secretName: {{ .secretName }}
+    secretName: {{ .secretName }}
     {{- end }}
   {{- end }}
   rules:
     {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
+  - host: {{ .host | quote }}
+    http:
+      paths:
           {{- range .paths }}
-          - path: {{ .path }}
-            pathType: {{ default "ImplementationSpecific" .pathType }}
-            backend:
+      - path: {{ .path }}
+        pathType: {{ default "ImplementationSpecific" .pathType }}
+        backend:
               {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
-              service:
-                name: {{ $fullName }}
-                port:
-                  number: {{ $svcPort }}
+          service:
+            name: {{ $fullName }}
+            port:
+              number: {{ $svcPort }}
               {{- else }}
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
+          serviceName: {{ $fullName }}
+          servicePort: {{ $svcPort }}
               {{- end }}
           {{- end }}
     {{- end }}

templates/migrations-job.yaml

@@ -22,32 +22,32 @@ spec:
       {{- end }}
       restartPolicy: Never
       volumes:
-        - name: data
-          emptyDir: { }
+      - name: data
+        emptyDir: {}
       initContainers:
-        - name: copy
-          image: "{{ .Values.migrations.image.registry }}/{{ .Values.migrations.image.repository }}:{{ .Values.migrations.image.tag | default "latest" }}"
-          command: ["/bin/sh", "-c", "cp -R /{{ .Values.migrations.image.path }}/* /shared-data/"]
-          workingDir: /data
-          volumeMounts:
-            - name: data
-              mountPath: /shared-data
+      - name: copy
+        image: "{{ .Values.migrations.image.registry }}/{{ .Values.migrations.image.repository }}:{{ .Values.migrations.image.tag | default "latest" }}"
+        command: ["/bin/sh", "-c", "cp -R /{{ .Values.migrations.image.path }}/* /shared-data/"]
+        workingDir: /data
+        volumeMounts:
+        - name: data
+          mountPath: /shared-data
       containers:
-        - name: migrate
-          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          command: [ "/bin/sh", "-c" ]
-          args:
-            - hasura-cli deploy
-          workingDir: /data
-          env:
-            - name: HASURA_GRAPHQL_ENDPOINT
-              value: "http://{{ include "hasura.fullname" . }}"
-          envFrom:
+      - name: migrate
+        image: {{ include "hasura.image" . }}
+        command: ["/bin/sh", "-c"]
+        args:
+        - hasura-cli deploy
+        workingDir: /data
+        env:
+        - name: HASURA_GRAPHQL_ENDPOINT
+          value: "http://{{ include "hasura.fullname" . }}"
+        envFrom:
           {{- if .Values.extraEnvVarsSecret }}
-            - secretRef:
-                name: {{ .Values.extraEnvVarsSecret }}
+        - secretRef:
+            name: {{ .Values.extraEnvVarsSecret }}
           {{- end }}
-          volumeMounts:
-            - name: data
-              mountPath: /data
+        volumeMounts:
+        - name: data
+          mountPath: /data
 {{- end }}

templates/service.yaml

@@ -7,9 +7,9 @@ metadata:
 spec:
   type: {{ .Values.service.type }}
   ports:
-    - port: {{ .Values.service.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
+  - port: {{ .Values.service.port }}
+    targetPort: http
+    protocol: TCP
+    name: http
   selector:
     {{- include "hasura.selectorLabels" . | nindent 4 }}

templates/tests/test-connection.yaml

@@ -8,8 +8,8 @@ metadata:
     "helm.sh/hook": test
 spec:
   containers:
-    - name: wget
-      image: busybox
-      command: [ 'wget' ]
-      args: [ '{{ include "hasura.fullname" . }}:{{ .Values.service.port }}' ]
+  - name: wget
+    image: busybox
+    command: ['wget']
+    args: ['{{ include "hasura.fullname" . }}:{{ .Values.service.port }}']
   restartPolicy: Never

values.yaml

@@ -9,8 +9,8 @@ image:
   repository: hasura/graphql-engine
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: v2.15.0.cli-migrations-v3
-  pullSecrets: [ ]
+  tag: ""
+  pullSecrets: []
 
 extraEnvVarsSecret: ""
 
@@ -20,7 +20,7 @@ migrations:
     registry: *registry
     repository: ""
     tag: ""
-    pullSecrets: [ ]
+    pullSecrets: []
     path: /data
 
 nameOverride: ""
@@ -30,22 +30,22 @@ serviceAccount:
   # Specifies whether a service account should be created
   create: false
   # Annotations to add to the service account
-  annotations: { }
+  annotations: {}
   # The name of the service account to use.
   # If not set and create is true, a name is generated using the fullname template
   name: ""
 
-podAnnotations: { }
+podAnnotations: {}
 
-podSecurityContext: { }
+podSecurityContext: {}
 # fsGroup: 2000
 
-securityContext: { }
+securityContext: {}
   # capabilities:
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
+# runAsNonRoot: true
 # runAsUser: 1000
 
 service:
@@ -55,20 +55,20 @@ service:
 ingress:
   enabled: false
   className: ""
-  annotations: { }
-    # kubernetes.io/ingress.class: nginx
+  annotations: {}
+  # kubernetes.io/ingress.class: nginx
   # kubernetes.io/tls-acme: "true"
   hosts:
-    - host: chart-example.local
-      paths:
-        - path: /
-          pathType: ImplementationSpecific
-  tls: [ ]
+  - host: chart-example.local
+    paths:
+    - path: /
+      pathType: ImplementationSpecific
+  tls: []
   #  - secretName: chart-example-tls
   #    hosts:
   #      - chart-example.local
 
-resources: { }
+resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
   # resources, such as Minikube. If you do want to specify resources, uncomment the following
@@ -77,7 +77,7 @@ resources: { }
   #   cpu: 100m
   #   memory: 128Mi
   # requests:
-  #   cpu: 100m
+#   cpu: 100m
 #   memory: 128Mi
 
 autoscaling:
@@ -87,8 +87,8 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
-nodeSelector: { }
+nodeSelector: {}
 
-tolerations: [ ]
+tolerations: []
 
-affinity: { }
+affinity: {}