diff --git a/charts/templates/controller-svc.yaml b/charts/templates/controller-svc.yaml index 93e60e53125..b4d39619d94 100644 --- a/charts/templates/controller-svc.yaml +++ b/charts/templates/controller-svc.yaml @@ -2,7 +2,7 @@ kind: Service apiVersion: v1 metadata: name: kube-ovn-controller - namespace: kube-system + namespace: {{ .Values.namespace }} labels: app: kube-ovn-controller spec: diff --git a/charts/templates/monitor-svc.yaml b/charts/templates/monitor-svc.yaml index fec1fbb3343..1ad1800d84b 100644 --- a/charts/templates/monitor-svc.yaml +++ b/charts/templates/monitor-svc.yaml @@ -2,7 +2,7 @@ kind: Service apiVersion: v1 metadata: name: kube-ovn-monitor - namespace: kube-system + namespace: {{ .Values.namespace }} labels: app: kube-ovn-monitor spec: diff --git a/charts/templates/nb-svc.yaml b/charts/templates/nb-svc.yaml index 7ec1595c17c..43992e91c6a 100644 --- a/charts/templates/nb-svc.yaml +++ b/charts/templates/nb-svc.yaml @@ -2,7 +2,7 @@ kind: Service apiVersion: v1 metadata: name: ovn-nb - namespace: kube-system + namespace: {{ .Values.namespace }} spec: ports: - name: ovn-nb diff --git a/charts/templates/northd-svc.yaml b/charts/templates/northd-svc.yaml index 494f57e249b..cec072330b0 100644 --- a/charts/templates/northd-svc.yaml +++ b/charts/templates/northd-svc.yaml @@ -2,7 +2,7 @@ kind: Service apiVersion: v1 metadata: name: ovn-northd - namespace: kube-system + namespace: {{ .Values.namespace }} spec: ports: - name: ovn-northd diff --git a/charts/templates/ovn-CRB.yaml b/charts/templates/ovn-CRB.yaml index aa84b43f7c2..9230d90035b 100644 --- a/charts/templates/ovn-CRB.yaml +++ b/charts/templates/ovn-CRB.yaml @@ -9,7 +9,7 @@ roleRef: subjects: - kind: ServiceAccount name: ovn - namespace: kube-system + namespace: {{ .Values.namespace }} --- apiVersion: rbac.authorization.k8s.io/v1 @@ -23,7 +23,7 @@ roleRef: subjects: - kind: ServiceAccount name: ovn-ovs - namespace: kube-system + namespace: {{ .Values.namespace }} --- apiVersion: rbac.authorization.k8s.io/v1 @@ -37,7 +37,7 @@ roleRef: subjects: - kind: ServiceAccount name: kube-ovn-cni - namespace: kube-system + namespace: {{ .Values.namespace }} --- apiVersion: rbac.authorization.k8s.io/v1 @@ -51,4 +51,4 @@ roleRef: subjects: - kind: ServiceAccount name: kube-ovn-app - namespace: kube-system + namespace: {{ .Values.namespace }} diff --git a/charts/templates/ovn-dpdk-ds.yaml b/charts/templates/ovn-dpdk-ds.yaml index 88865224c8c..7654fea0263 100644 --- a/charts/templates/ovn-dpdk-ds.yaml +++ b/charts/templates/ovn-dpdk-ds.yaml @@ -3,7 +3,7 @@ kind: DaemonSet apiVersion: apps/v1 metadata: name: ovs-ovn-dpdk - namespace: kube-system + namespace: {{ .Values.namespace }} annotations: kubernetes.io/description: | This daemon set launches the openvswitch daemon. diff --git a/charts/templates/ovn-sa.yaml b/charts/templates/ovn-sa.yaml index 0400b90b3ff..17b4a92f784 100644 --- a/charts/templates/ovn-sa.yaml +++ b/charts/templates/ovn-sa.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: ovn - namespace: kube-system + namespace: {{ .Values.namespace }} {{- if .Values.global.registry.imagePullSecrets }} imagePullSecrets: {{- range $index, $secret := .Values.global.registry.imagePullSecrets }} @@ -17,18 +17,18 @@ apiVersion: v1 kind: ServiceAccount metadata: name: ovn-ovs - namespace: kube-system + namespace: {{ .Values.namespace }} --- apiVersion: v1 kind: ServiceAccount metadata: name: kube-ovn-cni - namespace: kube-system + namespace: {{ .Values.namespace }} --- apiVersion: v1 kind: ServiceAccount metadata: name: kube-ovn-app - namespace: kube-system + namespace: {{ .Values.namespace }} diff --git a/charts/templates/ovncni-svc.yaml b/charts/templates/ovncni-svc.yaml index 13b18c4d786..e1c47c806f8 100644 --- a/charts/templates/ovncni-svc.yaml +++ b/charts/templates/ovncni-svc.yaml @@ -2,7 +2,7 @@ kind: Service apiVersion: v1 metadata: name: kube-ovn-cni - namespace: kube-system + namespace: {{ .Values.namespace }} labels: app: kube-ovn-cni spec: diff --git a/charts/templates/pinger-ds.yaml b/charts/templates/pinger-ds.yaml index 91df855b6ba..aa66ffd2f0b 100644 --- a/charts/templates/pinger-ds.yaml +++ b/charts/templates/pinger-ds.yaml @@ -51,6 +51,7 @@ spec: {{- else if eq .Values.networking.NET_STACK "ipv6" -}} {{ .Values.ipv6.PINGER_EXTERNAL_DOMAIN }} {{- end }} + - --ds-namespace={{ .Values.namespace }} - --logtostderr=false - --alsologtostderr=true - --log_file=/var/log/kube-ovn/kube-ovn-pinger.log diff --git a/charts/templates/pinger-svc.yaml b/charts/templates/pinger-svc.yaml index 0301407e590..ef169e8e91c 100644 --- a/charts/templates/pinger-svc.yaml +++ b/charts/templates/pinger-svc.yaml @@ -2,7 +2,7 @@ kind: Service apiVersion: v1 metadata: name: kube-ovn-pinger - namespace: kube-system + namespace: {{ .Values.namespace }} labels: app: kube-ovn-pinger spec: diff --git a/charts/templates/pre-delete-hook.yaml b/charts/templates/pre-delete-hook.yaml index 9fd2a788085..d81c5ca2298 100644 --- a/charts/templates/pre-delete-hook.yaml +++ b/charts/templates/pre-delete-hook.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: kube-ovn-pre-delete-hook - namespace: kube-system + namespace: {{ .Values.namespace }} annotations: # This is what defines this resource as a hook. Without this line, the # job is considered part of the release. @@ -48,13 +48,13 @@ roleRef: subjects: - kind: ServiceAccount name: kube-ovn-pre-delete-hook - namespace: kube-system + namespace: {{ .Values.namespace }} --- apiVersion: batch/v1 kind: Job metadata: name: "{{ .Chart.Name }}-pre-delete-hook" - namespace: kube-system + namespace: {{ .Values.namespace }} labels: app.kubernetes.io/managed-by: {{ .Release.Service | quote }} app.kubernetes.io/instance: {{ .Release.Name | quote }} diff --git a/charts/templates/sb-svc.yaml b/charts/templates/sb-svc.yaml index 5f8fcca4f61..36a4a27ab0c 100644 --- a/charts/templates/sb-svc.yaml +++ b/charts/templates/sb-svc.yaml @@ -2,7 +2,7 @@ kind: Service apiVersion: v1 metadata: name: ovn-sb - namespace: kube-system + namespace: {{ .Values.namespace }} spec: ports: - name: ovn-sb diff --git a/charts/templates/upgrade-ovs-ovn.yaml b/charts/templates/upgrade-ovs-ovn.yaml index 487eb218061..980354e6bd0 100644 --- a/charts/templates/upgrade-ovs-ovn.yaml +++ b/charts/templates/upgrade-ovs-ovn.yaml @@ -1,11 +1,11 @@ -{{ if (lookup "apps/v1" "DaemonSet" "kube-system" "ovs-ovn") }} -{{ if eq (lookup "apps/v1" "DaemonSet" "kube-system" "ovs-ovn").spec.updateStrategy.type "OnDelete" }} +{{ if (lookup "apps/v1" "DaemonSet" .Values.namespace "ovs-ovn") }} +{{ if eq (lookup "apps/v1" "DaemonSet" .Values.namespace "ovs-ovn").spec.updateStrategy.type "OnDelete" }} --- apiVersion: v1 kind: ServiceAccount metadata: name: ovs-ovn-upgrade - namespace: kube-system + namespace: {{ .Values.namespace }} annotations: # This is what defines this resource as a hook. Without this line, the # job is considered part of the release. @@ -65,13 +65,13 @@ roleRef: subjects: - kind: ServiceAccount name: ovs-ovn-upgrade - namespace: kube-system + namespace: {{ .Values.namespace }} --- apiVersion: batch/v1 kind: Job metadata: name: "{{ .Chart.Name }}-post-upgrade-hook" - namespace: kube-system + namespace: {{ .Values.namespace }} labels: app.kubernetes.io/managed-by: {{ .Release.Service | quote }} app.kubernetes.io/instance: {{ .Release.Name | quote }} diff --git a/charts/templates/vpc-nat-config.yaml b/charts/templates/vpc-nat-config.yaml index 486ffe32421..0f9bd0f504f 100755 --- a/charts/templates/vpc-nat-config.yaml +++ b/charts/templates/vpc-nat-config.yaml @@ -2,7 +2,7 @@ kind: ConfigMap apiVersion: v1 metadata: name: ovn-vpc-nat-config - namespace: kube-system + namespace: {{ .Values.namespace }} annotations: kubernetes.io/description: | kube-ovn vpc-nat common config diff --git a/dist/images/start-ovs.sh b/dist/images/start-ovs.sh index db9f30de9f9..5e4b1864391 100755 --- a/dist/images/start-ovs.sh +++ b/dist/images/start-ovs.sh @@ -54,7 +54,7 @@ function quit { revision_hash=$(kubectl -n "${POD_NAMESPACE}" get pod "${POD_NAME}" -o jsonpath='{.metadata.labels.controller-revision-hash}') revision=$(kubectl -n "${POD_NAMESPACE}" get controllerrevision "${gen_name}${revision_hash}" -o jsonpath='{.revision}') ds_name=${gen_name%-} - latest_revision=$(kubectl -n kube-system get controllerrevision --no-headers | awk '$2 == "daemonset.apps/'$ds_name'" {print $3}' | sort -nr | head -n1) + latest_revision=$(kubectl -n "${POD_NAMESPACE}" get controllerrevision --no-headers | awk '$2 == "daemonset.apps/'$ds_name'" {print $3}' | sort -nr | head -n1) if [ "x$latest_revision" = "x$revision" ]; then # stop ovn-controller/ovs only when the processes are in the same cgroup pid=$(/usr/share/ovn/scripts/ovn-ctl status_controller | awk '{print $NF}')