Updates on files

Alexander Rogalskiy · Alexander Rogalskiy · commit 4dab2732a627 · 2021-09-12T00:45:30.000+03:00
Added changeset on workflow
diff --git a/charts/templates/NOTES.txt b/charts/templates/NOTES.txt
@@ -23,10 +23,10 @@ Thank you for installing Java Patterns Docs!
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
            You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "backend-java-patterns.fullname" . }}'
   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "backend-java-patterns.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-  echo "http://$SERVICE_IP:{{ .Values.service.port }}/java-patterns/"
+  echo "http://$SERVICE_IP:{{ .Values.service.ports.http }}/java-patterns/"
 
 {{- else if contains "ClusterIP" .Values.service.type }}
-  kubectl --namespace {{ .Release.Namespace }} port-forward svc/{{ include "backend-java-patterns.fullname" . }} {{ .Values.service.port }}
+  kubectl --namespace {{ .Release.Namespace }} port-forward svc/{{ include "backend-java-patterns.fullname" . }} {{ .Values.service.ports.http }}
 
   Port-forward >>> kubectl --namespace {{ .Release.Namespace }} port-forward $KUBERNETES_POD_NAME {{ .Values.service.externalPort }}:{{ .Values.service.externalPort }}
   Logs >>> kubectl logs deployment/{{ include "backend-java-patterns.fullname" . }} -c recv
diff --git a/charts/templates/_helpers.tpl b/charts/templates/_helpers.tpl
@@ -279,9 +279,23 @@ Return port
     {{- .Values.general.servicePort -}}
 {{- else if .Values.service.httpPort }}
     {{- .Values.service.httpPort -}}
-{{- else if .Values.service.nodePort }}
-  {{- .Values.service.nodePort -}}
+{{- else if .Values.service.nodePorts.http }}
+  {{- .Values.service.nodePorts.http -}}
+{{- else if .Values.service.nodePorts.https }}
+  {{- .Values.service.nodePorts.https -}}
 {{- else -}}
-  {{- .Values.service.port -}}
+  {{- .Values.service.ports.http -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Get the user defined LoadBalancerIP for this release.
+Note, returns 127.0.0.1 if using ClusterIP.
+*/}}
+{{- define "backend-java-patterns.serviceIP" -}}
+{{- if eq .Values.service.type "ClusterIP" -}}
+127.0.0.1
+{{- else -}}
+{{- .Values.service.loadBalancerIP | default "" -}}
 {{- end -}}
 {{- end -}}
diff --git a/charts/templates/configmap-vhosts.yaml b/charts/templates/configmap-vhosts.yaml
@@ -0,0 +1,23 @@
+{{- if and (.Files.Glob "files/vhosts/*.conf") (not .Values.vhostsConfigMap) }}
+{{- $fullName := include "backend-java-patterns.fullname" . -}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ $fullName }}-vhosts
+  namespace: {{ .Release.Namespace | quote }}
+  labels:
+    {{- include "backend-java-patterns.labels" . | nindent 4 }}
+  {{- if .Values.general.labels }}
+  {{- with .Values.general.labels }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- end }}
+  {{- if .Values.general.annotations }}
+  {{- with .Values.general.annotations }}
+  annotations:
+    {{- toYaml . | indent 4 }}
+  {{- end }}
+  {{- end }}
+data:
+{{ (.Files.Glob "files/vhosts/*.conf").AsConfig | indent 2 }}
+{{ end }}
diff --git a/charts/templates/configmap.yaml b/charts/templates/configmap.yaml
@@ -7,6 +7,17 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "backend-java-patterns.labels" . | nindent 4 }}
+  {{- if .Values.general.labels }}
+  {{- with .Values.general.labels }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- end }}
+  {{- if .Values.general.annotations }}
+  {{- with .Values.general.annotations }}
+  annotations:
+    {{- toYaml . | indent 4 }}
+  {{- end }}
+  {{- end }}
 data:
   DEBUG: {{ default "" .Values.configMaps.data.debug | quote }}
   SERVER_PORT: {{ default "" .Values.configMaps.data.serverPort | quote }}
diff --git a/charts/templates/extended-configmap.yaml b/charts/templates/extended-configmap.yaml
@@ -4,8 +4,20 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ $fullName }}-extended-configuration
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "backend-java-patterns.labels" . | nindent 4 }}
+  {{- if .Values.general.labels }}
+  {{- with .Values.general.labels }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- end }}
+  {{- if .Values.general.annotations }}
+  {{- with .Values.general.annotations }}
+  annotations:
+    {{- toYaml . | indent 4 }}
+  {{- end }}
+  {{- end }}
 data:
 {{- with .Files.Glob "files/conf.d/*.conf" }}
 {{ .AsConfig | indent 2 }}
