From 135980d8afb84f722ea0a15b6fb6c11ea559d7bf Mon Sep 17 00:00:00 2001 From: shreddedbacon Date: Fri, 7 Oct 2022 13:46:03 +1100 Subject: [PATCH 1/2] chore: remove old kubernetes-build-deploy serviceaccount --- charts/lagoon-remote/Chart.yaml | 2 +- charts/lagoon-remote/templates/_helpers.tpl | 39 ------------------- ...netes-build-deploy.clusterrolebinding.yaml | 14 ------- ...ubernetes-build-deploy.serviceaccount.yaml | 10 ----- charts/lagoon-remote/values.yaml | 7 ---- 5 files changed, 1 insertion(+), 71 deletions(-) delete mode 100644 charts/lagoon-remote/templates/kubernetes-build-deploy.clusterrolebinding.yaml delete mode 100644 charts/lagoon-remote/templates/kubernetes-build-deploy.serviceaccount.yaml diff --git a/charts/lagoon-remote/Chart.yaml b/charts/lagoon-remote/Chart.yaml index 21a05c8a..e8aeec2f 100644 --- a/charts/lagoon-remote/Chart.yaml +++ b/charts/lagoon-remote/Chart.yaml @@ -19,7 +19,7 @@ type: application # This is the chart version. This version number should be incremented each # time you make changes to the chart and its templates, including the app # version. -version: 0.63.0 +version: 1.0.0 dependencies: - name: lagoon-build-deploy diff --git a/charts/lagoon-remote/templates/_helpers.tpl b/charts/lagoon-remote/templates/_helpers.tpl index 2597b3f1..32b7d914 100644 --- a/charts/lagoon-remote/templates/_helpers.tpl +++ b/charts/lagoon-remote/templates/_helpers.tpl @@ -83,45 +83,6 @@ app.kubernetes.io/component: {{ include "lagoon-remote.dockerHost.fullname" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} - - -{{/* -Create the name of the service account to use for kubernetesBuildDeploy. -*/}} -{{- define "lagoon-remote.kubernetesBuildDeploy.serviceAccountName" -}} -{{- default (include "lagoon-remote.kubernetesBuildDeploy.fullname" .) .Values.kubernetesBuildDeploy.serviceAccount.name }} -{{- end }} - -{{/* -Create a default fully qualified app name for kubernetesBuildDeploy. -*/}} -{{- define "lagoon-remote.kubernetesBuildDeploy.fullname" -}} -{{- include "lagoon-remote.fullname" . }}-kubernetes-build-deploy -{{- end }} - -{{/* -Common labels kubernetesBuildDeploy. -*/}} -{{- define "lagoon-remote.kubernetesBuildDeploy.labels" -}} -helm.sh/chart: {{ include "lagoon-remote.chart" . }} -{{ include "lagoon-remote.kubernetesBuildDeploy.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels kubernetesBuildDeploy. -*/}} -{{- define "lagoon-remote.kubernetesBuildDeploy.selectorLabels" -}} -app.kubernetes.io/name: {{ include "lagoon-remote.name" . }} -app.kubernetes.io/component: {{ include "lagoon-remote.kubernetesBuildDeploy.fullname" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - - - {{/* Create the name of the service account to use for sshPortal. */}} diff --git a/charts/lagoon-remote/templates/kubernetes-build-deploy.clusterrolebinding.yaml b/charts/lagoon-remote/templates/kubernetes-build-deploy.clusterrolebinding.yaml deleted file mode 100644 index a7e08f51..00000000 --- a/charts/lagoon-remote/templates/kubernetes-build-deploy.clusterrolebinding.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: {{ include "lagoon-remote.kubernetesBuildDeploy.fullname" . }} - labels: - {{- include "lagoon-remote.kubernetesBuildDeploy.labels" . | nindent 4 }} -subjects: -- kind: ServiceAccount - name: {{ include "lagoon-remote.kubernetesBuildDeploy.serviceAccountName" . }} - namespace: {{ .Release.Namespace | quote }} -roleRef: - kind: ClusterRole - name: cluster-admin - apiGroup: rbac.authorization.k8s.io diff --git a/charts/lagoon-remote/templates/kubernetes-build-deploy.serviceaccount.yaml b/charts/lagoon-remote/templates/kubernetes-build-deploy.serviceaccount.yaml deleted file mode 100644 index 01136b72..00000000 --- a/charts/lagoon-remote/templates/kubernetes-build-deploy.serviceaccount.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "lagoon-remote.kubernetesBuildDeploy.serviceAccountName" . }} - labels: - {{- include "lagoon-remote.kubernetesBuildDeploy.labels" . | nindent 4 }} - {{- with .Values.kubernetesBuildDeploy.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} diff --git a/charts/lagoon-remote/values.yaml b/charts/lagoon-remote/values.yaml index f91ee04b..2bfdaab4 100644 --- a/charts/lagoon-remote/values.yaml +++ b/charts/lagoon-remote/values.yaml @@ -103,13 +103,6 @@ dockerHost: effect: PreferNoSchedule operator: Exists -# this account is used by the legacy Lagoon kubernetes build deploy system. -kubernetesBuildDeploy: - serviceAccount: - # The name of the service account to use. - # If not set, a name is generated using the fullname template. - name: - # sshPortal is an optional service providing low-latency SSH connectivity to # Lagoon environments. sshPortal: From ac51b9a0421e9b3f343b8a5318654175dc2bf014 Mon Sep 17 00:00:00 2001 From: shreddedbacon Date: Mon, 5 Jun 2023 13:14:29 +1000 Subject: [PATCH 2/2] chore: update artifactub change --- charts/lagoon-remote/Chart.yaml | 4 ++-- charts/lagoon-remote/templates/_helpers.tpl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/lagoon-remote/Chart.yaml b/charts/lagoon-remote/Chart.yaml index caa4be1b..fde1daca 100644 --- a/charts/lagoon-remote/Chart.yaml +++ b/charts/lagoon-remote/Chart.yaml @@ -44,5 +44,5 @@ dependencies: # Valid supported kinds are added, changed, deprecated, removed, fixed and security annotations: artifacthub.io/changes: | - - kind: changed - description: update lagoon-build-deploy subchart to 0.22.0 + - kind: removed + description: removed old kubernetes build deploy references diff --git a/charts/lagoon-remote/templates/_helpers.tpl b/charts/lagoon-remote/templates/_helpers.tpl index 9da7dca5..a0fd1b6f 100644 --- a/charts/lagoon-remote/templates/_helpers.tpl +++ b/charts/lagoon-remote/templates/_helpers.tpl @@ -98,7 +98,7 @@ Create a default fully qualified app name for storageCalculator. {{- end }} {{/* -Common labels storageCalculator.` +Common labels storageCalculator. */}} {{- define "lagoon-remote.storageCalculator.labels" -}} helm.sh/chart: {{ include "lagoon-remote.chart" . }}