Skip to content

Commit

Permalink
[sophora-youtube-connector]: rename chart name to sophora-youtube-con…
Browse files Browse the repository at this point in the history
…nector
  • Loading branch information
tom-schoener committed Apr 14, 2023
1 parent 584ab09 commit 242c0a0
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion charts/sophora-youtube-connector/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
name: youtube-connector
name: sophora-youtube-connector
description: A Helm chart for Kubernetes

# A chart can be either an 'application' or a 'library' chart.
Expand Down
20 changes: 10 additions & 10 deletions charts/sophora-youtube-connector/templates/_helpers.tpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{/*
Expand the name of the chart.
*/}}
{{- define "youtube-connector.name" -}}
{{- define "sophora-youtube-connector.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
{{- end }}

Expand All @@ -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 "youtube-connector.fullname" -}}
{{- define "sophora-youtube-connector.fullname" -}}
{{- if .Values.fullnameOverride }}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
{{- else }}
Expand All @@ -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 "youtube-connector.chart" -}}
{{- define "sophora-youtube-connector.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
{{- end }}

{{/*
Common labels
*/}}
{{- define "youtube-connector.labels" -}}
helm.sh/chart: {{ include "youtube-connector.chart" . }}
{{ include "youtube-connector.selectorLabels" . }}
{{- define "sophora-youtube-connector.labels" -}}
helm.sh/chart: {{ include "sophora-youtube-connector.chart" . }}
{{ include "sophora-youtube-connector.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
Expand All @@ -45,17 +45,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
{{/*
Selector labels
*/}}
{{- define "youtube-connector.selectorLabels" -}}
app.kubernetes.io/name: {{ include "youtube-connector.name" . }}
{{- define "sophora-youtube-connector.selectorLabels" -}}
app.kubernetes.io/name: {{ include "sophora-youtube-connector.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}

{{/*
Create the name of the service account to use
*/}}
{{- define "youtube-connector.serviceAccountName" -}}
{{- define "sophora-youtube-connector.serviceAccountName" -}}
{{- if .Values.serviceAccount.create }}
{{- default (include "youtube-connector.fullname" .) .Values.serviceAccount.name }}
{{- default (include "sophora-youtube-connector.fullname" .) .Values.serviceAccount.name }}
{{- else }}
{{- default "default" .Values.serviceAccount.name }}
{{- end }}
Expand Down
4 changes: 2 additions & 2 deletions charts/sophora-youtube-connector/templates/ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "youtube-connector.fullname" . -}}
{{- $fullName := include "sophora-youtube-connector.fullname" . -}}
{{- $svcPort := .Values.service.httpPort -}}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ $fullName }}
labels:
{{- include "youtube-connector.labels" . | nindent 4 }}
{{- include "sophora-youtube-connector.labels" . | nindent 4 }}
{{- with .Values.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ include "youtube-connector.fullname" . }}-logback
name: {{ include "sophora-youtube-connector.fullname" . }}-logback
labels:
{{- include "youtube-connector.labels" . | nindent 4 }}
{{- include "sophora-youtube-connector.labels" . | nindent 4 }}
data:
logback.xml: |
{{- .Values.sophora.youtubeconnector.logback | nindent 4}}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ include "youtube-connector.fullname" . }}-mediaconfig
name: {{ include "sophora-youtube-connector.fullname" . }}-mediaconfig
labels:
{{- include "youtube-connector.labels" . | nindent 4 }}
{{- include "sophora-youtube-connector.labels" . | nindent 4 }}
data:
mediaconfig.xml: |
{{- .Values.sophora.youtubeconnector.mediaconfig | nindent 4}}
6 changes: 3 additions & 3 deletions charts/sophora-youtube-connector/templates/service.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: v1
kind: Service
metadata:
name: {{ include "youtube-connector.fullname" . }}
name: {{ include "sophora-youtube-connector.fullname" . }}
labels:
{{- include "youtube-connector.labels" . | nindent 4 }}
{{- include "sophora-youtube-connector.labels" . | nindent 4 }}
{{- with .Values.service.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
Expand All @@ -16,4 +16,4 @@ spec:
targetPort: http
name: http-service
selector:
{{- include "youtube-connector.selectorLabels" . | nindent 4 }}
{{- include "sophora-youtube-connector.selectorLabels" . | nindent 4 }}
32 changes: 16 additions & 16 deletions charts/sophora-youtube-connector/templates/statefulset.yaml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: {{ include "youtube-connector.fullname" . }}
name: {{ include "sophora-youtube-connector.fullname" . }}
labels:
{{- include "youtube-connector.labels" . | nindent 4 }}
{{- include "sophora-youtube-connector.labels" . | nindent 4 }}
spec:
replicas: 1
serviceName: {{ include "youtube-connector.fullname" . }}
serviceName: {{ include "sophora-youtube-connector.fullname" . }}
selector:
matchLabels:
{{- include "youtube-connector.selectorLabels" . | nindent 6 }}
{{- include "sophora-youtube-connector.selectorLabels" . | nindent 6 }}
template:
metadata:
{{- with .Values.podAnnotations }}
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "youtube-connector.selectorLabels" . | nindent 8 }}
{{- include "sophora-youtube-connector.selectorLabels" . | nindent 8 }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
Expand All @@ -43,24 +43,24 @@ spec:
- "-c"
- |
envsubst < /mediaconfig-configmap-template/mediaconfig.xml > /youtube-connector/mediaconfig.xml
echo "Generated /{{ include "youtube-connector.fullname" . }}-mediaconfig/mediaconfig.xml from ENV"
echo "Generated /{{ include "sophora-youtube-connector.fullname" . }}-mediaconfig/mediaconfig.xml from ENV"
volumeMounts:
- name: {{ include "youtube-connector.fullname" . }}-mediaconfig-template
- name: {{ include "sophora-youtube-connector.fullname" . }}-mediaconfig-template
mountPath: /mediaconfig-configmap-template
- name: {{ include "youtube-connector.fullname" . }}-mediaconfig
- name: {{ include "sophora-youtube-connector.fullname" . }}-mediaconfig
mountPath: /youtube-connector
volumes:
- name: {{ include "youtube-connector.fullname" . }}-mediaconfig-template
- name: {{ include "sophora-youtube-connector.fullname" . }}-mediaconfig-template
configMap:
name: {{ include "youtube-connector.fullname" . }}-mediaconfig
- name: {{ include "youtube-connector.fullname" . }}-mediaconfig
name: {{ include "sophora-youtube-connector.fullname" . }}-mediaconfig
- name: {{ include "sophora-youtube-connector.fullname" . }}-mediaconfig
emptyDir: {}
- name: {{ include "youtube-connector.fullname" . }}-config
- name: {{ include "sophora-youtube-connector.fullname" . }}-config
configMap:
name: {{ include "youtube-connector.fullname" . }}-config
name: {{ include "sophora-youtube-connector.fullname" . }}-config
- name: logback
configMap:
name: {{ include "youtube-connector.fullname" . }}-logback
name: {{ include "sophora-youtube-connector.fullname" . }}-logback
{{- with .Values.extraVolumes}}
{{- toYaml . | nindent 8 }}
{{- end }}
Expand Down Expand Up @@ -97,10 +97,10 @@ spec:
containerPort: 8080
protocol: TCP
volumeMounts:
- name: {{ include "youtube-connector.fullname" . }}-config
- name: {{ include "sophora-youtube-connector.fullname" . }}-config
mountPath: /app/config/application.{{ .Values.sophora.youtubeconnector.configFormat }}
subPath: application.{{ .Values.sophora.youtubeconnector.configFormat }}
- name: {{ include "youtube-connector.fullname" . }}-mediaconfig
- name: {{ include "sophora-youtube-connector.fullname" . }}-mediaconfig
mountPath: /app/mediaconfig.xml
subPath: mediaconfig.xml
- name: logback
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ include "youtube-connector.fullname" . }}-config
name: {{ include "sophora-youtube-connector.fullname" . }}-config
labels:
app: {{ include "youtube-connector.fullname" . }}
app: {{ include "sophora-youtube-connector.fullname" . }}
data:
application.{{ .Values.sophora.youtubeconnector.configFormat }}: |-
{{- (required "A configuration is required" .Values.sophora.youtubeconnector.config) | nindent 4 }}

0 comments on commit 242c0a0

Please sign in to comment.