diff --git a/karma/templates/NOTES.txt b/karma/templates/NOTES.txt index 58752b3..e811a3a 100644 --- a/karma/templates/NOTES.txt +++ b/karma/templates/NOTES.txt @@ -6,16 +6,16 @@ {{- 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 "jellyfin.fullname" . }}) + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "karma.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 "jellyfin.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "jellyfin.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "karma.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "karma.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 "jellyfin.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "karma.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") echo "Visit http://127.0.0.1:8080 to use your application" kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80 {{- end }} diff --git a/karma/templates/_helpers.tpl b/karma/templates/_helpers.tpl index 042130a..51a2a0f 100644 --- a/karma/templates/_helpers.tpl +++ b/karma/templates/_helpers.tpl @@ -2,7 +2,7 @@ {{/* Expand the name of the chart. */}} -{{- define "jellyfin.name" -}} +{{- define "karma.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} @@ -11,7 +11,7 @@ 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 "jellyfin.fullname" -}} +{{- define "karma.fullname" -}} {{- if .Values.fullnameOverride -}} {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} {{- else -}} @@ -27,16 +27,16 @@ If release name contains chart name it will be used as a full name. {{/* Create chart name and version as used by the chart label. */}} -{{- define "jellyfin.chart" -}} +{{- define "karma.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* Common labels */}} -{{- define "jellyfin.labels" -}} -helm.sh/chart: {{ include "jellyfin.chart" . }} -{{ include "jellyfin.selectorLabels" . }} +{{- define "karma.labels" -}} +helm.sh/chart: {{ include "karma.chart" . }} +{{ include "karma.selectorLabels" . }} {{- if .Chart.AppVersion }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} @@ -46,17 +46,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} {{/* Selector labels */}} -{{- define "jellyfin.selectorLabels" -}} -app.kubernetes.io/name: {{ include "jellyfin.name" . }} +{{- define "karma.selectorLabels" -}} +app.kubernetes.io/name: {{ include "karma.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end -}} {{/* Create the name of the service account to use */}} -{{- define "jellyfin.serviceAccountName" -}} +{{- define "karma.serviceAccountName" -}} {{- if .Values.serviceAccount.create -}} - {{ default (include "jellyfin.fullname" .) .Values.serviceAccount.name }} + {{ default (include "karma.fullname" .) .Values.serviceAccount.name }} {{- else -}} {{ default "default" .Values.serviceAccount.name }} {{- end -}} diff --git a/karma/templates/tests/test-connection.yaml b/karma/templates/tests/test-connection.yaml index a8bde4d..e1b34ec 100644 --- a/karma/templates/tests/test-connection.yaml +++ b/karma/templates/tests/test-connection.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Pod metadata: - name: "{{ include "jellyfin.fullname" . }}-test-connection" + name: "{{ include "karma.fullname" . }}-test-connection" labels: -{{ include "jellyfin.labels" . | nindent 4 }} +{{ include "karma.labels" . | nindent 4 }} annotations: "helm.sh/hook": test-success spec: @@ -11,5 +11,5 @@ spec: - name: wget image: busybox command: ['wget'] - args: ['{{ include "jellyfin.fullname" . }}:{{ .Values.service.port }}'] + args: ['{{ include "karma.fullname" . }}:{{ .Values.service.port }}'] restartPolicy: Never diff --git a/karma/values.yaml b/karma/values.yaml index e861bc8..77d8355 100644 --- a/karma/values.yaml +++ b/karma/values.yaml @@ -1,4 +1,4 @@ -# Default values for jellyfin. +# Default values for karma. # This is a YAML-formatted file. # Declare variables to be passed into your templates.