fix: chart renamed to otomi and published on charts repo

Author: Maurice Faber

.github/workflows/main.yml

@@ -78,16 +78,17 @@ jobs:
         id: chart_prepare
         run: |
           # Release new chart only if its version changes
-          [ ! $(git show ${{ github.sha }} chart/otomi-installer/Chart.yaml | grep '^+version:.*$') ] && echo "No chart changes detected. Skipping." && exit
+          [ ! $(git show ${{ github.sha }} chart/otomi/Chart.yaml | grep '^+version:.*$') ] && echo "No chart changes detected. Skipping." && exit
           echo ::set-output name=has_chart_changes::true
           release_tag=v$(cat package.json | jq -r '.version')
-          sed --in-place "s/APP_VERSION_PLACEHOLDER/$release_tag/g" chart/otomi-installer/Chart.yaml
+          sed --in-place "s/APP_VERSION_PLACEHOLDER/$release_tag/g" chart/otomi/Chart.yaml
       - if: '${{ steps.chart_prepare.outputs.has_chart_changes }}'
-        name: Create and publish otomi-installer chart release
+        name: Create and publish otomi chart release
         id: chart_release
         uses: helm/[email protected]
         with:
           charts_dir: chart
+          charts_repo_url: https://otomi.io/charts/
         env:
           CR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Slack Notification

chart/otomi-installer/scripts/map-values.sh

@@ -1,10 +1,10 @@
 apiVersion: v1
-name: otomi-installer
+name: otomi
 description: A Helm chart for installing otomi in Kubernetes
 home: https://otomi.io/
 icon: https://otomi.io/img/otomi-logo.svg
 type: application
-version: '0.1.2'
+version: '0.1.1'
 appVersion: 'APP_VERSION_PLACEHOLDER'
 keywords:
   - otomi

chart/otomi-installer/templates/NOTES.txt

@@ -0,0 +1 @@
+npm run tasks:otomi-chart

chart/otomi-installer/templates/rbac.yaml

@@ -0,0 +1,5 @@
+The Otomi installer was successfully deployed on the cluster.
+
+Please inspect the output of the installer job ({{ .Release.Namespace }}/{{ include "otomi.fullname" . }}) for any feedback or errors.
+
+Also visit otomi.io for further instructions and reference documentation.

chart/otomi-installer/templates/serviceaccount.yaml

@@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "otomi.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 "otomi.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 "otomi.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "otomi.labels" -}}
+helm.sh/chart: {{ include "otomi.chart" . }}
+{{ include "otomi.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "otomi.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "otomi.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "otomi.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "otomi.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}

chart/otomi-installer/.helmignore renamed to chart/otomi/.helmignore

@@ -1,17 +1,25 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: otomi-installer-job
+  name: {{ include "otomi.fullname" . }}
+  labels: {{- include "otomi.labels" . | nindent 4 }}
 spec:
   template:
     metadata:
-      name: otomi-install
+      {{- with .Values.podAnnotations }}
+      annotations: {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels: {{- include "otomi.selectorLabels" . | nindent 8 }}
     spec:
+      {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
-      - name: regcred
-      serviceAccountName: {{ .Release.Name }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "otomi.serviceAccountName" . }}
+      securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }}
       initContainers:
         - name: bootstrap-values
+          securityContext: {{- toYaml .Values.securityContext | nindent 12 }}
           image: otomi/core:{{ .Values.otomi.version }}
           imagePullPolicy: Always
           command: ['/bin/bash', '-c']
@@ -29,7 +37,7 @@ spec:
               value: /secret/values.yaml
           envFrom:
             - secretRef:
-                name: {{ .Release.Name }}-sops-secrets
+                name: {{ include "otomi.fullname" . }}-sops-secrets
           volumeMounts:
             - name: otomi-values
               mountPath: /env
@@ -74,7 +82,7 @@ spec:
               value: /env
           envFrom:
             - secretRef:
-                name: {{ .Release.Name }}-sops-secrets
+                name: {{ include "otomi.fullname" . }}-sops-secrets
           volumeMounts:
             - name: otomi-values
               mountPath: /env
@@ -97,7 +105,7 @@ spec:
               value: /home/app/stack/env
           envFrom:
             - secretRef:
-                name: {{ .Release.Name }}-sops-secrets
+                name: {{ include "otomi.fullname" . }}-sops-secrets
           volumeMounts:
             - name: otomi-values
               mountPath: /home/app/stack/env

chart/otomi-installer/Chart.yaml renamed to chart/otomi/Chart.yaml

@@ -0,0 +1,15 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "otomi.fullname" . }}
+  labels: {{- include "otomi.selectorLabels" . | nindent 8 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cluster-admin
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "otomi.serviceAccountName" . }}
+    namespace: {{ .Release.Namespace }}
+{{- end }}

chart/otomi-installer/scripts/bootstrap-values.sh renamed to chart/otomi/scripts/bootstrap-values.sh

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

chart/otomi-installer/scripts/deploy.sh renamed to chart/otomi/scripts/deploy.sh

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ .Release.Name }}-sops-secrets
+  name: {{ include "otomi.fullname" . }}-sops-secrets
 type: Opaque
 data:
 {{- with $v.azure }}

chart/otomi-installer/scripts/encrypt-values.sh renamed to chart/otomi/scripts/encrypt-values.sh

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .Release.Name }}-values
+  labels: {{- include "otomi.labels" . | nindent 4 }}
 type: Opaque
 data:
   values.yaml: |-