Merge pull request #2 from KisCsaj68/feature/helm-chart-persister

Feature/helm chart persister

infa/helm-charts/api/templates/deployment.yaml

@@ -54,15 +54,13 @@ spec:
               mountPath: /api/config
             - name: app-secret-config
               mountPath: /api/secret/config
-
       volumes:
         - name: app-config
           configMap:
             name: {{ include "api.fullname" . }}
         - name: app-secret-config
           secret:
             name: {{ include "api.fullname" . }}
-
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

infa/helm-charts/persister/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

infa/helm-charts/persister/Chart.yaml

@@ -0,0 +1,6 @@
+apiVersion: v2
+name: persister
+description: A Helm chart for Kubernetes
+type: application
+version: 0.1.0
+appVersion: "0.0.1"

infa/helm-charts/persister/templates/_helpers.tpl

@@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "persister.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "persister.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "persister.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "persister.labels" -}}
+helm.sh/chart: {{ include "persister.chart" . }}
+{{ include "persister.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "persister.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "persister.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "persister.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "persister.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}

infa/helm-charts/persister/templates/configmap.yaml

@@ -0,0 +1,28 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+    name: {{ include "persister.fullname" . }}
+data:
+    application.properties: |
+        ##connect to database
+        server.port=9001
+        spring.datasource.driver-class-name=org.postgresql.Driver
+        spring.datasource.url = jdbc:postgresql://{{ .Values.pg.host }}.{{ .Release.Namespace }}.svc:{{ .Values.pg.port }}/quokka
+        spring.datasource.username = {{ .Values.pg.user }}
+        spring.datasource.password = {{ .Values.pg.password }}
+
+        ##JPA Config
+        #
+        #spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect
+        #spring.jpa.hibernate.ddl-auto = update
+        #spring.jpa.show-sql = true
+        #spring.jpa.properties.hibernate.format_sql = true
+
+        #spring.jpa.database-platform = org.hibernate.dialect.PostgreSQL94Dialect
+        spring.jpa.database-platform = org.hibernate.dialect.PostgreSQL94Dialect
+        #spring.jpa.show-sql = true
+        spring.jpa.hibernate.ddl-auto = validate
+        spring.jpa.hibernate.naming.implicit-strategy = org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl
+        spring.jpa.properties.hibernate.format_sql = true
+
+        spring.rabbitmq.addresses = {{ .Values.services.rabbit.host }}.{{ .Release.Namespace }}.svc:{{ .Values.services.rabbit.port }}

infa/helm-charts/persister/templates/deployment.yaml

@@ -0,0 +1,75 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "persister.fullname" . }}
+  labels:
+    {{- include "persister.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "persister.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "persister.labels" . | nindent 8 }}
+        {{- with .Values.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "persister.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}
+          command: ["java"]
+          args: 
+            - "-jar"
+            - "./persister-0.0.1-SNAPSHOT-jar-with-dependencies.jar"
+            - "-Dspring.config.location=/persister/config/application.properties,/persister/secret/config/application.secret.properties"
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - name: http
+              containerPort: {{ .Values.service.port }}
+              protocol: TCP
+          livenessProbe:
+            {{- toYaml .Values.livenessProbe | nindent 12 }}
+          readinessProbe:
+            {{- toYaml .Values.readinessProbe | nindent 12 }}
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          volumeMounts:
+            - name: persister-config
+              mountPath: /persister/config
+            - name: persister-secret-config
+              mountPath: /persister/secret/config
+      volumes:
+        - name: persister-config
+          configMap:
+            name: {{ include "persister.fullname" . }}
+        - name: persister-secret-config
+          secret:
+            name: {{ include "persister.fullname" . }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}

infa/helm-charts/persister/templates/secret.yaml

@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "persister.fullname" . }}
+stringData:
+  application.secret.properties: |
+    # database connection details
+    spring.datasource.password = {{ .Values.pg.password }}

infa/helm-charts/persister/templates/service.yaml

@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "persister.fullname" . }}
+  labels:
+    {{- include "persister.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    {{- include "persister.selectorLabels" . | nindent 4 }}

infa/helm-charts/persister/templates/serviceaccount.yaml

@@ -0,0 +1,13 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "persister.serviceAccountName" . }}
+  labels:
+    {{- include "persister.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+automountServiceAccountToken: {{ .Values.serviceAccount.automount }}
+{{- end }}

infa/helm-charts/persister/values.yaml

@@ -0,0 +1,105 @@
+# Default values for persister.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 4
+
+image:
+  repository: quokka/persister
+  pullPolicy: Always
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: "latest"
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Automatically mount a ServiceAccount's API credentials?
+  automount: true
+  # Annotations to add to the service account
+  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: {}
+podLabels: {}
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  port: 9001
+
+# ingress:
+#   enabled: false
+#   className: ""
+#   annotations: {}
+#     # kubernetes.io/ingress.class: nginx
+#     # kubernetes.io/tls-acme: "true"
+#   hosts:
+#     - host: chart-example.local
+#       paths:
+#         - path: /
+#           pathType: ImplementationSpecific
+#   tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
+
+ingress:
+  enabled: false
+  className: nginx
+  tls: []
+  annotations: {}
+  host: localhost
+
+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
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+# livenessProbe:
+#   httpGet:
+#     path: /
+#     port: http
+# readinessProbe:
+#   httpGet:
+#     path: /
+#     port: http
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+pg:
+  host: postgres
+  port: 5432
+  user: postgres
+  password: asdqwe
+
+services:
+  rabbit:
+    host: rabbitmq
+    port: 5672

infa/helm-values/local/persister.yaml

@@ -0,0 +1,2 @@
+image:
+  repository: localhost:5005/persister