Merge remote-tracking branch 'origin/add-kube-labels' into staging

CHANGELOG.md

@@ -4,6 +4,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ---
 
+## [1.0.7]
+
+* Added Kubernetes labelgit s to all objects created by umbrella
+
 ## [1.0.6]
 
 * Added [HAProxy Addon](https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/haproxy)

base/gitrepository.yaml

@@ -11,4 +11,4 @@ spec:
   interval: 10m
   url: https://repo1.dsop.io/platform-one/big-bang/umbrella.git
   ref:
-    tag: 1.0.5
\ No newline at end of file
+    tag: 1.0.7
\ No newline at end of file

chart/Chart.yaml

 apiVersion: v2
 name: bigbang
-version: 1.0.6
+version: 1.0.7

chart/templates/_helpers.tpl

@@ -71,4 +71,14 @@ Build common set of file extensions to include/exclude
     /**/*.md
     /**/*.txt
     /**/*.sh
+{{- end -}}
+
+{{/*
+Common labels for all objects
+*/}}
+{{- define "commonLabels" -}}
+app.kubernetes.io/instance: "{{ .Release.Name }}"
+app.kubernetes.io/version: "{{ .Chart.Version }}"
+app.kubernetes.io/part-of: "bigbang"
+app.kubernetes.io/managed-by: "flux"
 {{- end -}}
\ No newline at end of file

chart/templates/argocd/argocd-helmrelease.yaml

@@ -4,6 +4,10 @@ kind: HelmRelease
 metadata:
   name: argocd
   namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: argocd
+    app.kubernetes.io/component: "core"
+    {{- include "commonLabels" . | nindent 4}}
 spec:
   targetNamespace: argocd
   chart:

chart/templates/argocd/gitrepository.yaml

@@ -4,6 +4,10 @@ kind: GitRepository
 metadata:
   name: argocd
   namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: argocd
+    app.kubernetes.io/component: "core"
+    {{- include "commonLabels" . | nindent 4}}
 spec:
   interval: {{ .Values.flux.interval }}
   url: {{ .Values.addons.argocd.git.repo }}

chart/templates/argocd/namespace.yaml

@@ -3,7 +3,9 @@ apiVersion: v1
 kind: Namespace
 metadata:
   labels:
-    app: {{ .Release.Name }}-argocd
+    app.kubernetes.io/name: authservice
+    app.kubernetes.io/component: "core"
+    {{- include "commonLabels" . | nindent 4}}
   name: argocd
 
 ---

chart/templates/authservice/authservice-helmrelease.yaml

@@ -4,6 +4,10 @@ kind: HelmRelease
 metadata:
   name: authservice
   namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: authservice
+    app.kubernetes.io/component: "core"
+    {{- include "commonLabels" . | nindent 4}}
 spec:
   targetNamespace: authservice
   chart:

chart/templates/authservice/gitrepository.yaml

@@ -4,6 +4,10 @@ kind: GitRepository
 metadata:
   name: authservice
   namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: authservice
+    app.kubernetes.io/component: "core"
+    {{- include "commonLabels" . | nindent 4}}
 spec:
   interval: {{ .Values.flux.interval }}
   url: {{ .Values.addons.authservice.git.repo }}

chart/templates/clusterauditor/clusterauditor-helmrelease.yaml

@@ -4,6 +4,10 @@ kind: HelmRelease
 metadata:
   name: cluster-auditor
   namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: cluster-auditor
+    app.kubernetes.io/component: "core"
+    {{- include "commonLabels" . | nindent 4}}
 spec:
   targetNamespace: logging
   chart:

chart/templates/clusterauditor/gitrepository.yaml

@@ -4,6 +4,10 @@ kind: GitRepository
 metadata:
   name: cluster-auditor
   namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: cluster-auditor
+    app.kubernetes.io/component: "core"
+    {{- include "commonLabels" . | nindent 4}}
 spec:
   interval: {{ .Values.flux.interval }}
   url: {{ .Values.clusterAuditor.git.repo }}

chart/templates/clusterauditor/namespace.yaml

