Merge pull request #4 from evgkrsk/backport-nx-patches

Backport nx patches

charts/universal-chart/CHANGELOG.md

@@ -1,4 +1,10 @@
 # Changelog
+## 3.0.4 - April 15, 2022
+
+* Fix Helm hooks custom annotations
+* Fix Service nodePort
+* Removed helm hooks annotations for PVC
+
 ## 3.0.3 - April 14, 2022
 
 * fix: nindent in securityContext:

charts/universal-chart/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 description: Nixys universal Helm chart for deploy your apps to Kubernetes
 name: universal-chart
-version: 3.0.3
+version: 3.0.4
 maintainers:
 - name: Roman Andreev
   email: [email protected]

charts/universal-chart/README.md

@@ -167,6 +167,7 @@ The command removes all the Kubernetes components associated with the chart and
 | `protocol`   | Protocol of the service port | `"TCP"` | 
 | `port`       | Service port number          | ``      | 
 | `targetPort` | Service target port number   | ``      | 
+| `nodePort`   | Service NodePort number      | ``      |
 
 ### Ingresses parameters
 
@@ -193,7 +194,6 @@ The command removes all the Kubernetes components associated with the chart and
 
 ### Ingress `paths` object parameters
 
-
 | Name          | Description                                                                                                             | Value |
 |---------------|-------------------------------------------------------------------------------------------------------------------------|-------|
 | `path`        | URL path                                                                                                                | `"/"` |

charts/universal-chart/results/sample.yml

@@ -246,9 +246,9 @@ metadata:
     app.kubernetes.io/instance: test
     app.kubernetes.io/managed-by: Helm
   annotations:
-    "helm.sh/hook": pre-install,pre-upgrade
+    "helm.sh/hook": "pre-install,pre-upgrade"
     "helm.sh/hook-weight": "5"
-    "helm.sh/hook-delete-policy": before-hook-creation    
+    "helm.sh/hook-delete-policy": "before-hook-creation"    
     key: value
 spec:
   activeDeadlineSeconds: 120

charts/universal-chart/results/web-app.values.yml

@@ -1,4 +1,23 @@
 ---
+# Source: universal-chart/templates/pvc.yml
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: test-app-data
+  namespace: default
+  labels:
+    app.kubernetes.io/name: test
+    app.kubernetes.io/instance: test
+    app.kubernetes.io/managed-by: Helm
+  annotations:
+spec:
+  accessModes:
+    - ReadWriteOnce
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 1Gi
+---
 # Source: universal-chart/templates/svc.yml
 kind: Service
 apiVersion: v1
@@ -17,6 +36,7 @@ spec:
   - name: api
     protocol: TCP
     port: 8080
+    nodePort: 30036
   selector:
     app.kubernetes.io/name: test
     app.kubernetes.io/instance: test
@@ -275,25 +295,3 @@ data:
     events {
         worker_connections  1024;
     }
----
-# Source: universal-chart/templates/pvc.yml
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: test-app-data
-  namespace: default
-  labels:
-    app.kubernetes.io/name: test
-    app.kubernetes.io/instance: test
-    app.kubernetes.io/managed-by: Helm
-  annotations:
-    helm.sh/hook: "pre-install,pre-upgrade"
-    helm.sh/hook-weight: "-999"
-    helm.sh/hook-delete-policy: before-hook-creation
-spec:
-  accessModes:
-    - ReadWriteOnce
-    - ReadWriteMany
-  resources:
-    requests:
-      storage: 1Gi

charts/universal-chart/samples/web-app.values.yml

@@ -121,6 +121,7 @@ services:
     - name: api
       protocol: TCP
       port: 8080
+      nodePort: 30036
     extraSelectorLabels:
       app: my-app
 

charts/universal-chart/templates/helm-hooks.yml

@@ -11,9 +11,9 @@ metadata:
     {{- with $general.labels }}{{- include "helpers.tplvalues.render" (dict "value" . "context" $) | nindent 4 }}{{- end }}
     {{- with .labels }}{{- include "helpers.tplvalues.render" (dict "value" . "context" $) | nindent 4 }}{{- end }}
   annotations:
-    "helm.sh/hook": {{ .kind | default "pre-install,pre-upgrade" }}
+    "helm.sh/hook": {{ .kind | default "pre-install,pre-upgrade" | quote }}
     "helm.sh/hook-weight": {{ .weight | default "5" | quote }}
-    "helm.sh/hook-delete-policy": {{ .deletePolicy | default "before-hook-creation" }}
+    "helm.sh/hook-delete-policy": {{ .deletePolicy | default "before-hook-creation" | quote }}
     {{- include "helpers.app.genericAnnotations" $ | indent 4 }}
     {{- with $general.annotations }}{{- include "helpers.tplvalues.render" (dict "value" . "context" $) | nindent 4 }}{{- end }}
     {{- with .annotations }}{{- include "helpers.tplvalues.render" (dict "value" . "context" $) | nindent 4 }}{{- end }}

charts/universal-chart/templates/pvc.yml

@@ -9,7 +9,6 @@ metadata:
     {{- include "helpers.app.labels" $ | nindent 4 }}
     {{- with .labels }}{{- include "helpers.tplvalues.render" (dict "value" . "context" $) | nindent 4 }}{{- end }}
   annotations:
-    {{- include "helpers.app.hooksAnnotations" $ | nindent 4 }}
     {{- with .annotations }}{{- include "helpers.tplvalues.render" (dict "value" . "context" $) | nindent 4 }}{{- end }}
 spec:
   accessModes: {{- include "helpers.tplvalues.render" ( dict "value" .accessModes "context" $ ) | nindent 4 }}

charts/universal-chart/templates/svc.yml

@@ -44,6 +44,9 @@ spec:
     {{- if not (empty .targetPort) }}
     targetPort: {{ .targetPort }}
     {{- end }}
+    {{- if not (empty .nodePort) }}
+    nodePort: {{ .nodePort }}
+    {{- end }}
   {{- end }}
   selector:
     {{- include "helpers.app.selectorLabels" $ | nindent 4 }}

charts/universal-chart/testit.sh

@@ -1,4 +1,4 @@
-#!/bin/sh -eux
+#!/bin/sh -eu
 dname=$(dirname $0)
 tests="$dname/tests"
 rm -rf --one-file-system $tests