Skip to content

Commit 8e31218

Browse files
shanshanyingwusai80JashBook
authored
chore: add namespace to namespace scoped crs in helm chart (#9885)
Co-authored-by: wusai80 <wusai80@gmail.com> Co-authored-by: huangzhangshu <huangzhangshu@apecloud.com>
1 parent 6e1e349 commit 8e31218

14 files changed

+17
-2
lines changed

.github/workflows/release-crds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
fi
7676
make bump-chart-ver VERSION="${BUMP_VERSION}"
7777
touch ${{ matrix.yaml }}
78-
helm template kubeblocks deploy/helm --dependency-update > ${{ matrix.yaml }}
78+
helm template kubeblocks deploy/helm --namespace kb-system --dependency-update > ${{ matrix.yaml }}
7979
8080
- name: merge KubeBlocks crds
8181
if: ${{ matrix.yaml == 'kubeblocks_crds.yaml' }}

deploy/helm/templates/configmap.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: v1
22
kind: ConfigMap
33
metadata:
44
name: {{ include "kubeblocks.fullname" . }}-manager-config
5+
namespace: {{ .Release.Namespace }}
56
labels:
67
{{- include "kubeblocks.labels" . | nindent 4 }}
78
data:
@@ -27,6 +28,7 @@ apiVersion: v1
2728
kind: ConfigMap
2829
metadata:
2930
name: {{ include "kubeblocks.fullname" . }}-host-ports
31+
namespace: {{ .Release.Namespace }}
3032
labels:
3133
{{- include "kubeblocks.labels" . | nindent 4 }}
3234
data: {}

deploy/helm/templates/conversion-patch-hook.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ apiVersion: batch/v1
33
kind: Job
44
metadata:
55
name: {{ .Release.Name }}-crd-patch
6+
namespace: {{ .Release.Namespace }}
67
labels:
78
{{- include "kubeblocks.labels" . | nindent 4 }}
89
annotations:
@@ -76,7 +77,7 @@ spec:
7677
${patch_crd_cmd} "componentversions.apps.kubeblocks.io"
7778
${patch_crd_cmd} "instancesets.workloads.kubeblocks.io"
7879
${patch_crd_cmd} "servicedescriptors.apps.kubeblocks.io"
79-
80+
8081
# 3. start KubeBlocks
8182
kubectl patch deployment {{ include "kubeblocks.fullname" . }} -n {{ .Release.Namespace }} -p '{"spec":{"replicas":{{ .Values.replicaCount }}}}'
8283
{{- if .Values.dataProtection.enabled }}

deploy/helm/templates/dataprotection.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ apiVersion: apps/v1
44
kind: Deployment
55
metadata:
66
name: {{ include "kubeblocks.fullname" . }}-dataprotection
7+
namespace: {{ .Release.Namespace }}
78
{{- with .Values.dataProtection.deployAnnotations }}
89
annotations:
910
{{- toYaml . | nindent 4 }}

deploy/helm/templates/deployment.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: apps/v1
22
kind: Deployment
33
metadata:
44
name: {{ include "kubeblocks.fullname" . }}
5+
namespace: {{ .Release.Namespace }}
56
{{- with .Values.deployAnnotations }}
67
annotations:
78
{{- toYaml . | nindent 4 }}

deploy/helm/templates/hpa.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ apiVersion: autoscaling/v2beta1
33
kind: HorizontalPodAutoscaler
44
metadata:
55
name: {{ include "kubeblocks.fullname" . }}
6+
namespace: {{ .Release.Namespace }}
67
labels:
78
{{- include "kubeblocks.labels" . | nindent 4 }}
89
spec:

deploy/helm/templates/i18n-configmap.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: v1
22
kind: ConfigMap
33
metadata:
44
name: {{ include "kubeblocks.i18nResourcesName" . }}
5+
namespace: {{ .Release.Namespace }}
56
labels:
67
{{- include "kubeblocks.labels" . | nindent 4 }}
78
data:

deploy/helm/templates/kubeblocks-upgrade-hook.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ apiVersion: batch/v1
33
kind: Job
44
metadata:
55
name: {{ .Release.Name }}-upgrade-hook-job
6+
namespace: {{ .Release.Namespace }}
67
labels:
78
{{- include "kubeblocks.labels" . | nindent 4 }}
89
annotations:

deploy/helm/templates/poddisruptionbudget.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ apiVersion: policy/v1beta1
77
kind: PodDisruptionBudget
88
metadata:
99
name: {{ template "kubeblocks.fullname" . }}
10+
namespace: {{ .Release.Namespace }}
1011
labels: {{ include "kubeblocks.labels" . | nindent 4 }}
1112
spec:
1213
{{- include "podDisruptionBudget.spec" . | indent 2 }}

deploy/helm/templates/pre-delete-addon-job.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ apiVersion: batch/v1
33
kind: Job
44
metadata:
55
name: {{ .Release.Name }}-addon-removal
6+
namespace: {{ .Release.Namespace }}
67
labels:
78
{{- include "kubeblocks.labels" . | nindent 4 }}
89
annotations:

0 commit comments

Comments
 (0)