Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix app labels #42

Merged
merged 2 commits into from
Mar 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config/kustomize/patches/common-labels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ kind: LabelTransformer
metadata:
name: common-labels
labels:
app.giantswarm.io/branch: "{{ .Values.project.branch }}"
app.giantswarm.io/commit: "{{ .Values.project.commit }}"
application.giantswarm.io/branch: "{{ .Values.project.branch }}"
application.giantswarm.io/commit: "{{ .Values.project.commit }}"
app.kubernetes.io/managed-by: "{{ .Release.Service }}"
app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
helm.sh/chart: "{{ .Chart.Name }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ metadata:
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/caip-in-cluster-serving-cert'
controller-gen.kubebuilder.io/version: v0.7.0
labels:
app.giantswarm.io/branch: '{{ .Values.project.branch }}'
app.giantswarm.io/commit: '{{ .Values.project.commit }}'
app.kubernetes.io/instance: '{{ .Release.Name }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
app.kubernetes.io/name: '{{ .Chart.Name }}'
app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
application.giantswarm.io/branch: '{{ .Values.project.branch }}'
application.giantswarm.io/commit: '{{ .Values.project.commit }}'
cluster.x-k8s.io/provider: ipam-in-cluster
helm.sh/chart: '{{ .Chart.Name }}'
name: globalinclusterippools.ipam.cluster.x-k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ metadata:
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/caip-in-cluster-serving-cert'
controller-gen.kubebuilder.io/version: v0.7.0
labels:
app.giantswarm.io/branch: '{{ .Values.project.branch }}'
app.giantswarm.io/commit: '{{ .Values.project.commit }}'
app.kubernetes.io/instance: '{{ .Release.Name }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
app.kubernetes.io/name: '{{ .Chart.Name }}'
app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
application.giantswarm.io/branch: '{{ .Values.project.branch }}'
application.giantswarm.io/commit: '{{ .Values.project.commit }}'
cluster.x-k8s.io/provider: ipam-in-cluster
helm.sh/chart: '{{ .Chart.Name }}'
name: inclusterippools.ipam.cluster.x-k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ Common labels
*/}}
{{- define "labels.common" -}}
{{ include "labels.selector" . }}
app.giantswarm.io/branch: {{ .Values.project.branch | replace "#" "-" | replace "/" "-" | replace "." "-" | trunc 63 | trimSuffix "-" | quote }}
app.giantswarm.io/commit: {{ .Values.project.commit | quote }}
application.giantswarm.io/branch: {{ .Values.project.branch | replace "#" "-" | replace "/" "-" | replace "." "-" | trunc 63 | trimSuffix "-" | quote }}
application.giantswarm.io/commit: {{ .Values.project.commit | quote }}
app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
helm.sh/chart: {{ include "chart" . | quote }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ metadata:
annotations:
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/caip-in-cluster-serving-cert'
labels:
app.giantswarm.io/branch: '{{ .Values.project.branch }}'
app.giantswarm.io/commit: '{{ .Values.project.commit }}'
app.kubernetes.io/instance: '{{ .Release.Name }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
app.kubernetes.io/name: '{{ .Chart.Name }}'
app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
application.giantswarm.io/branch: '{{ .Values.project.branch }}'
application.giantswarm.io/commit: '{{ .Values.project.commit }}'
cluster.x-k8s.io/provider: ipam-in-cluster
helm.sh/chart: '{{ .Chart.Name }}'
name: caip-in-cluster-mutating-webhook-configuration
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ metadata:
annotations:
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/caip-in-cluster-serving-cert'
labels:
app.giantswarm.io/branch: '{{ .Values.project.branch }}'
app.giantswarm.io/commit: '{{ .Values.project.commit }}'
app.kubernetes.io/instance: '{{ .Release.Name }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
app.kubernetes.io/name: '{{ .Chart.Name }}'
app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
application.giantswarm.io/branch: '{{ .Values.project.branch }}'
application.giantswarm.io/commit: '{{ .Values.project.commit }}'
cluster.x-k8s.io/provider: ipam-in-cluster
helm.sh/chart: '{{ .Chart.Name }}'
name: caip-in-cluster-validating-webhook-configuration
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app.giantswarm.io/branch: '{{ .Values.project.branch }}'
app.giantswarm.io/commit: '{{ .Values.project.commit }}'
app.kubernetes.io/instance: '{{ .Release.Name }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
app.kubernetes.io/name: '{{ .Chart.Name }}'
app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
application.giantswarm.io/branch: '{{ .Values.project.branch }}'
application.giantswarm.io/commit: '{{ .Values.project.commit }}'
cluster.x-k8s.io/provider: ipam-in-cluster
control-plane: controller-manager
helm.sh/chart: '{{ .Chart.Name }}'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ apiVersion: cert-manager.io/v1
kind: Certificate
metadata:
labels:
app.giantswarm.io/branch: '{{ .Values.project.branch }}'
app.giantswarm.io/commit: '{{ .Values.project.commit }}'
app.kubernetes.io/instance: '{{ .Release.Name }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
app.kubernetes.io/name: '{{ .Chart.Name }}'
app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
application.giantswarm.io/branch: '{{ .Values.project.branch }}'
application.giantswarm.io/commit: '{{ .Values.project.commit }}'
cluster.x-k8s.io/provider: ipam-in-cluster
helm.sh/chart: '{{ .Chart.Name }}'
name: caip-in-cluster-serving-cert
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ metadata:
name: caip-in-cluster-controller-manager
namespace: {{ .Release.Namespace | quote }}
labels:
app.giantswarm.io/branch: '{{ .Values.project.branch }}'
app.giantswarm.io/commit: '{{ .Values.project.commit }}'
application.giantswarm.io/branch: '{{ .Values.project.branch }}'
application.giantswarm.io/commit: '{{ .Values.project.commit }}'
app.kubernetes.io/instance: '{{ .Release.Name }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
app.kubernetes.io/name: '{{ .Chart.Name }}'
Expand Down Expand Up @@ -40,8 +40,8 @@ metadata:
name: allow-caip-webhooks
namespace: {{ .Release.Namespace | quote }}
labels:
app.giantswarm.io/branch: '{{ .Values.project.branch }}'
app.giantswarm.io/commit: '{{ .Values.project.commit }}'
application.giantswarm.io/branch: '{{ .Values.project.branch }}'
application.giantswarm.io/commit: '{{ .Values.project.commit }}'
app.kubernetes.io/instance: '{{ .Release.Name }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
app.kubernetes.io/name: '{{ .Chart.Name }}'
Expand All @@ -65,8 +65,8 @@ metadata:
name: caip-in-cluster-controller-manager
namespace: {{ .Release.Namespace | quote }}
labels:
app.giantswarm.io/branch: '{{ .Values.project.branch }}'
app.giantswarm.io/commit: '{{ .Values.project.commit }}'
application.giantswarm.io/branch: '{{ .Values.project.branch }}'
application.giantswarm.io/commit: '{{ .Values.project.commit }}'
app.kubernetes.io/instance: '{{ .Release.Name }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
app.kubernetes.io/name: '{{ .Chart.Name }}'
Expand All @@ -88,8 +88,8 @@ metadata:
name: allow-caip-webhooks
namespace: {{ .Release.Namespace | quote }}
labels:
app.giantswarm.io/branch: '{{ .Values.project.branch }}'
app.giantswarm.io/commit: '{{ .Values.project.commit }}'
application.giantswarm.io/branch: '{{ .Values.project.branch }}'
application.giantswarm.io/commit: '{{ .Values.project.commit }}'
app.kubernetes.io/instance: '{{ .Release.Name }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
app.kubernetes.io/name: '{{ .Chart.Name }}'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ data:
metadata:
name: {{ .name }}
labels:
app.giantswarm.io/branch: '{{ $.Values.project.branch }}'
app.giantswarm.io/commit: '{{ $.Values.project.commit }}'
application.giantswarm.io/branch: '{{ $.Values.project.branch }}'
application.giantswarm.io/commit: '{{ $.Values.project.commit }}'
app.kubernetes.io/instance: '{{ $.Release.Name }}'
app.kubernetes.io/managed-by: '{{ $.Release.Service }}'
app.kubernetes.io/name: '{{ $.Chart.Name }}'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ kind: ClusterRole
metadata:
creationTimestamp: null
labels:
app.giantswarm.io/branch: '{{ .Values.project.branch }}'
app.giantswarm.io/commit: '{{ .Values.project.commit }}'
app.kubernetes.io/instance: '{{ .Release.Name }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
app.kubernetes.io/name: '{{ .Chart.Name }}'
app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
application.giantswarm.io/branch: '{{ .Values.project.branch }}'
application.giantswarm.io/commit: '{{ .Values.project.commit }}'
cluster.x-k8s.io/provider: ipam-in-cluster
helm.sh/chart: '{{ .Chart.Name }}'
name: caip-in-cluster-manager-role
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
app.giantswarm.io/branch: '{{ .Values.project.branch }}'
app.giantswarm.io/commit: '{{ .Values.project.commit }}'
app.kubernetes.io/instance: '{{ .Release.Name }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
app.kubernetes.io/name: '{{ .Chart.Name }}'
app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
application.giantswarm.io/branch: '{{ .Values.project.branch }}'
application.giantswarm.io/commit: '{{ .Values.project.commit }}'
cluster.x-k8s.io/provider: ipam-in-cluster
helm.sh/chart: '{{ .Chart.Name }}'
name: caip-in-cluster-metrics-reader
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
app.giantswarm.io/branch: '{{ .Values.project.branch }}'
app.giantswarm.io/commit: '{{ .Values.project.commit }}'
app.kubernetes.io/instance: '{{ .Release.Name }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
app.kubernetes.io/name: '{{ .Chart.Name }}'
app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
application.giantswarm.io/branch: '{{ .Values.project.branch }}'
application.giantswarm.io/commit: '{{ .Values.project.commit }}'
cluster.x-k8s.io/provider: ipam-in-cluster
helm.sh/chart: '{{ .Chart.Name }}'
name: caip-in-cluster-proxy-role
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
app.giantswarm.io/branch: '{{ .Values.project.branch }}'
app.giantswarm.io/commit: '{{ .Values.project.commit }}'
app.kubernetes.io/instance: '{{ .Release.Name }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
app.kubernetes.io/name: '{{ .Chart.Name }}'
app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
application.giantswarm.io/branch: '{{ .Values.project.branch }}'
application.giantswarm.io/commit: '{{ .Values.project.commit }}'
cluster.x-k8s.io/provider: ipam-in-cluster
helm.sh/chart: '{{ .Chart.Name }}'
name: caip-in-cluster-manager-rolebinding
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
app.giantswarm.io/branch: '{{ .Values.project.branch }}'
app.giantswarm.io/commit: '{{ .Values.project.commit }}'
app.kubernetes.io/instance: '{{ .Release.Name }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
app.kubernetes.io/name: '{{ .Chart.Name }}'
app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
application.giantswarm.io/branch: '{{ .Values.project.branch }}'
application.giantswarm.io/commit: '{{ .Values.project.commit }}'
cluster.x-k8s.io/provider: ipam-in-cluster
helm.sh/chart: '{{ .Chart.Name }}'
name: caip-in-cluster-proxy-rolebinding
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
labels:
app.giantswarm.io/branch: '{{ .Values.project.branch }}'
app.giantswarm.io/commit: '{{ .Values.project.commit }}'
app.kubernetes.io/instance: '{{ .Release.Name }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
app.kubernetes.io/name: '{{ .Chart.Name }}'
app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
application.giantswarm.io/branch: '{{ .Values.project.branch }}'
application.giantswarm.io/commit: '{{ .Values.project.commit }}'
cluster.x-k8s.io/provider: ipam-in-cluster
helm.sh/chart: '{{ .Chart.Name }}'
name: caip-in-cluster-leader-election-role
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
app.giantswarm.io/branch: '{{ .Values.project.branch }}'
app.giantswarm.io/commit: '{{ .Values.project.commit }}'
app.kubernetes.io/instance: '{{ .Release.Name }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
app.kubernetes.io/name: '{{ .Chart.Name }}'
app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
application.giantswarm.io/branch: '{{ .Values.project.branch }}'
application.giantswarm.io/commit: '{{ .Values.project.commit }}'
cluster.x-k8s.io/provider: ipam-in-cluster
helm.sh/chart: '{{ .Chart.Name }}'
name: caip-in-cluster-leader-election-rolebinding
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ data:
kind: ConfigMap
metadata:
labels:
app.giantswarm.io/branch: '{{ .Values.project.branch }}'
app.giantswarm.io/commit: '{{ .Values.project.commit }}'
app.kubernetes.io/instance: '{{ .Release.Name }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
app.kubernetes.io/name: '{{ .Chart.Name }}'
app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
application.giantswarm.io/branch: '{{ .Values.project.branch }}'
application.giantswarm.io/commit: '{{ .Values.project.commit }}'
cluster.x-k8s.io/provider: ipam-in-cluster
helm.sh/chart: '{{ .Chart.Name }}'
name: caip-in-cluster-manager-config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ apiVersion: v1
kind: Service
metadata:
labels:
app.giantswarm.io/branch: '{{ .Values.project.branch }}'
app.giantswarm.io/commit: '{{ .Values.project.commit }}'
app.kubernetes.io/instance: '{{ .Release.Name }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
app.kubernetes.io/name: '{{ .Chart.Name }}'
app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
application.giantswarm.io/branch: '{{ .Values.project.branch }}'
application.giantswarm.io/commit: '{{ .Values.project.commit }}'
cluster.x-k8s.io/provider: ipam-in-cluster
control-plane: controller-manager
helm.sh/chart: '{{ .Chart.Name }}'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ apiVersion: v1
kind: Service
metadata:
labels:
app.giantswarm.io/branch: '{{ .Values.project.branch }}'
app.giantswarm.io/commit: '{{ .Values.project.commit }}'
app.kubernetes.io/instance: '{{ .Release.Name }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
app.kubernetes.io/name: '{{ .Chart.Name }}'
app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
application.giantswarm.io/branch: '{{ .Values.project.branch }}'
application.giantswarm.io/commit: '{{ .Values.project.commit }}'
cluster.x-k8s.io/provider: ipam-in-cluster
helm.sh/chart: '{{ .Chart.Name }}'
name: caip-in-cluster-webhook-service
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ apiVersion: v1
kind: ServiceAccount
metadata:
labels:
app.giantswarm.io/branch: '{{ .Values.project.branch }}'
app.giantswarm.io/commit: '{{ .Values.project.commit }}'
app.kubernetes.io/instance: '{{ .Release.Name }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
app.kubernetes.io/name: '{{ .Chart.Name }}'
app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
application.giantswarm.io/branch: '{{ .Values.project.branch }}'
application.giantswarm.io/commit: '{{ .Values.project.commit }}'
cluster.x-k8s.io/provider: ipam-in-cluster
helm.sh/chart: '{{ .Chart.Name }}'
name: caip-in-cluster-controller-manager
Expand Down