diff --git a/eks-console-full-access/Chart.yaml b/eks-console-full-access/Chart.yaml index f0ef17b..137d260 100644 --- a/eks-console-full-access/Chart.yaml +++ b/eks-console-full-access/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -name: eks-console-full -description: A Helm chart for Kubernetes +name: eks-console-full-access +description: A Helm chart for Kubernetes to install aws console access for eks # A chart can be either an 'application' or a 'library' chart. # # Application charts are a collection of templates that can be packaged into versioned archives diff --git a/eks-console-full-access/templates/_helpers.tpl b/eks-console-full-access/templates/_helpers.tpl index 6aaacb3..8fca6cc 100644 --- a/eks-console-full-access/templates/_helpers.tpl +++ b/eks-console-full-access/templates/_helpers.tpl @@ -1,7 +1,7 @@ {{/* Expand the name of the chart. */}} -{{- define "eks-console-full.name" -}} +{{- define "eks-console-full-access.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 "eks-console-full.fullname" -}} +{{- define "eks-console-full-access.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 "eks-console-full.chart" -}} +{{- define "eks-console-full-access.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} {{- end }} {{/* Common labels */}} -{{- define "eks-console-full.labels" -}} -helm.sh/chart: {{ include "eks-console-full.chart" . }} -{{ include "eks-console-full.selectorLabels" . }} +{{- define "eks-console-full-access.labels" -}} +helm.sh/chart: {{ include "eks-console-full-access.chart" . }} +{{ include "eks-console-full-access.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 "eks-console-full.selectorLabels" -}} -app.kubernetes.io/name: {{ include "eks-console-full.name" . }} +{{- define "eks-console-full-access.selectorLabels" -}} +app.kubernetes.io/name: {{ include "eks-console-full-access.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} {{/* Create the name of the service account to use */}} -{{- define "eks-console-full.serviceAccountName" -}} +{{- define "eks-console-full-access.serviceAccountName" -}} {{- if .Values.serviceAccount.create }} -{{- default (include "eks-console-full.fullname" .) .Values.serviceAccount.name }} +{{- default (include "eks-console-full-access.fullname" .) .Values.serviceAccount.name }} {{- else }} {{- default "default" .Values.serviceAccount.name }} {{- end }} diff --git a/eks-console-full-access/templates/binding-rbac.yaml b/eks-console-full-access/templates/binding-rbac.yaml index 338d35e..7f19abc 100644 --- a/eks-console-full-access/templates/binding-rbac.yaml +++ b/eks-console-full-access/templates/binding-rbac.yaml @@ -1,13 +1,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: {{ include "eks-console-full.fullname" . }}-binding + name: {{ include "eks-console-full-access.fullname" . }}-binding labels: - {{- include "eks-console-full.labels" . | nindent 4 }} + {{- include "eks-console-full-access.labels" . | nindent 4 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: '{{ include "eks-console-full.fullname" . }}-clusterrole' + name: '{{ include "eks-console-full-access.fullname" . }}-clusterrole' subjects: - apiGroup: rbac.authorization.k8s.io kind: Group diff --git a/eks-console-full-access/templates/clusterrole-rbac.yaml b/eks-console-full-access/templates/clusterrole-rbac.yaml index 13d420c..f1613b2 100644 --- a/eks-console-full-access/templates/clusterrole-rbac.yaml +++ b/eks-console-full-access/templates/clusterrole-rbac.yaml @@ -1,9 +1,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: {{ include "eks-console-full.fullname" . }}-clusterrole + name: {{ include "eks-console-full-access.fullname" . }}-clusterrole labels: - {{- include "eks-console-full.labels" . | nindent 4 }} + {{- include "eks-console-full-access.labels" . | nindent 4 }} rules: - apiGroups: - "" diff --git a/eks-console-restricted-access/Chart.yaml b/eks-console-restricted-access/Chart.yaml index 0d3d930..03fca01 100644 --- a/eks-console-restricted-access/Chart.yaml +++ b/eks-console-restricted-access/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -name: eks-console-restricted -description: A Helm chart for Kubernetes +name: eks-console-restricted-access +description: A Helm chart for Kubernetes to install eks console access in aws # A chart can be either an 'application' or a 'library' chart. # # Application charts are a collection of templates that can be packaged into versioned archives diff --git a/eks-console-restricted-access/templates/_helpers.tpl b/eks-console-restricted-access/templates/_helpers.tpl index d8ad369..c1918ee 100644 --- a/eks-console-restricted-access/templates/_helpers.tpl +++ b/eks-console-restricted-access/templates/_helpers.tpl @@ -1,7 +1,7 @@ {{/* Expand the name of the chart. */}} -{{- define "eks-console-restricted.name" -}} +{{- define "eks-console-restricted-access.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 "eks-console-restricted.fullname" -}} +{{- define "eks-console-restricted-access.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 "eks-console-restricted.chart" -}} +{{- define "eks-console-restricted-access.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} {{- end }} {{/* Common labels */}} -{{- define "eks-console-restricted.labels" -}} -helm.sh/chart: {{ include "eks-console-restricted.chart" . }} -{{ include "eks-console-restricted.selectorLabels" . }} +{{- define "eks-console-restricted-access.labels" -}} +helm.sh/chart: {{ include "eks-console-restricted-access.chart" . }} +{{ include "eks-console-restricted-access.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 "eks-console-restricted.selectorLabels" -}} -app.kubernetes.io/name: {{ include "eks-console-restricted.name" . }} +{{- define "eks-console-restricted-access.selectorLabels" -}} +app.kubernetes.io/name: {{ include "eks-console-restricted-access.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} {{/* Create the name of the service account to use */}} -{{- define "eks-console-restricted.serviceAccountName" -}} +{{- define "eks-console-restricted-access.serviceAccountName" -}} {{- if .Values.serviceAccount.create }} -{{- default (include "eks-console-restricted.fullname" .) .Values.serviceAccount.name }} +{{- default (include "eks-console-restricted-access.fullname" .) .Values.serviceAccount.name }} {{- else }} {{- default "default" .Values.serviceAccount.name }} {{- end }} diff --git a/eks-console-restricted-access/templates/clusterrole-binding-rbac.yaml b/eks-console-restricted-access/templates/clusterrole-binding-rbac.yaml index 69c3653..86910b3 100644 --- a/eks-console-restricted-access/templates/clusterrole-binding-rbac.yaml +++ b/eks-console-restricted-access/templates/clusterrole-binding-rbac.yaml @@ -1,13 +1,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: {{ include "eks-console-restricted.fullname" . }}-clusterrole-binding + name: {{ include "eks-console-restricted-access.fullname" . }}-clusterrole-binding labels: - {{- include "eks-console-restricted.labels" . | nindent 4 }} + {{- include "eks-console-restricted-access.labels" . | nindent 4 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: '{{ include "eks-console-restricted.fullname" . }}-clusterrole' + name: '{{ include "eks-console-restricted-access.fullname" . }}-clusterrole' subjects: - apiGroup: rbac.authorization.k8s.io kind: Group diff --git a/eks-console-restricted-access/templates/clusterrole-rbac.yaml b/eks-console-restricted-access/templates/clusterrole-rbac.yaml index b7ebd38..bdb4739 100644 --- a/eks-console-restricted-access/templates/clusterrole-rbac.yaml +++ b/eks-console-restricted-access/templates/clusterrole-rbac.yaml @@ -1,9 +1,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: {{ include "eks-console-restricted.fullname" . }}-clusterrole + name: {{ include "eks-console-restricted-access.fullname" . }}-clusterrole labels: - {{- include "eks-console-restricted.labels" . | nindent 4 }} + {{- include "eks-console-restricted-access.labels" . | nindent 4 }} rules: - apiGroups: - "" diff --git a/eks-console-restricted-access/templates/role-binding-rbac.yaml b/eks-console-restricted-access/templates/role-binding-rbac.yaml index e6dcdda..84cc221 100644 --- a/eks-console-restricted-access/templates/role-binding-rbac.yaml +++ b/eks-console-restricted-access/templates/role-binding-rbac.yaml @@ -1,13 +1,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: {{ include "eks-console-restricted.fullname" . }}-role-binding + name: {{ include "eks-console-restricted-access.fullname" . }}-role-binding labels: - {{- include "eks-console-restricted.labels" . | nindent 4 }} + {{- include "eks-console-restricted-access.labels" . | nindent 4 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: '{{ include "eks-console-restricted.fullname" . }}-role' + name: '{{ include "eks-console-restricted-access.fullname" . }}-role' subjects: - apiGroup: rbac.authorization.k8s.io kind: Group diff --git a/eks-console-restricted-access/templates/role-rbac.yaml b/eks-console-restricted-access/templates/role-rbac.yaml index a2e454e..63dbd0a 100644 --- a/eks-console-restricted-access/templates/role-rbac.yaml +++ b/eks-console-restricted-access/templates/role-rbac.yaml @@ -1,9 +1,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: {{ include "eks-console-restricted.fullname" . }}-role + name: {{ include "eks-console-restricted-access.fullname" . }}-role labels: - {{- include "eks-console-restricted.labels" . | nindent 4 }} + {{- include "eks-console-restricted-access.labels" . | nindent 4 }} rules: - apiGroups: - ""