diff --git a/library/common/.helmignore b/library/common/.helmignore new file mode 100644 index 0000000..0e8a0eb --- /dev/null +++ b/library/common/.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/ diff --git a/library/common/Chart.yaml b/library/common/Chart.yaml new file mode 100644 index 0000000..b591dc9 --- /dev/null +++ b/library/common/Chart.yaml @@ -0,0 +1,5 @@ +apiVersion: v2 +name: common +description: Asara's common library chart +type: library +version: 0.1.0 diff --git a/library/common/common-0.1.0.tgz b/library/common/common-0.1.0.tgz new file mode 100644 index 0000000..1591017 Binary files /dev/null and b/library/common/common-0.1.0.tgz differ diff --git a/library/common/templates/_NOTES.txt b/library/common/templates/_NOTES.txt new file mode 100644 index 0000000..084e08c --- /dev/null +++ b/library/common/templates/_NOTES.txt @@ -0,0 +1,7 @@ +1. Get the application URL by running these commands: +{{- if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "common.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT +{{- end }} diff --git a/library/common/templates/_deployment.yaml b/library/common/templates/_deployment.yaml new file mode 100644 index 0000000..1910db9 --- /dev/null +++ b/library/common/templates/_deployment.yaml @@ -0,0 +1,64 @@ +{{ define "common.deployment" }} +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Values.common.fullname }} +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + selector: + matchLabels: + app.kubernetes.io/name: {{ .Values.common.fullname }} + app.kubernetes.io/instance: {{ .Values.common.fullname }} + template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ .Values.common.serviceAccountName }} + securityContext: + {{- toYaml .Values.podSecurityContext | nindent 8 }} + containers: + - name: {{ .Chart.Name }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + env: + {{- if .Values.env }} + {{- toYaml .Values.env | nindent 12 }} + {{- end }} + ports: + - name: http + containerPort: {{ .Values.service.port }} + protocol: TCP + livenessProbe: + httpGet: + path: / + port: http + readinessProbe: + httpGet: + path: / + port: http + resources: + {{- toYaml .Values.resources | nindent 12 }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} +{{- end }} diff --git a/library/common/templates/_helpers.tpl.bak b/library/common/templates/_helpers.tpl.bak new file mode 100644 index 0000000..5c3f420 --- /dev/null +++ b/library/common/templates/_helpers.tpl.bak @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "common.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 "common.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 "common.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "common.labels" -}} +helm.sh/chart: {{ include "common.chart" . }} +{{ include "common.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "common.selectorLabels" -}} +app.kubernetes.io/name: {{ include "common.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "common.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "common.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/library/common/templates/_hpa.yaml b/library/common/templates/_hpa.yaml new file mode 100644 index 0000000..e992187 --- /dev/null +++ b/library/common/templates/_hpa.yaml @@ -0,0 +1,30 @@ +{{ define "common.hpa" }} +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2beta1 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "common.fullname" . }} + labels: + {{- include "common.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "common.fullname" . }} + minReplicas: {{ .Values.autoscaling.minReplicas }} + maxReplicas: {{ .Values.autoscaling.maxReplicas }} + metrics: + {{- if .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 }} + {{- end }} +{{- end }} +{{- end }} diff --git a/library/common/templates/_service.yaml b/library/common/templates/_service.yaml new file mode 100644 index 0000000..e52a750 --- /dev/null +++ b/library/common/templates/_service.yaml @@ -0,0 +1,13 @@ +{{ define "common.service" }} +apiVersion: v1 +kind: Service +metadata: + name: {{ .Values.common.fullname }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http +{{- end }} diff --git a/sudoscientist-go-backend/Chart.lock b/sudoscientist-go-backend/Chart.lock index acbdb3c..c4e1487 100644 --- a/sudoscientist-go-backend/Chart.lock +++ b/sudoscientist-go-backend/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common - repository: https://bjw-s.github.io/helm-charts/ - version: 1.2.0 -digest: sha256:4a59834889563e94dab9d298b62e8a095be18c459593c42307f99d5f1ea51027 -generated: "2022-12-31T18:26:05.702450278Z" + repository: https://charts.minhas.io + version: 0.1.0 +digest: sha256:406bfea256905aa3e1ea4e4af7420db7a78a674d3e967316970e52077012bb5d +generated: "2023-01-03T04:06:37.22850766Z" diff --git a/sudoscientist-go-backend/Chart.yaml b/sudoscientist-go-backend/Chart.yaml index 1a4c534..cbfb26c 100644 --- a/sudoscientist-go-backend/Chart.yaml +++ b/sudoscientist-go-backend/Chart.yaml @@ -7,5 +7,5 @@ appVersion: "1.16.0" # bjw-s common chart dependencies: - name: common - version: 1.2.0 - repository: https://bjw-s.github.io/helm-charts/ + version: 0.1.0 + repository: https://charts.minhas.io diff --git a/sudoscientist-go-backend/charts/common-1.2.0.tgz b/sudoscientist-go-backend/charts/common-1.2.0.tgz deleted file mode 100644 index 33e54e5..0000000 Binary files a/sudoscientist-go-backend/charts/common-1.2.0.tgz and /dev/null differ diff --git a/sudoscientist-go-backend/templates/NOTES.txt b/sudoscientist-go-backend/templates/NOTES.txt index 62573e8..e69de29 100644 --- a/sudoscientist-go-backend/templates/NOTES.txt +++ b/sudoscientist-go-backend/templates/NOTES.txt @@ -1,22 +0,0 @@ -1. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} -{{- range $host := .Values.ingress.hosts }} - {{- range .paths }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} - {{- end }} -{{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "sudoscientist-go-backend.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - 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 "sudoscientist-go-backend.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "sudoscientist-go-backend.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "sudoscientist-go-backend.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT -{{- end }} diff --git a/sudoscientist-go-backend/templates/_helpers.tpl b/sudoscientist-go-backend/templates/_helpers.tpl index 084e2b2..6e4f3a0 100644 --- a/sudoscientist-go-backend/templates/_helpers.tpl +++ b/sudoscientist-go-backend/templates/_helpers.tpl @@ -1,62 +1 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "sudoscientist-go-backend.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 "sudoscientist-go-backend.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 "sudoscientist-go-backend.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "sudoscientist-go-backend.labels" -}} -helm.sh/chart: {{ include "sudoscientist-go-backend.chart" . }} -{{ include "sudoscientist-go-backend.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "sudoscientist-go-backend.selectorLabels" -}} -app.kubernetes.io/name: {{ include "sudoscientist-go-backend.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "sudoscientist-go-backend.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "sudoscientist-go-backend.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} +{{ include "common.helpers" . }} diff --git a/sudoscientist-go-backend/templates/deployment.yaml b/sudoscientist-go-backend/templates/deployment.yaml index bf0dc5a..4508e33 100644 --- a/sudoscientist-go-backend/templates/deployment.yaml +++ b/sudoscientist-go-backend/templates/deployment.yaml @@ -1,65 +1 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "sudoscientist-go-backend.fullname" . }} - labels: - {{- include "sudoscientist-go-backend.labels" . | nindent 4 }} -spec: - {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} - {{- end }} - selector: - matchLabels: - {{- include "sudoscientist-go-backend.selectorLabels" . | nindent 6 }} - template: - metadata: - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- include "sudoscientist-go-backend.selectorLabels" . | nindent 8 }} - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "sudoscientist-go-backend.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - env: - {{- if .Values.env }} - {{- toYaml .Values.env | nindent 12 }} - {{- end }} - ports: - - name: http - containerPort: {{ .Values.service.port }} - protocol: TCP - #livenessProbe: - # httpGet: - # path: / - # port: http - #readinessProbe: - # httpGet: - # path: / - # port: http - resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} +{{ include "common.deployment" . }} diff --git a/sudoscientist-go-backend/templates/ingress.yaml b/sudoscientist-go-backend/templates/ingress.yaml deleted file mode 100644 index cde0fcc..0000000 --- a/sudoscientist-go-backend/templates/ingress.yaml +++ /dev/null @@ -1,61 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "sudoscientist-go-backend.fullname" . -}} -{{- $svcPort := .Values.service.port -}} -{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} - {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} - {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} - {{- end }} -{{- end }} -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1 -{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 -{{- else -}} -apiVersion: extensions/v1beta1 -{{- end }} -kind: Ingress -metadata: - name: {{ $fullName }} - labels: - {{- include "sudoscientist-go-backend.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} - {{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} - {{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: {{ .path }} - {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} - pathType: {{ .pathType }} - {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} - {{- end }} - {{- end }} -{{- end }} diff --git a/sudoscientist-go-backend/templates/service.yaml b/sudoscientist-go-backend/templates/service.yaml index dfcedf2..f024c64 100644 --- a/sudoscientist-go-backend/templates/service.yaml +++ b/sudoscientist-go-backend/templates/service.yaml @@ -1,15 +1 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "sudoscientist-go-backend.fullname" . }} - labels: - {{- include "sudoscientist-go-backend.labels" . | nindent 4 }} -spec: - type: {{ .Values.service.type }} - ports: - - port: {{ .Values.service.port }} - targetPort: http - protocol: TCP - name: http - selector: - {{- include "sudoscientist-go-backend.selectorLabels" . | nindent 4 }} +{{ include "common.service" . }} diff --git a/sudoscientist-go-backend/templates/serviceaccount.yaml b/sudoscientist-go-backend/templates/serviceaccount.yaml deleted file mode 100644 index 0f71f72..0000000 --- a/sudoscientist-go-backend/templates/serviceaccount.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "sudoscientist-go-backend.serviceAccountName" . }} - labels: - {{- include "sudoscientist-go-backend.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end }} diff --git a/sudoscientist-go-backend/templates/tests/test-connection.yaml b/sudoscientist-go-backend/templates/tests/test-connection.yaml deleted file mode 100644 index 3f4468e..0000000 --- a/sudoscientist-go-backend/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "sudoscientist-go-backend.fullname" . }}-test-connection" - labels: - {{- include "sudoscientist-go-backend.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "sudoscientist-go-backend.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never diff --git a/sudoscientist-go-backend/values.yaml b/sudoscientist-go-backend/values.yaml deleted file mode 100644 index e983743..0000000 --- a/sudoscientist-go-backend/values.yaml +++ /dev/null @@ -1,23 +0,0 @@ -image: - # -- image repository - repository: docker-repo.service.masked.name:5000/sudoscientist-go-backend - # -- image pull policy - pullPolicy: IfNotPresent - # -- image tag - # this example is not automatically updated, so be sure to use the latest image - tag: latest - -service: - type: ClusterIP - port: 80 - -ingress: - enabled: false - -serviceAccount: - create: false - -serviceAccountName: sudoscientist - -autoscaling: - enable: false