diff --git a/charts/spamasaurusrex/templates/NOTES.txt b/charts/spamasaurusrex/templates/NOTES.txt index 22da9e3..199235f 100644 --- a/charts/spamasaurusrex/templates/NOTES.txt +++ b/charts/spamasaurusrex/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 "json-server.fullname" . }}) + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "spamasaurusrex.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 "json-server.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "json-server.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 "spamasaurusrex.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "spamasaurusrex.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 "json-server.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 "spamasaurusrex.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 diff --git a/charts/spamasaurusrex/templates/_helpers.tpl b/charts/spamasaurusrex/templates/_helpers.tpl index ae0e0a4..a15b71f 100644 --- a/charts/spamasaurusrex/templates/_helpers.tpl +++ b/charts/spamasaurusrex/templates/_helpers.tpl @@ -1,7 +1,7 @@ {{/* Expand the name of the chart. */}} -{{- define "json-server.name" -}} +{{- define "spamasaurusrex.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} {{- end }} @@ -10,7 +10,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 "json-server.fullname" -}} +{{- define "spamasaurusrex.fullname" -}} {{- if .Values.fullnameOverride }} {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} {{- else }} @@ -26,16 +26,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 "json-server.chart" -}} +{{- define "spamasaurusrex.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} {{- end }} {{/* Common labels */}} -{{- define "json-server.labels" -}} -helm.sh/chart: {{ include "json-server.chart" . }} -{{ include "json-server.selectorLabels" . }} +{{- define "spamasaurusrex.labels" -}} +helm.sh/chart: {{ include "spamasaurusrex.chart" . }} +{{ include "spamasaurusrex.selectorLabels" . }} {{- if .Chart.AppVersion }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} @@ -45,17 +45,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} {{/* Selector labels */}} -{{- define "json-server.selectorLabels" -}} -app.kubernetes.io/name: {{ include "json-server.name" . }} +{{- define "spamasaurusrex.selectorLabels" -}} +app.kubernetes.io/name: {{ include "spamasaurusrex.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} {{/* Create the name of the service account to use */}} -{{- define "json-server.serviceAccountName" -}} +{{- define "spamasaurusrex.serviceAccountName" -}} {{- if .Values.serviceAccount.create }} -{{- default (include "json-server.fullname" .) .Values.serviceAccount.name }} +{{- default (include "spamasaurusrex.fullname" .) .Values.serviceAccount.name }} {{- else }} {{- default "default" .Values.serviceAccount.name }} {{- end }} diff --git a/charts/spamasaurusrex/templates/clusterrolebinding.yaml b/charts/spamasaurusrex/templates/clusterrolebinding.yaml index b85f16c..bc34572 100644 --- a/charts/spamasaurusrex/templates/clusterrolebinding.yaml +++ b/charts/spamasaurusrex/templates/clusterrolebinding.yaml @@ -4,7 +4,7 @@ metadata: name: {{ .Release.Name }}-clusterrolebinding subjects: - kind: ServiceAccount - name: {{ include "json-server.serviceAccountName" . }} + name: {{ include "spamasaurusrex.serviceAccountName" . }} namespace: {{ .Release.Namespace }} roleRef: kind: ClusterRole diff --git a/charts/spamasaurusrex/templates/deployment.yaml b/charts/spamasaurusrex/templates/deployment.yaml index 60796ba..188d5e8 100644 --- a/charts/spamasaurusrex/templates/deployment.yaml +++ b/charts/spamasaurusrex/templates/deployment.yaml @@ -1,14 +1,14 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "json-server.fullname" . }} + name: {{ include "spamasaurusrex.fullname" . }} labels: - {{- include "json-server.labels" . | nindent 4 }} + {{- include "spamasaurusrex.labels" . | nindent 4 }} spec: replicas: {{ .Values.replicaCount }} selector: matchLabels: - {{- include "json-server.selectorLabels" . | nindent 6 }} + {{- include "spamasaurusrex.selectorLabels" . | nindent 6 }} template: metadata: {{- with .Values.podAnnotations }} @@ -16,13 +16,13 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} labels: - {{- include "json-server.selectorLabels" . | nindent 8 }} + {{- include "spamasaurusrex.selectorLabels" . | nindent 8 }} spec: {{- with .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} - serviceAccountName: {{ include "json-server.serviceAccountName" . }} + serviceAccountName: {{ include "spamasaurusrex.serviceAccountName" . }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} containers: @@ -50,7 +50,7 @@ spec: mountPath: /data/db.json subPath: db.json - name: {{ .Release.Name }}-configmap - mountPath: /usr/local/lib/node_modules/json-server/public/index.html + mountPath: /usr/local/lib/node_modules/spamasaurusrex/public/index.html subPath: index.html - name: {{ .Chart.Name }}-sidecar securityContext: diff --git a/charts/spamasaurusrex/templates/ingress.yaml b/charts/spamasaurusrex/templates/ingress.yaml index 74c76db..c5a2fa0 100644 --- a/charts/spamasaurusrex/templates/ingress.yaml +++ b/charts/spamasaurusrex/templates/ingress.yaml @@ -1,5 +1,5 @@ {{- if .Values.ingress.enabled -}} -{{- $fullName := include "json-server.fullname" . -}} +{{- $fullName := include "spamasaurusrex.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") }} @@ -17,7 +17,7 @@ kind: Ingress metadata: name: {{ $fullName }} labels: - {{- include "json-server.labels" . | nindent 4 }} + {{- include "spamasaurusrex.labels" . | nindent 4 }} {{- with .Values.ingress.annotations }} annotations: {{- toYaml . | nindent 4 }} diff --git a/charts/spamasaurusrex/templates/service.yaml b/charts/spamasaurusrex/templates/service.yaml index 4c47d4a..947ba7f 100644 --- a/charts/spamasaurusrex/templates/service.yaml +++ b/charts/spamasaurusrex/templates/service.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "json-server.fullname" . }} + name: {{ include "spamasaurusrex.fullname" . }} labels: - {{- include "json-server.labels" . | nindent 4 }} + {{- include "spamasaurusrex.labels" . | nindent 4 }} spec: type: {{ .Values.service.type }} ports: @@ -12,4 +12,4 @@ spec: protocol: TCP name: http selector: - {{- include "json-server.selectorLabels" . | nindent 4 }} + {{- include "spamasaurusrex.selectorLabels" . | nindent 4 }} diff --git a/charts/spamasaurusrex/templates/serviceaccount.yaml b/charts/spamasaurusrex/templates/serviceaccount.yaml index 5585d56..85e9333 100644 --- a/charts/spamasaurusrex/templates/serviceaccount.yaml +++ b/charts/spamasaurusrex/templates/serviceaccount.yaml @@ -2,9 +2,9 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ include "json-server.serviceAccountName" . }} + name: {{ include "spamasaurusrex.serviceAccountName" . }} labels: - {{- include "json-server.labels" . | nindent 4 }} + {{- include "spamasaurusrex.labels" . | nindent 4 }} {{- with .Values.serviceAccount.annotations }} annotations: {{- toYaml . | nindent 4 }} diff --git a/charts/spamasaurusrex/values.yaml b/charts/spamasaurusrex/values.yaml index de670c4..91224cd 100644 --- a/charts/spamasaurusrex/values.yaml +++ b/charts/spamasaurusrex/values.yaml @@ -1,4 +1,4 @@ -# Default values for json-server. +# Default values for spamasaurusrex. spamasaurusRex: image: @@ -51,7 +51,7 @@ ingress: - path: / pathType: ImplementationSpecific tls: [] - # - secretName: json-server-tls + # - secretName: spamasaurusrex-tls # hosts: # - alias.example.org