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.

Sign up for GitHub

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

http-add-on: add app.kubernetes.io/name label #740

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+51 −11
Open

http-add-on: add app.kubernetes.io/name label #740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a07936
http-add-on: add `app.kubernetes.io/name` label
zroubalik Feb 25, 2025
318c8f8
fix: unify component label for interceptor services
zroubalik Feb 25, 2025
1b607d9
Merge branch 'main' into hal
zroubalik Feb 25, 2025
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
3 changes: 3 additions & 0 deletions http-add-on/templates/interceptor/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,21 @@ kind: Deployment
metadata:
labels:
app.kubernetes.io/component: interceptor
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.labels" . | indent 4 }}
name: {{ .Chart.Name }}-interceptor
namespace: {{ .Release.Namespace }}
spec:
selector:
matchLabels:
app.kubernetes.io/component: interceptor
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.matchLabels" . | indent 6 }}
template:
metadata:
labels:
app.kubernetes.io/component: interceptor
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.labels" . | indent 8 }}
spec:
imagePullSecrets:
Expand Down
2 changes: 2 additions & 0 deletions http-add-on/templates/interceptor/poddisruptionbudget.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@ kind: PodDisruptionBudget
metadata:
labels:
app.kubernetes.io/component: interceptor
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.labels" . | indent 4 }}
name: {{ .Chart.Name }}-interceptor
namespace: {{ .Release.Namespace }}
spec:
selector:
matchLabels:
app.kubernetes.io/component: interceptor
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.matchLabels" . | indent 6 }}
{{- if .Values.interceptor.pdb.minAvailable }}
minAvailable: {{ .Values.interceptor.pdb.minAvailable }}
Expand Down
5 changes: 4 additions & 1 deletion http-add-on/templates/interceptor/rbac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
app.kubernetes.io/component: interceptor
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.labels" . | indent 4 }}
name: {{ .Chart.Name }}-interceptor
rules:
Expand Down Expand Up @@ -38,7 +40,8 @@ metadata:
keda.sh/addon: {{ .Chart.Name }}
app: {{ .Chart.Name }}
name: {{ .Chart.Name }}-interceptor
app.kubernetes.io/name: {{ .Chart.Name }}-interceptor
app.kubernetes.io/component: interceptor
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.labels" . | indent 4 }}
name: {{ .Chart.Name }}-interceptor
roleRef:
Expand Down
4 changes: 3 additions & 1 deletion http-add-on/templates/interceptor/scaledobject.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ kind: ScaledObject
metadata:
name: "{{ .Chart.Name }}-interceptor"
namespace: {{ .Release.Namespace }}
labels:
labels:
app.kubernetes.io/component: interceptor
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.labels" . | indent 4 }}
spec:
minReplicaCount: {{ .Values.interceptor.replicas.min }}
Expand Down
4 changes: 3 additions & 1 deletion http-add-on/templates/interceptor/service-admin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ apiVersion: v1
kind: Service
metadata:
labels:
app.kubernetes.io/component: interceptor-admin
app.kubernetes.io/component: interceptor
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.labels" . | indent 4 }}
name: "{{ .Chart.Name }}-{{ .Values.interceptor.admin.service }}"
namespace: {{ .Release.Namespace }}
Expand All @@ -13,4 +14,5 @@ spec:
targetPort: admin
selector:
app.kubernetes.io/component: interceptor
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.matchLabels" . | indent 4 }}
4 changes: 3 additions & 1 deletion http-add-on/templates/interceptor/service-proxy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ apiVersion: v1
kind: Service
metadata:
labels:
app.kubernetes.io/component: interceptor-proxy
app.kubernetes.io/component: interceptor
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.labels" . | indent 4 }}
name: "{{ .Chart.Name }}-{{ .Values.interceptor.proxy.service }}"
namespace: {{ .Release.Namespace }}
Expand All @@ -18,4 +19,5 @@ spec:
{{- end }}
selector:
app.kubernetes.io/component: interceptor
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.matchLabels" . | indent 4 }}
1 change: 1 addition & 0 deletions http-add-on/templates/interceptor/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: ServiceAccount
metadata:
labels:
app.kubernetes.io/component: interceptor
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.labels" . | indent 4 }}
name: {{ .Chart.Name }}-interceptor
namespace: {{ .Release.Namespace }}
3 changes: 3 additions & 0 deletions http-add-on/templates/operator/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ kind: Deployment
metadata:
labels:
app.kubernetes.io/component: operator
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.labels" . | indent 4 }}
name: {{ .Chart.Name }}-controller-manager
namespace: {{ .Release.Namespace }}
Expand All @@ -12,11 +13,13 @@ spec:
selector:
matchLabels:
app.kubernetes.io/component: operator
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.matchLabels" . | indent 6 }}
template:
metadata:
labels:
app.kubernetes.io/component: operator
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.labels" . | indent 8 }}
spec:
imagePullSecrets:
Expand Down
20 changes: 14 additions & 6 deletions http-add-on/templates/operator/rbac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
labels:
app.kubernetes.io/component: operator
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.labels" . | indent 4 }}
name: {{ .Chart.Name }}-role
namespace: {{ .Release.Namespace }}
Expand Down Expand Up @@ -35,7 +37,8 @@ metadata:
keda.sh/addon: {{ .Chart.Name }}
app: {{ .Chart.Name }}
name: {{ .Chart.Name }}-role
app.kubernetes.io/name: {{ .Chart.Name }}-role
app.kubernetes.io/component: operator
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.labels" . | indent 4 }}
name: {{ .Chart.Name }}-role
rules:
Expand Down Expand Up @@ -86,7 +89,8 @@ metadata:
keda.sh/addon: {{ .Chart.Name }}
app: {{ .Chart.Name }}
name: {{ .Chart.Name }}-proxy-role
app.kubernetes.io/name: {{ .Chart.Name }}-proxy-role
app.kubernetes.io/component: operator
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.labels" . | indent 4 }}
name: {{ .Chart.Name }}-proxy-role
rules:
Expand All @@ -107,7 +111,8 @@ metadata:
keda.sh/addon: {{ .Chart.Name }}
app: {{ .Chart.Name }}
name: {{ .Chart.Name }}-metrics-reader
app.kubernetes.io/name: {{ .Chart.Name }}-metrics-reader
app.kubernetes.io/component: operator
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.labels" . | indent 4 }}
name: {{ .Chart.Name }}-metrics-reader
rules:
Expand All @@ -124,7 +129,8 @@ metadata:
keda.sh/addon: {{ .Chart.Name }}
app: {{ .Chart.Name }}
name: {{ .Chart.Name }}-role-binding
app.kubernetes.io/name: {{ .Chart.Name }}-role-binding
app.kubernetes.io/component: operator
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.labels" . | indent 4 }}
name: {{ .Chart.Name }}-role-rolebinding
namespace: {{ .Release.Namespace }}
Expand All @@ -145,7 +151,8 @@ metadata:
keda.sh/addon: {{ .Chart.Name }}
app: {{ .Chart.Name }}
name: {{ .Chart.Name }}-rolebinding
app.kubernetes.io/name: {{ .Chart.Name }}-rolebinding
app.kubernetes.io/component: operator
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.labels" . | indent 4 }}
name: {{ .Chart.Name }}-rolebinding
roleRef:
Expand All @@ -165,7 +172,8 @@ metadata:
keda.sh/addon: {{ .Chart.Name }}
app: {{ .Chart.Name }}
name: {{ .Chart.Name }}-rolebinding
app.kubernetes.io/name: {{ .Chart.Name }}-rolebinding
app.kubernetes.io/component: operator
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.labels" . | indent 4 }}
name: {{ .Chart.Name }}-proxy-rolebinding
roleRef:
Expand Down
2 changes: 2 additions & 0 deletions http-add-on/templates/operator/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ kind: Service
metadata:
labels:
app.kubernetes.io/component: operator
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.labels" . | indent 4 }}
name: {{ .Chart.Name }}-controller-manager-metrics-service
namespace: {{ .Release.Namespace }}
Expand All @@ -14,5 +15,6 @@ spec:
targetPort: metrics
selector:
app.kubernetes.io/component: operator
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.matchLabels" . | indent 4 }}
{{- end }}
1 change: 1 addition & 0 deletions http-add-on/templates/operator/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ kind: ServiceAccount
metadata:
labels:
app.kubernetes.io/component: operator
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.labels" . | indent 4 }}
name: {{ .Chart.Name }}
namespace: {{ .Release.Namespace }}
Expand Down
2 changes: 2 additions & 0 deletions http-add-on/templates/rbac-aggregateclusterroles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ kind: ClusterRole
metadata:
name: {{ .Chart.Name }}-edit
labels:
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.labels" . | indent 4 }}
rbac.authorization.k8s.io/aggregate-to-admin: "true"
rbac.authorization.k8s.io/aggregate-to-edit: "true"
Expand All @@ -27,6 +28,7 @@ kind: ClusterRole
metadata:
name: {{ .Chart.Name }}-view
labels:
app.kubernetes.io/name: http-add-on
rbac.authorization.k8s.io/aggregate-to-admin: "true"
rbac.authorization.k8s.io/aggregate-to-edit: "true"
rbac.authorization.k8s.io/aggregate-to-view: "true"
Expand Down
3 changes: 3 additions & 0 deletions http-add-on/templates/scaler/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: Deployment
metadata:
labels:
app.kubernetes.io/component: scaler
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.labels" . | indent 4 }}
name: {{ .Chart.Name }}-external-scaler
namespace: {{ .Release.Namespace }}
Expand All @@ -11,11 +12,13 @@ spec:
selector:
matchLabels:
app.kubernetes.io/component: scaler
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.matchLabels" . | indent 6 }}
template:
metadata:
labels:
app.kubernetes.io/component: scaler
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.labels" . | indent 8 }}
spec:
imagePullSecrets:
Expand Down
5 changes: 4 additions & 1 deletion http-add-on/templates/scaler/rbac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
app.kubernetes.io/component: scaler
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.labels" . | indent 4 }}
name: {{ .Chart.Name }}-external-scaler
rules:
Expand Down Expand Up @@ -30,7 +32,8 @@ metadata:
keda.sh/addon: {{ .Chart.Name }}
app: {{ .Chart.Name }}
name: {{ .Chart.Name }}-external-scaler
app.kubernetes.io/name: {{ .Chart.Name }}-external-scaler
app.kubernetes.io/component: scaler
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.labels" . | indent 4 }}
name: {{ .Chart.Name }}-external-scaler
roleRef:
Expand Down
2 changes: 2 additions & 0 deletions http-add-on/templates/scaler/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: Service
metadata:
labels:
app.kubernetes.io/component: scaler
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.labels" . | indent 4 }}
name: "{{ .Chart.Name }}-{{ .Values.scaler.service }}"
namespace: {{ .Release.Namespace }}
Expand All @@ -13,4 +14,5 @@ spec:
targetPort: grpc
selector:
app.kubernetes.io/component: scaler
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.matchLabels" . | indent 4 }}
1 change: 1 addition & 0 deletions http-add-on/templates/scaler/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: ServiceAccount
metadata:
labels:
app.kubernetes.io/component: scaler
app.kubernetes.io/name: http-add-on
{{- include "keda-http-add-on.labels" . | indent 4 }}
name: {{ .Chart.Name }}-external-scaler
namespace: {{ .Release.Namespace }}