Renaming HELM Package
This commit is contained in:
parent
fa49e16454
commit
b01ec6a09a
8 changed files with 53 additions and 53 deletions
|
|
@ -1,27 +1,27 @@
|
||||||
---
|
---
|
||||||
# Source: easyhaproxy-ingress/templates/serviceaccount.yaml
|
# Source: easyhaproxy/templates/serviceaccount.yaml
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ServiceAccount
|
kind: ServiceAccount
|
||||||
metadata:
|
metadata:
|
||||||
name: byjg-easyhaproxy-ingress
|
name: ingress-easyhaproxy
|
||||||
namespace: easyhaproxy
|
namespace: easyhaproxy
|
||||||
labels:
|
labels:
|
||||||
helm.sh/chart: easyhaproxy-ingress-0.1.0
|
helm.sh/chart: easyhaproxy-0.1.0
|
||||||
app.kubernetes.io/name: easyhaproxy-ingress
|
app.kubernetes.io/name: easyhaproxy
|
||||||
app.kubernetes.io/instance: byjg
|
app.kubernetes.io/instance: ingress
|
||||||
app.kubernetes.io/version: "test"
|
app.kubernetes.io/version: "test"
|
||||||
app.kubernetes.io/managed-by: Helm
|
app.kubernetes.io/managed-by: Helm
|
||||||
---
|
---
|
||||||
# Source: easyhaproxy-ingress/templates/clusterrole.yaml
|
# Source: easyhaproxy/templates/clusterrole.yaml
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
metadata:
|
metadata:
|
||||||
name: byjg-easyhaproxy-ingress
|
name: ingress-easyhaproxy
|
||||||
namespace: easyhaproxy
|
namespace: easyhaproxy
|
||||||
labels:
|
labels:
|
||||||
helm.sh/chart: easyhaproxy-ingress-0.1.0
|
helm.sh/chart: easyhaproxy-0.1.0
|
||||||
app.kubernetes.io/name: easyhaproxy-ingress
|
app.kubernetes.io/name: easyhaproxy
|
||||||
app.kubernetes.io/instance: byjg
|
app.kubernetes.io/instance: ingress
|
||||||
app.kubernetes.io/version: "test"
|
app.kubernetes.io/version: "test"
|
||||||
app.kubernetes.io/managed-by: Helm
|
app.kubernetes.io/managed-by: Helm
|
||||||
rules:
|
rules:
|
||||||
|
|
@ -78,49 +78,49 @@ rules:
|
||||||
# - list
|
# - list
|
||||||
# - watch
|
# - watch
|
||||||
---
|
---
|
||||||
# Source: easyhaproxy-ingress/templates/clusterrolebinding.yaml
|
# Source: easyhaproxy/templates/clusterrolebinding.yaml
|
||||||
kind: ClusterRoleBinding
|
kind: ClusterRoleBinding
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
metadata:
|
metadata:
|
||||||
name: byjg-easyhaproxy-ingress
|
name: ingress-easyhaproxy
|
||||||
namespace: easyhaproxy
|
namespace: easyhaproxy
|
||||||
labels:
|
labels:
|
||||||
helm.sh/chart: easyhaproxy-ingress-0.1.0
|
helm.sh/chart: easyhaproxy-0.1.0
|
||||||
app.kubernetes.io/name: easyhaproxy-ingress
|
app.kubernetes.io/name: easyhaproxy
|
||||||
app.kubernetes.io/instance: byjg
|
app.kubernetes.io/instance: ingress
|
||||||
app.kubernetes.io/version: "test"
|
app.kubernetes.io/version: "test"
|
||||||
app.kubernetes.io/managed-by: Helm
|
app.kubernetes.io/managed-by: Helm
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
name: byjg-easyhaproxy-ingress
|
name: ingress-easyhaproxy
|
||||||
subjects:
|
subjects:
|
||||||
- kind: ServiceAccount
|
- kind: ServiceAccount
|
||||||
name: byjg-easyhaproxy-ingress
|
name: ingress-easyhaproxy
|
||||||
namespace: easyhaproxy
|
namespace: easyhaproxy
|
||||||
---
|
---
|
||||||
# Source: easyhaproxy-ingress/templates/deployment.yaml
|
# Source: easyhaproxy/templates/deployment.yaml
|
||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: DaemonSet
|
kind: DaemonSet
|
||||||
metadata:
|
metadata:
|
||||||
name: byjg-easyhaproxy-ingress
|
name: ingress-easyhaproxy
|
||||||
namespace: easyhaproxy
|
namespace: easyhaproxy
|
||||||
labels:
|
labels:
|
||||||
helm.sh/chart: easyhaproxy-ingress-0.1.0
|
helm.sh/chart: easyhaproxy-0.1.0
|
||||||
app.kubernetes.io/name: easyhaproxy-ingress
|
app.kubernetes.io/name: easyhaproxy
|
||||||
app.kubernetes.io/instance: byjg
|
app.kubernetes.io/instance: ingress
|
||||||
app.kubernetes.io/version: "test"
|
app.kubernetes.io/version: "test"
|
||||||
app.kubernetes.io/managed-by: Helm
|
app.kubernetes.io/managed-by: Helm
|
||||||
spec:
|
spec:
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app.kubernetes.io/name: easyhaproxy-ingress
|
app.kubernetes.io/name: easyhaproxy
|
||||||
app.kubernetes.io/instance: byjg
|
app.kubernetes.io/instance: ingress
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/name: easyhaproxy-ingress
|
app.kubernetes.io/name: easyhaproxy
|
||||||
app.kubernetes.io/instance: byjg
|
app.kubernetes.io/instance: ingress
|
||||||
spec:
|
spec:
|
||||||
affinity:
|
affinity:
|
||||||
nodeAffinity:
|
nodeAffinity:
|
||||||
|
|
@ -131,11 +131,11 @@ spec:
|
||||||
operator: In
|
operator: In
|
||||||
values:
|
values:
|
||||||
- master
|
- master
|
||||||
serviceAccountName: byjg-easyhaproxy-ingress
|
serviceAccountName: ingress-easyhaproxy
|
||||||
securityContext:
|
securityContext:
|
||||||
{}
|
{}
|
||||||
containers:
|
containers:
|
||||||
- name: easyhaproxy-ingress
|
- name: easyhaproxy
|
||||||
securityContext:
|
securityContext:
|
||||||
{}
|
{}
|
||||||
image: "byjg/easy-haproxy:test"
|
image: "byjg/easy-haproxy:test"
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
apiVersion: v2
|
apiVersion: v2
|
||||||
name: easyhaproxy-ingress
|
name: easyhaproxy
|
||||||
description: "EasyHAProxy - A service discovery backed on HAProxy"
|
description: "EasyHAProxy - A service discovery backed on HAProxy"
|
||||||
|
|
||||||
# A chart can be either an 'application' or a 'library' chart.
|
# A chart can be either an 'application' or a 'library' chart.
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{{/*
|
{{/*
|
||||||
Expand the name of the chart.
|
Expand the name of the chart.
|
||||||
*/}}
|
*/}}
|
||||||
{{- define "easyhaproxy-ingress.name" -}}
|
{{- define "easyhaproxy.name" -}}
|
||||||
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
|
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
|
||||||
{{- end }}
|
{{- 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).
|
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.
|
If release name contains chart name it will be used as a full name.
|
||||||
*/}}
|
*/}}
|
||||||
{{- define "easyhaproxy-ingress.fullname" -}}
|
{{- define "easyhaproxy.fullname" -}}
|
||||||
{{- if .Values.fullnameOverride }}
|
{{- if .Values.fullnameOverride }}
|
||||||
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
|
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
|
||||||
{{- else }}
|
{{- 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.
|
Create chart name and version as used by the chart label.
|
||||||
*/}}
|
*/}}
|
||||||
{{- define "easyhaproxy-ingress.chart" -}}
|
{{- define "easyhaproxy.chart" -}}
|
||||||
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
|
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
{{/*
|
{{/*
|
||||||
Common labels
|
Common labels
|
||||||
*/}}
|
*/}}
|
||||||
{{- define "easyhaproxy-ingress.labels" -}}
|
{{- define "easyhaproxy.labels" -}}
|
||||||
helm.sh/chart: {{ include "easyhaproxy-ingress.chart" . }}
|
helm.sh/chart: {{ include "easyhaproxy.chart" . }}
|
||||||
{{ include "easyhaproxy-ingress.selectorLabels" . }}
|
{{ include "easyhaproxy.selectorLabels" . }}
|
||||||
{{- if .Chart.AppVersion }}
|
{{- if .Chart.AppVersion }}
|
||||||
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
|
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
@ -45,17 +45,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||||
{{/*
|
{{/*
|
||||||
Selector labels
|
Selector labels
|
||||||
*/}}
|
*/}}
|
||||||
{{- define "easyhaproxy-ingress.selectorLabels" -}}
|
{{- define "easyhaproxy.selectorLabels" -}}
|
||||||
app.kubernetes.io/name: {{ include "easyhaproxy-ingress.name" . }}
|
app.kubernetes.io/name: {{ include "easyhaproxy.name" . }}
|
||||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
{{/*
|
{{/*
|
||||||
Create the name of the service account to use
|
Create the name of the service account to use
|
||||||
*/}}
|
*/}}
|
||||||
{{- define "easyhaproxy-ingress.serviceAccountName" -}}
|
{{- define "easyhaproxy.serviceAccountName" -}}
|
||||||
{{- if .Values.serviceAccount.create }}
|
{{- if .Values.serviceAccount.create }}
|
||||||
{{- default (include "easyhaproxy-ingress.fullname" .) .Values.serviceAccount.name }}
|
{{- default (include "easyhaproxy.fullname" .) .Values.serviceAccount.name }}
|
||||||
{{- else }}
|
{{- else }}
|
||||||
{{- default "default" .Values.serviceAccount.name }}
|
{{- default "default" .Values.serviceAccount.name }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
|
||||||
|
|
@ -3,10 +3,10 @@
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "easyhaproxy-ingress.fullname" . }}
|
name: {{ include "easyhaproxy.fullname" . }}
|
||||||
namespace: {{ .Release.Namespace }}
|
namespace: {{ .Release.Namespace }}
|
||||||
labels:
|
labels:
|
||||||
{{- include "easyhaproxy-ingress.labels" . | nindent 4 }}
|
{{- include "easyhaproxy.labels" . | nindent 4 }}
|
||||||
{{- with .Values.serviceAccount.annotations }}
|
{{- with .Values.serviceAccount.annotations }}
|
||||||
annotations:
|
annotations:
|
||||||
{{- toYaml . | nindent 4 }}
|
{{- toYaml . | nindent 4 }}
|
||||||
|
|
|
||||||
|
|
@ -3,10 +3,10 @@
|
||||||
kind: ClusterRoleBinding
|
kind: ClusterRoleBinding
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "easyhaproxy-ingress.fullname" . }}
|
name: {{ include "easyhaproxy.fullname" . }}
|
||||||
namespace: {{ .Release.Namespace }}
|
namespace: {{ .Release.Namespace }}
|
||||||
labels:
|
labels:
|
||||||
{{- include "easyhaproxy-ingress.labels" . | nindent 4 }}
|
{{- include "easyhaproxy.labels" . | nindent 4 }}
|
||||||
{{- with .Values.serviceAccount.annotations }}
|
{{- with .Values.serviceAccount.annotations }}
|
||||||
annotations:
|
annotations:
|
||||||
{{- toYaml . | nindent 4 }}
|
{{- toYaml . | nindent 4 }}
|
||||||
|
|
@ -14,9 +14,9 @@ metadata:
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
name: {{ include "easyhaproxy-ingress.fullname" . }}
|
name: {{ include "easyhaproxy.fullname" . }}
|
||||||
subjects:
|
subjects:
|
||||||
- kind: ServiceAccount
|
- kind: ServiceAccount
|
||||||
name: {{ include "easyhaproxy-ingress.serviceAccountName" . }}
|
name: {{ include "easyhaproxy.serviceAccountName" . }}
|
||||||
namespace: {{ .Release.Namespace }}
|
namespace: {{ .Release.Namespace }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
|
||||||
|
|
@ -2,18 +2,18 @@
|
||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: DaemonSet
|
kind: DaemonSet
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "easyhaproxy-ingress.fullname" . }}
|
name: {{ include "easyhaproxy.fullname" . }}
|
||||||
namespace: {{ .Release.Namespace }}
|
namespace: {{ .Release.Namespace }}
|
||||||
labels:
|
labels:
|
||||||
{{- include "easyhaproxy-ingress.labels" . | nindent 4 }}
|
{{- include "easyhaproxy.labels" . | nindent 4 }}
|
||||||
spec:
|
spec:
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
{{- include "easyhaproxy-ingress.selectorLabels" . | nindent 6 }}
|
{{- include "easyhaproxy.selectorLabels" . | nindent 6 }}
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
{{- include "easyhaproxy-ingress.selectorLabels" . | nindent 8 }}
|
{{- include "easyhaproxy.selectorLabels" . | nindent 8 }}
|
||||||
spec:
|
spec:
|
||||||
affinity:
|
affinity:
|
||||||
nodeAffinity:
|
nodeAffinity:
|
||||||
|
|
@ -24,7 +24,7 @@ spec:
|
||||||
operator: In
|
operator: In
|
||||||
values:
|
values:
|
||||||
{{- toYaml .Values.masterNode.values | nindent 18 }}
|
{{- toYaml .Values.masterNode.values | nindent 18 }}
|
||||||
serviceAccountName: {{ include "easyhaproxy-ingress.serviceAccountName" . }}
|
serviceAccountName: {{ include "easyhaproxy.serviceAccountName" . }}
|
||||||
securityContext:
|
securityContext:
|
||||||
{{- toYaml .Values.podSecurityContext | nindent 8 }}
|
{{- toYaml .Values.podSecurityContext | nindent 8 }}
|
||||||
containers:
|
containers:
|
||||||
|
|
|
||||||
|
|
@ -2,10 +2,10 @@
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ServiceAccount
|
kind: ServiceAccount
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "easyhaproxy-ingress.serviceAccountName" . }}
|
name: {{ include "easyhaproxy.serviceAccountName" . }}
|
||||||
namespace: {{ .Release.Namespace }}
|
namespace: {{ .Release.Namespace }}
|
||||||
labels:
|
labels:
|
||||||
{{- include "easyhaproxy-ingress.labels" . | nindent 4 }}
|
{{- include "easyhaproxy.labels" . | nindent 4 }}
|
||||||
{{- with .Values.serviceAccount.annotations }}
|
{{- with .Values.serviceAccount.annotations }}
|
||||||
annotations:
|
annotations:
|
||||||
{{- toYaml . | nindent 4 }}
|
{{- toYaml . | nindent 4 }}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
# Default values for easyhaproxy-ingress.
|
# Default values for easyhaproxy.
|
||||||
# This is a YAML-formatted file.
|
# This is a YAML-formatted file.
|
||||||
# Declare variables to be passed into your templates.
|
# Declare variables to be passed into your templates.
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue