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

Add namespace declaration to manifests #140

Merged
merged 1 commit into from
Jan 13, 2025
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
1 change: 1 addition & 0 deletions charts/zabbix/templates/cronjob-hanodes-autoclean.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: batch/v1
kind: CronJob
metadata:
name: {{ template "zabbix.fullname" . }}-nodesclean
namespace: {{ .Release.Namespace }}
labels:
{{- include "zabbix.labels" . | nindent 4 }}
{{- if .Values.zabbixServer.haNodesAutoClean.cronjobLabels }}
Expand Down
1 change: 1 addition & 0 deletions charts/zabbix/templates/daemonset-zabbix-agent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: apps/v1
kind: DaemonSet
metadata:
name: {{ template "zabbix.fullname" . }}-zabbix-agent
namespace: {{ .Release.Namespace }}
labels:
{{- include "zabbix.labels" . | nindent 4 }}
app.kubernetes.io/component: agent
Expand Down
1 change: 1 addition & 0 deletions charts/zabbix/templates/deployment-webdriver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ template "zabbix.fullname" . }}-{{ .Values.zabbixBrowserMonitoring.webdriver.name }}
namespace: {{ .Release.Namespace }}
labels:
{{- include "zabbix.labels" . | nindent 4 }}
app.kubernetes.io/component: webdriver
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ template "zabbix.fullname" . }}-{{ .Values.zabbixJavaGateway.ZBX_JAVAGATEWAY }}
namespace: {{ .Release.Namespace }}
labels:
{{- include "zabbix.labels" . | nindent 4 }}
app.kubernetes.io/component: java-gateway
Expand Down
1 change: 1 addition & 0 deletions charts/zabbix/templates/deployment-zabbix-server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ template "zabbix.fullname" . }}-zabbix-server
namespace: {{ .Release.Namespace }}
labels:
{{- include "zabbix.labels" . | nindent 4 }}
app.kubernetes.io/component: server
Expand Down
1 change: 1 addition & 0 deletions charts/zabbix/templates/deployment-zabbix-web.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ template "zabbix.fullname" . }}-zabbix-web
namespace: {{ .Release.Namespace }}
labels:
{{- include "zabbix.labels" . | nindent 4 }}
app.kubernetes.io/component: web
Expand Down
1 change: 1 addition & 0 deletions charts/zabbix/templates/deployment-zabbix-webservice.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ template "zabbix.fullname" . }}-zabbix-webservice
namespace: {{ .Release.Namespace }}
labels:
{{- include "zabbix.labels" . | nindent 4 }}
app.kubernetes.io/component: webservice
Expand Down
1 change: 1 addition & 0 deletions charts/zabbix/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ $fullName }}
namespace: {{ .Release.Namespace }}
labels:
{{- include "zabbix.labels" . | nindent 4 }}
app.kubernetes.io/component: web
Expand Down
1 change: 1 addition & 0 deletions charts/zabbix/templates/job-create-upgrade-db.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ apiVersion: batch/v1
kind: Job
metadata:
name: {{ template "zabbix.fullname" . }}-create-upgrade-db
namespace: {{ .Release.Namespace }}
labels:
{{- include "zabbix.labels" . | nindent 4 }}
app.kubernetes.io/component: create-upgrade-db
Expand Down
1 change: 1 addition & 0 deletions charts/zabbix/templates/role-ha-helper.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: {{ template "zabbix.fullname" . }}-ha-helper
namespace: {{ .Release.Namespace }}
labels:
{{- include "zabbix.labels" . | nindent 4 }}
{{- if .Values.zabbixServer.zabbixServerHA.role.annotations }}
Expand Down
1 change: 1 addition & 0 deletions charts/zabbix/templates/rolebinding-ha-helper.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: {{ template "zabbix.fullname" . }}-ha-helper
namespace: {{ .Release.Namespace }}
labels:
{{- include "zabbix.labels" . | nindent 4 }}
{{- if .Values.zabbixServer.zabbixServerHA.roleBinding.annotations }}
Expand Down
1 change: 1 addition & 0 deletions charts/zabbix/templates/secret-db-access.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: v1
kind: Secret
metadata:
name: {{ template "zabbix.fullname" . }}-db-access
namespace: {{ .Release.Namespace }}
annotations:
"helm.sh/resource-policy": keep
labels:
Expand Down
8 changes: 8 additions & 0 deletions charts/zabbix/templates/service.yaml
aeciopires marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ template "zabbix.fullname" . }}-zabbix-server
namespace: {{ .Release.Namespace }}
labels:
{{- include "zabbix.labels" . | nindent 4 }}
app.kubernetes.io/component: server
Expand Down Expand Up @@ -63,6 +64,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ template "zabbix.fullname" . }}-zabbix-agent
namespace: {{ .Release.Namespace }}
labels:
{{- include "zabbix.labels" . | nindent 4 }}
app.kubernetes.io/component: agent
Expand Down Expand Up @@ -115,6 +117,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ template "zabbix.fullname" . }}-zabbix-web
namespace: {{ .Release.Namespace }}
labels:
{{- include "zabbix.labels" . | nindent 4 }}
app.kubernetes.io/component: web
Expand Down Expand Up @@ -167,6 +170,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ template "zabbix.fullname" . }}-zabbix-webservice
namespace: {{ .Release.Namespace }}
labels:
{{- include "zabbix.labels" . | nindent 4 }}
app.kubernetes.io/component: webservice
Expand Down Expand Up @@ -198,6 +202,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ template "zabbix.fullname" . }}-zabbix-proxy
namespace: {{ .Release.Namespace }}
labels:
{{- include "zabbix.labels" . | nindent 4 }}
app.kubernetes.io/component: proxy
Expand Down Expand Up @@ -250,6 +255,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ template "zabbix.fullname" . }}-postgresql
namespace: {{ .Release.Namespace }}
labels:
{{- include "zabbix.labels" . | nindent 4 }}
app.kubernetes.io/component: postgresql
Expand Down Expand Up @@ -281,6 +287,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ template "zabbix.fullname" . }}-java-gateway
namespace: {{ .Release.Namespace }}
labels:
{{- include "zabbix.labels" . | nindent 4 }}
app.kubernetes.io/component: java-gateway
Expand Down Expand Up @@ -333,6 +340,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ template "zabbix.fullname" . }}-{{ .Values.zabbixBrowserMonitoring.webdriver.name }}
namespace: {{ .Release.Namespace }}
labels:
{{- include "zabbix.labels" . | nindent 4 }}
app.kubernetes.io/component: webdriver
Expand Down
1 change: 1 addition & 0 deletions charts/zabbix/templates/serviceaccount-ha-helper.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ template "zabbix.fullname" . }}-ha-helper
namespace: {{ .Release.Namespace }}
labels:
{{- include "zabbix.labels" . | nindent 4 }}
{{- if .Values.zabbixServer.zabbixServerHA.serviceAccount.annotations }}
Expand Down
1 change: 1 addition & 0 deletions charts/zabbix/templates/serviceaccount.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ imagePullSecrets:
automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
metadata:
name: {{ template "zabbix.serviceAccountName" . }}
namespace: {{ .Release.Namespace }}
{{- with .Values.serviceAccount.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
Expand Down
1 change: 1 addition & 0 deletions charts/zabbix/templates/statefulset-postgresql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ apiVersion: apps/v1
kind: StatefulSet
metadata:
name: {{ template "zabbix.fullname" . }}-postgresql
namespace: {{ .Release.Namespace }}
labels:
{{- include "zabbix.labels" . | nindent 4 }}
app.kubernetes.io/component: postgresql
Expand Down
1 change: 1 addition & 0 deletions charts/zabbix/templates/statefulset-zabbix-proxy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ apiVersion: apps/v1
kind: StatefulSet
metadata:
name: {{ template "zabbix.fullname" . }}-zabbix-proxy
namespace: {{ .Release.Namespace }}
labels:
{{- include "zabbix.labels" . | nindent 4 }}
app.kubernetes.io/component: proxy
Expand Down
1 change: 1 addition & 0 deletions charts/zabbix/templates/tests/test-server-connection.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: batch/v1
kind: Job
metadata:
name: {{ template "zabbix.fullname" . }}-test-server-connection
namespace: {{ .Release.Namespace }}
labels:
app: {{ template "zabbix.fullname" . }}-test-server-connection
app.kubernetes.io/name: test-server-connection
Expand Down
1 change: 1 addition & 0 deletions charts/zabbix/templates/tests/test-web-connection.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: batch/v1
kind: Job
metadata:
name: {{ template "zabbix.fullname" . }}-test-web-connection
namespace: {{ .Release.Namespace }}
labels:
app: {{ template "zabbix.fullname" . }}-test-web-connection
app.kubernetes.io/name: test-web-connection
Expand Down