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

support namespaces with just numerals in their names #284

Merged
merged 1 commit into from
Sep 26, 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
2 changes: 1 addition & 1 deletion kiali-operator/templates/clusterrolebinding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
subjects:
- kind: ServiceAccount
name: {{ include "kiali-operator.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: "{{ .Release.Namespace }}"
roleRef:
kind: ClusterRole
name: {{ include "kiali-operator.fullname" . }}
Expand Down
4 changes: 2 additions & 2 deletions kiali-operator/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "kiali-operator.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: "{{ .Release.Namespace }}"
labels:
{{- include "kiali-operator.labels" . | nindent 4 }}
spec:
Expand All @@ -14,7 +14,7 @@ spec:
template:
metadata:
name: {{ include "kiali-operator.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: "{{ .Release.Namespace }}"
labels:
# required for the operator SDK metric service selector
name: {{ include "kiali-operator.fullname" . }}
Expand Down
4 changes: 2 additions & 2 deletions kiali-operator/templates/kiali-cr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ apiVersion: kiali.io/v1alpha1
kind: Kiali
metadata:
{{- if .Values.watchNamespace }}
namespace: {{ .Values.watchNamespace }}
namespace: "{{ .Values.watchNamespace }}"
{{- else if .Values.cr.namespace }}
namespace: {{ .Values.cr.namespace }}
namespace: "{{ .Values.cr.namespace }}"
{{- end }}
name: {{ .Values.cr.name }}
labels:
Expand Down
2 changes: 1 addition & 1 deletion kiali-operator/templates/serviceaccount.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ include "kiali-operator.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: "{{ .Release.Namespace }}"
labels:
{{- include "kiali-operator.labels" . | nindent 4 }}
{{- if .Values.image.pullSecrets }}
Expand Down
2 changes: 1 addition & 1 deletion kiali-server/templates/cabundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ include "kiali-server.fullname" . }}-cabundle
namespace: {{ .Release.Namespace }}
namespace: "{{ .Release.Namespace }}"
labels:
{{- include "kiali-server.labels" . | nindent 4 }}
annotations:
Expand Down
2 changes: 1 addition & 1 deletion kiali-server/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ include "kiali-server.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: "{{ .Release.Namespace }}"
labels:
{{- include "kiali-server.labels" . | nindent 4 }}
{{- if .Values.deployment.configmap_annotations }}
Expand Down
2 changes: 1 addition & 1 deletion kiali-server/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "kiali-server.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: "{{ .Release.Namespace }}"
labels:
{{- include "kiali-server.labels" . | nindent 4 }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion kiali-server/templates/hpa.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: {{ .Values.deployment.hpa.api_version }}
kind: HorizontalPodAutoscaler
metadata:
name: {{ include "kiali-server.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: "{{ .Release.Namespace }}"
labels:
{{- include "kiali-server.labels" . | nindent 4 }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion kiali-server/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
name: {{ include "kiali-server.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: "{{ .Release.Namespace }}"
labels:
{{- if .Values.deployment.ingress.additional_labels }}
{{- toYaml .Values.deployment.ingress.additional_labels | nindent 4 }}
Expand Down
2 changes: 1 addition & 1 deletion kiali-server/templates/oauth.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ apiVersion: oauth.openshift.io/v1
kind: OAuthClient
metadata:
name: {{ include "kiali-server.fullname" . }}-{{ .Release.Namespace }}
namespace: {{ .Release.Namespace }}
namespace: "{{ .Release.Namespace }}"
labels:
{{- include "kiali-server.labels" . | nindent 4 }}
redirectURIs:
Expand Down
2 changes: 1 addition & 1 deletion kiali-server/templates/role-controlplane.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: {{ include "kiali-server.fullname" . }}-controlplane
namespace: {{ include "kiali-server.istio_namespace" . }}
namespace: "{{ include "kiali-server.istio_namespace" . }}"
labels:
{{- include "kiali-server.labels" . | nindent 4 }}
rules:
Expand Down
4 changes: 2 additions & 2 deletions kiali-server/templates/rolebinding-controlplane.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: {{ include "kiali-server.fullname" . }}-controlplane
namespace: {{ include "kiali-server.istio_namespace" . }}
namespace: "{{ include "kiali-server.istio_namespace" . }}"
labels:
{{- include "kiali-server.labels" . | nindent 4 }}
roleRef:
Expand All @@ -13,5 +13,5 @@ roleRef:
subjects:
- kind: ServiceAccount
name: {{ include "kiali-server.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: "{{ .Release.Namespace }}"
...
2 changes: 1 addition & 1 deletion kiali-server/templates/rolebinding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ roleRef:
subjects:
- kind: ServiceAccount
name: {{ include "kiali-server.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: "{{ .Release.Namespace }}"
...
2 changes: 1 addition & 1 deletion kiali-server/templates/route.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ apiVersion: route.openshift.io/v1
kind: Route
metadata:
name: {{ include "kiali-server.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: "{{ .Release.Namespace }}"
labels:
{{- if .Values.deployment.ingress.additional_labels }}
{{- toYaml .Values.deployment.ingress.additional_labels | nindent 4 }}
Expand Down
2 changes: 1 addition & 1 deletion kiali-server/templates/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ include "kiali-server.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: "{{ .Release.Namespace }}"
labels:
{{- include "kiali-server.labels" . | nindent 4 }}
annotations:
Expand Down
2 changes: 1 addition & 1 deletion kiali-server/templates/serviceaccount.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ include "kiali-server.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: "{{ .Release.Namespace }}"
labels:
{{- include "kiali-server.labels" . | nindent 4 }}
...
Loading