diff --git a/charts/templates/ingress.yaml b/charts/templates/ingress.yaml
@@ -8,14 +8,19 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "backend-java-patterns.labels" . | nindent 4 }}
+  annotations:
+    {{- if .Values.ingress.certManager }}
+    kubernetes.io/tls-acme: "true"
+    {{- end }}
   {{- if .Values.ingress.annotations }}
   {{- with .Values.ingress.annotations }}
-  annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   {{- end }}
 spec:
-  ingressClassName: {{ .Values.ingress.className }}
+  {{- if .Values.ingress.className }}
+  ingressClassName: {{ .Values.ingress.className | quote }}
+  {{- end }}
   {{- if .Values.ingress.tls }}
   tls:
     {{- range .Values.ingress.tls }}
diff --git a/charts/templates/networkpolicy.yaml b/charts/templates/networkpolicy.yaml
@@ -15,6 +15,8 @@ spec:
     {{- with .Values.statefulset.labels }}
       {{- toYaml . | nindent 6 }}
     {{- end }}
+  policyTypes:
+    - Ingress
   ingress:
     - ports:
         - port: {{ template "backend-java-patterns.port" . }}
diff --git a/charts/templates/prometheus-alerting-rule.yaml b/charts/templates/prometheus-alerting-rule.yaml
@@ -4,7 +4,9 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ $fullName }}
-  namespace: {{ .Release.Namespace | quote }}
+  {{- if .Values.metrics.rules.namespace }}
+  namespace: {{ .Values.metrics.rules.namespace }}
+  {{- end }}
   labels:
     {{- include "backend-java-patterns.labels" . | nindent 4 }}
     {{- if .Values.serviceMonitor.alerting.labels }}
diff --git a/charts/templates/role.yaml b/charts/templates/role.yaml
@@ -8,11 +8,39 @@ metadata:
   labels:
     {{- include "backend-java-patterns.labels" . | nindent 4 }}
 rules:
-  - apiGroups: [""]
-    resources: ["secrets"]
+  - apiGroups:
+      - ""
+    resources:
+      - "secrets"
     {{- if .Values.tls.certs.provided }}
-    verbs: ["get"]
+    verbs:
+      - "get"
     {{- else }}
-    verbs: ["create", "get"]
+    verbs:
+      - "create"
+      - "get"
     {{- end }}
+  - apiGroups:
+      - ""
+    resources:
+      - "pods"
+    verbs:
+      - "create"
+      - "list"
+      - "get"
+      - "watch"
+      - "delete"
+  - apiGroups:
+      - ""
+    resources:
+      - "pods/log"
+    verbs:
+      - "get"
+  - apiGroups:
+      - ""
+    resources:
+      - "pods/exec"
+    verbs:
+      - "create"
+      - "get"
 {{- end }}
diff --git a/charts/templates/secret.yaml b/charts/templates/secret.yaml
@@ -32,4 +32,7 @@ data:
   {{- else }}
   base-token: {{ randAlphaNum 10 | b64enc | quote }}
   {{- end }}
+  {{- range $key, $value := .Values.secrets.extra }}
+  {{ $key }}: {{ $value | b64enc }}
+  {{- end }}
 {{- end }}
diff --git a/charts/templates/service-svc.yaml b/charts/templates/service-svc.yaml
@@ -21,10 +21,25 @@ metadata:
   {{- end }}
 spec:
   type: {{ .Values.metrics.service.type }}
+  {{- if (or (eq .Values.metrics.service.type "LoadBalancer") (eq .Values.metrics.service.type "NodePort")) }}
+  externalTrafficPolicy: {{ .Values.metrics.service.externalTrafficPolicy | quote }}
+  {{- end }}
+  {{ if eq .Values.metrics.service.type "LoadBalancer" }}
+  loadBalancerSourceRanges: {{ .Values.metrics.service.loadBalancerSourceRanges }}
+  {{ end }}
+  {{- if (and (eq .Values.metrics.service.type "LoadBalancer") (not (empty .Values.metrics.service.loadBalancerIP))) }}
+  loadBalancerIP: {{ .Values.metrics.service.loadBalancerIP }}
+  {{- end }}
   ports:
     - name: metrics
-      port: {{ .Values.metrics.service.port }}
       targetPort: metrics
+      port: {{ .Values.metrics.service.port }}
+      protocol: TCP
+      {{- if (and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.metrics.service.nodePort))) }}
+      nodePort: {{ .Values.metrics.service.nodePort }}
+      {{- else if eq .Values.metrics.service.type "ClusterIP" }}
+      nodePort: null
+      {{- end }}
   selector:
     {{- include "backend-java-patterns.selectorLabels" . | nindent 4 }}
 {{- end }}