-{{- if .Values.gatekeeper.enabled }}
-apiVersion: v1
-kind: Namespace
-metadata:
-  labels:
-    app: {{ .Release.Name }}-cluster-auditor
-  name: cluster-auditor
-
----
-{{- if ( include "imagePullSecret" . ) }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: private-registry
-  namespace: cluster-auditor
-type: kubernetes.io/dockerconfigjson
-data:
-  .dockerconfigjson: {{ template "imagePullSecret" . }}
-{{- end }}
-{{- end }}
\ No newline at end of file

chart/templates/gatekeeper/gatekeeper-helmrelease.yaml

@@ -4,6 +4,10 @@ kind: HelmRelease
 metadata:
   name: gatekeeper
   namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: gatekeeper
+    app.kubernetes.io/component: "core"
+    {{- include "commonLabels" . | nindent 4}}
 spec:
   targetNamespace: gatekeeper-system
   chart:

chart/templates/gatekeeper/gitrepository.yaml

@@ -4,6 +4,10 @@ kind: GitRepository
 metadata:
   name: gatekeeper
   namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: gatekeeper
+    app.kubernetes.io/component: "core"
+    {{- include "commonLabels" . | nindent 4}}
 spec:
   interval: {{ .Values.flux.interval }}
   url: {{ .Values.gatekeeper.git.repo }}

chart/templates/gatekeeper/namespace.yaml

@@ -4,9 +4,11 @@ kind: Namespace
 metadata:
   labels:
     admission.gatekeeper.sh/ignore: no-self-managing
-    app: {{ .Release.Name }}-gatekeeper
     control-plane: controller-manager
     gatekeeper.sh/system: "yes"
+    app.kubernetes.io/name: gatekeeper
+    app.kubernetes.io/component: "core"
+    {{- include "commonLabels" . | nindent 4}}
   name: gatekeeper-system
 
 ---
@@ -16,6 +18,10 @@ kind: Secret
 metadata:
   name: private-registry
   namespace: gatekeeper-system
+  labels:
+    app.kubernetes.io/name: gatekeeper
+    app.kubernetes.io/component: "core"
+    {{- include "commonLabels" . | nindent 4}}
 type: kubernetes.io/dockerconfigjson
 data:
   .dockerconfigjson: {{ template "imagePullSecret" . }}

chart/templates/gitlab/gitrepository.yaml

@@ -4,6 +4,10 @@ kind: GitRepository
 metadata:
   name: gitlab
   namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: gitlab
+    app.kubernetes.io/component: "developer-tools"
+    {{- include "commonLabels" . | nindent 4}}
 spec:
   interval: {{ .Values.flux.interval }}
   url: {{ .Values.addons.gitlab.git.repo }}

chart/templates/gitlab/helmrelease.yaml

@@ -4,6 +4,10 @@ kind: HelmRelease
 metadata:
   name: gitlab
   namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: gitlab
+    app.kubernetes.io/component: "developer-tools"
+    {{- include "commonLabels" . | nindent 4}}
 spec:
   releaseName: gitlab
   targetNamespace: gitlab

chart/templates/gitlab/namespace.yaml

@@ -3,7 +3,9 @@ apiVersion: v1
 kind: Namespace
 metadata:
   labels:
-    app: gitlab
+    app.kubernetes.io/name: gitlab
+    app.kubernetes.io/component: "developer-tools"
+    {{- include "commonLabels" . | nindent 4}}
   name: gitlab
 ---
 {{- if ( include "imagePullSecret" . ) }}
@@ -12,6 +14,10 @@ kind: Secret
 metadata:
   name: private-registry
   namespace: gitlab
+  labels:
+    app.kubernetes.io/name: gitlab
+    app.kubernetes.io/component: "developer-tools"
+    {{- include "commonLabels" . | nindent 4}}
 type: kubernetes.io/dockerconfigjson
 data:
   .dockerconfigjson: {{ template "imagePullSecret" . }}

chart/templates/istio/controlplane/gitrepository.yaml

@@ -4,6 +4,10 @@ kind: GitRepository
 metadata:
   name: istio-controlplane
   namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: istio-controlplane
+    app.kubernetes.io/component: "core"
+    {{- include "commonLabels" . | nindent 4}}
 spec:
   interval: {{ .Values.flux.interval }}
   url: {{ .Values.istio.git.repo }}

chart/templates/istio/controlplane/istio-controlplane-helmrelease.yaml

@@ -4,6 +4,10 @@ kind: HelmRelease
 metadata:
   name: istio
   namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: istio-controlplane
+    app.kubernetes.io/component: "core"
+    {{- include "commonLabels" . | nindent 4}}
 spec:
   targetNamespace: istio-system
   chart: