From ff4e61bf90c6e621e869aa8113007734c1d75837 Mon Sep 17 00:00:00 2001 From: Marius Ensrud Date: Wed, 2 Sep 2020 19:40:39 +0200 Subject: [PATCH] fix rename names --- charts/omada-controller/Chart.yaml | 4 ++-- charts/omada-controller/templates/NOTES.txt | 8 ++++---- .../omada-controller/templates/_helpers.tpl | 20 +++++++++---------- charts/omada-controller/templates/hpa.yaml | 6 +++--- .../omada-controller/templates/ingress.yaml | 4 ++-- .../templates/serviceaccount.yaml | 4 ++-- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/charts/omada-controller/Chart.yaml b/charts/omada-controller/Chart.yaml index d037256..9439f05 100644 --- a/charts/omada-controller/Chart.yaml +++ b/charts/omada-controller/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -name: rsyncd -description: RSYNCD backup server +name: omada-controller +description: omada-controller server # A chart can be either an 'application' or a 'library' chart. # diff --git a/charts/omada-controller/templates/NOTES.txt b/charts/omada-controller/templates/NOTES.txt index 417cd13..fe0d28a 100644 --- a/charts/omada-controller/templates/NOTES.txt +++ b/charts/omada-controller/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 "rsyncd.fullname" . }}) + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "omada-controller.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 "rsyncd.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "rsyncd.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 "omada-controller.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "omada-controller.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 "rsyncd.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 "omada-controller.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/charts/omada-controller/templates/_helpers.tpl b/charts/omada-controller/templates/_helpers.tpl index 263a942..8605c6c 100644 --- a/charts/omada-controller/templates/_helpers.tpl +++ b/charts/omada-controller/templates/_helpers.tpl @@ -1,7 +1,7 @@ {{/* Expand the name of the chart. */}} -{{- define "rsyncd.name" -}} +{{- define "omada-controller.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 "rsyncd.fullname" -}} +{{- define "omada-controller.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 "rsyncd.chart" -}} +{{- define "omada-controller.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} {{- end }} {{/* Common labels */}} -{{- define "rsyncd.labels" -}} -helm.sh/chart: {{ include "rsyncd.chart" . }} -{{ include "rsyncd.selectorLabels" . }} +{{- define "omada-controller.labels" -}} +helm.sh/chart: {{ include "omada-controller.chart" . }} +{{ include "omada-controller.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 "rsyncd.selectorLabels" -}} -app.kubernetes.io/name: {{ include "rsyncd.name" . }} +{{- define "omada-controller.selectorLabels" -}} +app.kubernetes.io/name: {{ include "omada-controller.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} {{/* Create the name of the service account to use */}} -{{- define "rsyncd.serviceAccountName" -}} +{{- define "omada-controller.serviceAccountName" -}} {{- if .Values.serviceAccount.create }} -{{- default (include "rsyncd.fullname" .) .Values.serviceAccount.name }} +{{- default (include "omada-controller.fullname" .) .Values.serviceAccount.name }} {{- else }} {{- default "default" .Values.serviceAccount.name }} {{- end }} diff --git a/charts/omada-controller/templates/hpa.yaml b/charts/omada-controller/templates/hpa.yaml index 42f5d8f..7a7d21a 100644 --- a/charts/omada-controller/templates/hpa.yaml +++ b/charts/omada-controller/templates/hpa.yaml @@ -2,14 +2,14 @@ apiVersion: autoscaling/v2beta1 kind: HorizontalPodAutoscaler metadata: - name: {{ include "rsyncd.fullname" . }} + name: {{ include "omada-controller.fullname" . }} labels: - {{- include "rsyncd.labels" . | nindent 4 }} + {{- include "omada-controller.labels" . | nindent 4 }} spec: scaleTargetRef: apiVersion: apps/v1 kind: Deployment - name: {{ include "rsyncd.fullname" . }} + name: {{ include "omada-controller.fullname" . }} minReplicas: {{ .Values.autoscaling.minReplicas }} maxReplicas: {{ .Values.autoscaling.maxReplicas }} metrics: diff --git a/charts/omada-controller/templates/ingress.yaml b/charts/omada-controller/templates/ingress.yaml index fc219f3..d770703 100644 --- a/charts/omada-controller/templates/ingress.yaml +++ b/charts/omada-controller/templates/ingress.yaml @@ -1,5 +1,5 @@ {{- if .Values.ingress.enabled -}} -{{- $fullName := include "rsyncd.fullname" . -}} +{{- $fullName := include "omada-controller.fullname" . -}} {{- $svcPort := .Values.service.port -}} {{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 @@ -10,7 +10,7 @@ kind: Ingress metadata: name: {{ $fullName }} labels: - {{- include "rsyncd.labels" . | nindent 4 }} + {{- include "omada-controller.labels" . | nindent 4 }} {{- with .Values.ingress.annotations }} annotations: {{- toYaml . | nindent 4 }} diff --git a/charts/omada-controller/templates/serviceaccount.yaml b/charts/omada-controller/templates/serviceaccount.yaml index d0fb034..762eb06 100644 --- a/charts/omada-controller/templates/serviceaccount.yaml +++ b/charts/omada-controller/templates/serviceaccount.yaml @@ -2,9 +2,9 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ include "rsyncd.serviceAccountName" . }} + name: {{ include "omada-controller.serviceAccountName" . }} labels: - {{- include "rsyncd.labels" . | nindent 4 }} + {{- include "omada-controller.labels" . | nindent 4 }} {{- with .Values.serviceAccount.annotations }} annotations: {{- toYaml . | nindent 4 }}