diff --git a/charts/templates/service.discovery.yaml b/charts/templates/service.discovery.yaml
@@ -26,7 +26,7 @@ metadata:
     # in the cluster.
     prometheus.io/scrape: "true"
     prometheus.io/path: _status/vars
-    prometheus.io/port: {{ .Values.service.ports.http.port | quote }}
+    prometheus.io/port: {{ .Values.service.ports.http | quote }}
   {{- if .Values.service.discovery.annotations }}
   {{- with .Values.service.discovery.annotations }}
     {{- toYaml . | nindent 4 }}
diff --git a/charts/templates/service.yaml b/charts/templates/service.yaml
@@ -40,20 +40,38 @@ spec:
   loadBalancerSourceRanges: {{- toYaml .Values.service.loadBalancerSourceRanges | nindent 4 }}
   {{- end }}
   ports:
-    - port: {{ .Values.service.externalPort | int64 }}
+    {{- if .Values.service.ports.http }}
+    - port: {{ .Values.service.ports.http | int64 }}
       targetPort: http
       protocol: TCP
       name: http
-      {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePort)) }}
-      nodePort: {{ .Values.service.nodePort }}
+      {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.http)) }}
+      nodePort: {{ .Values.service.nodePorts.http }}
       {{- else if eq .Values.service.type "ClusterIP" }}
       nodePort: null
       {{- end }}
+    {{- end }}
+    {{- if .Values.service.ports.grpc }}
+    - port: {{ .Values.service.ports.grpc | int64 }}
+      targetPort: grpc
+      protocol: TCP
+      name: grpc
+      {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.grpc)) }}
+      nodePort: {{ .Values.service.nodePorts.grpc }}
+      {{- else if eq .Values.service.type "ClusterIP" }}
+      nodePort: null
+      {{- end }}
+    {{- end }}
     {{- if .Values.tls.enabled }}
     - port: {{ .Values.tls.httpPort | default 8000 | int64 }}
       targetPort: https
       protocol: TCP
       name: https
+      {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.https)) }}
+      nodePort: {{ .Values.service.nodePorts.https }}
+      {{- else if eq .Values.service.type "ClusterIP" }}
+      nodePort: null
+      {{- end }}
     {{- end }}
   selector:
     {{- include "backend-java-patterns.selectorLabels" . | nindent 4 }}
diff --git a/charts/templates/statefulset.yaml b/charts/templates/statefulset.yaml
@@ -14,13 +14,18 @@ metadata:
   {{- end }}
 spec:
   serviceName: {{ $fullName }}
-  replicas: {{ .Values.statefulset.replicas | int64 }}
+  replicas: {{ default 1 .Values.statefulset.replicas | int64 }}
   updateStrategy:
-    type: {{ .Values.statefulset.updateStrategy.type }}
+    type: {{ .Values.statefulset.updateStrategy.type | quote }}
     {{- if (eq "Recreate" .Values.statefulset.updateStrategy.type) }}
     rollingUpdate: null
+    {{- else if .Values.statefulset.rollingUpdatePartition }}
+    rollingUpdate:
+      partition: {{ .Values.statefulset.rollingUpdatePartition }}
     {{- end }}
+  {{- if .Values.statefulset.podManagementPolicy }}
   podManagementPolicy: {{ .Values.statefulset.podManagementPolicy | quote }}
+  {{- end }}
   selector:
     matchLabels:
       {{- include "backend-java-patterns.selectorLabels" . | nindent 6 }}
diff --git a/charts/templates/virtualservice.yaml b/charts/templates/virtualservice.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.virtualservice.enabled -}}
 {{- $fullName := include "backend-java-patterns.fullname" . -}}
-{{- $svcPort := .Values.service.port -}}
+{{- $svcPort := .Values.service.ports.http -}}
 {{- $svcHost := .Values.virtualservice.serviceHost -}}
 apiVersion: networking.istio.io/v1beta1
 kind: VirtualService
diff --git a/charts/values.yaml b/charts/values.yaml
@@ -149,12 +149,21 @@ service:
   ##
   loadBalancerIP: ""
 
+  ## Specify the port value for the service types.
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
+  ## @param service.ports.http Kubernetes Service port
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-port
+  ##
+  ports:
+    http: 8000
+
   ## Specify the nodePort value for the LoadBalancer and NodePort service types.
   ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
-  ## @param service.nodePort Kubernetes Service nodePort
+  ## @param service.nodePorts.http Kubernetes Service nodePort
   ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
   ##
-  nodePort: 8000
+  nodePorts:
+    http: 8000
 
   ## @param service.hostPort Kubernetes service host port
   ## the port used to bind the http port to the host
