Skip to content
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 .github/workflows/release-crds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
fi
make bump-chart-ver VERSION="${BUMP_VERSION}"
touch ${{ matrix.yaml }}
helm template kubeblocks deploy/helm --dependency-update > ${{ matrix.yaml }}
helm template kubeblocks deploy/helm --namespace kb-system --dependency-update > ${{ matrix.yaml }}

- name: merge KubeBlocks crds
if: ${{ matrix.yaml == 'kubeblocks_crds.yaml' }}
Expand Down
2 changes: 2 additions & 0 deletions deploy/helm/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ include "kubeblocks.fullname" . }}-manager-config
namespace: {{ .Release.Namespace }}
labels:
{{- include "kubeblocks.labels" . | nindent 4 }}
data:
Expand All @@ -27,6 +28,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ include "kubeblocks.fullname" . }}-host-ports
namespace: {{ .Release.Namespace }}
labels:
{{- include "kubeblocks.labels" . | nindent 4 }}
data: {}
3 changes: 2 additions & 1 deletion deploy/helm/templates/conversion-patch-hook.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: batch/v1
kind: Job
metadata:
name: {{ .Release.Name }}-crd-patch
namespace: {{ .Release.Namespace }}
labels:
{{- include "kubeblocks.labels" . | nindent 4 }}
annotations:
Expand Down Expand Up @@ -76,7 +77,7 @@ spec:
${patch_crd_cmd} "componentversions.apps.kubeblocks.io"
${patch_crd_cmd} "instancesets.workloads.kubeblocks.io"
${patch_crd_cmd} "servicedescriptors.apps.kubeblocks.io"

# 3. start KubeBlocks
kubectl patch deployment {{ include "kubeblocks.fullname" . }} -n {{ .Release.Namespace }} -p '{"spec":{"replicas":{{ .Values.replicaCount }}}}'
{{- if .Values.dataProtection.enabled }}
Expand Down
1 change: 1 addition & 0 deletions deploy/helm/templates/dataprotection.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "kubeblocks.fullname" . }}-dataprotection
namespace: {{ .Release.Namespace }}
{{- with .Values.dataProtection.deployAnnotations }}
annotations:
{{- toYaml . | nindent 4 }}
Expand Down
1 change: 1 addition & 0 deletions deploy/helm/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "kubeblocks.fullname" . }}
namespace: {{ .Release.Namespace }}
{{- with .Values.deployAnnotations }}
annotations:
{{- toYaml . | nindent 4 }}
Expand Down
1 change: 1 addition & 0 deletions deploy/helm/templates/hpa.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: autoscaling/v2beta1
kind: HorizontalPodAutoscaler
metadata:
name: {{ include "kubeblocks.fullname" . }}
namespace: {{ .Release.Namespace }}
labels:
{{- include "kubeblocks.labels" . | nindent 4 }}
spec:
Expand Down
1 change: 1 addition & 0 deletions deploy/helm/templates/i18n-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ include "kubeblocks.i18nResourcesName" . }}
namespace: {{ .Release.Namespace }}
labels:
{{- include "kubeblocks.labels" . | nindent 4 }}
data:
Expand Down
1 change: 1 addition & 0 deletions deploy/helm/templates/kubeblocks-upgrade-hook.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: batch/v1
kind: Job
metadata:
name: {{ .Release.Name }}-upgrade-hook-job
namespace: {{ .Release.Namespace }}
labels:
{{- include "kubeblocks.labels" . | nindent 4 }}
annotations:
Expand Down
1 change: 1 addition & 0 deletions deploy/helm/templates/poddisruptionbudget.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ apiVersion: policy/v1beta1
kind: PodDisruptionBudget
metadata:
name: {{ template "kubeblocks.fullname" . }}
namespace: {{ .Release.Namespace }}
labels: {{ include "kubeblocks.labels" . | nindent 4 }}
spec:
{{- include "podDisruptionBudget.spec" . | indent 2 }}
Expand Down
1 change: 1 addition & 0 deletions deploy/helm/templates/pre-delete-addon-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: batch/v1
kind: Job
metadata:
name: {{ .Release.Name }}-addon-removal
namespace: {{ .Release.Namespace }}
labels:
{{- include "kubeblocks.labels" . | nindent 4 }}
annotations:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: {{ include "kubeblocks.fullname" . }}-leader-election-rolebinding
namespace: {{ .Release.Namespace }}
labels:
{{- include "kubeblocks.labels" . | nindent 4 }}
roleRef:
Expand Down
1 change: 1 addition & 0 deletions deploy/helm/templates/secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: v1
kind: Secret
metadata:
name: {{ include "kubeblocks.fullname" . }}-secret
namespace: {{ .Release.Namespace }}
labels:
{{- include "kubeblocks.labels" . | nindent 4 }}
type: Opaque
Expand Down
1 change: 1 addition & 0 deletions deploy/helm/templates/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ include "kubeblocks.svcName" . }}
namespace: {{ .Release.Namespace }}
labels:
control-plane: controller-manager
{{- include "kubeblocks.labels" . | nindent 4 }}
Expand Down
2 changes: 2 additions & 0 deletions deploy/helm/templates/serviceaccount.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ include "kubeblocks.serviceAccountName" . }}
namespace: {{ .Release.Namespace }}
labels:
{{- include "kubeblocks.labels" . | nindent 4 }}
{{- with .Values.serviceAccount.annotations }}
Expand All @@ -20,6 +21,7 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ include "dataprotection.execWorkerSAName" . }}
namespace: {{ .Release.Namespace }}
labels:
{{- include "kubeblocks.labels" . | nindent 4 }}
{{- with .Values.image.imagePullSecrets }}
Expand Down