From 2abd98301fcdecae38f8648917bee90fba065988 Mon Sep 17 00:00:00 2001 From: barnettZQG <576501057@qq.com> Date: Tue, 30 Nov 2021 12:42:18 +0800 Subject: [PATCH] Feat: remove apiserver component from the chart (#2838) Co-authored-by: barnettZQG --- charts/vela-core/templates/_helpers.tpl | 5 -- .../templates/kubevela-apiserver.yaml | 68 ------------------- charts/vela-core/values.yaml | 11 --- charts/vela-minimal/templates/_helpers.tpl | 5 -- .../templates/kubevela-apiserver.yaml | 68 ------------------- charts/vela-minimal/values.yaml | 7 -- 6 files changed, 164 deletions(-) delete mode 100644 charts/vela-core/templates/kubevela-apiserver.yaml delete mode 100644 charts/vela-minimal/templates/kubevela-apiserver.yaml diff --git a/charts/vela-core/templates/_helpers.tpl b/charts/vela-core/templates/_helpers.tpl index 396aee7c9..fcef7edfc 100644 --- a/charts/vela-core/templates/_helpers.tpl +++ b/charts/vela-core/templates/_helpers.tpl @@ -51,11 +51,6 @@ app.kubernetes.io/name: {{ include "kubevela.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end -}} -{{- define "kubevela-apiserver.selectorLabels" -}} -app.kubernetes.io/name: {{ include "kubevela.name" . }}-apiserver -app.kubernetes.io/instance: {{ .Release.Name }}-apiserver -{{- end -}} - {{- define "kubevela-cluster-gateway.selectorLabels" -}} app.kubernetes.io/name: {{ include "kubevela.name" . }}-cluster-gateway app.kubernetes.io/instance: {{ .Release.Name }}-cluster-gateway diff --git a/charts/vela-core/templates/kubevela-apiserver.yaml b/charts/vela-core/templates/kubevela-apiserver.yaml deleted file mode 100644 index be8d70c28..000000000 --- a/charts/vela-core/templates/kubevela-apiserver.yaml +++ /dev/null @@ -1,68 +0,0 @@ -{{- if .Values.apiServer.enabled -}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "kubevela.fullname" . }}-apiserver - namespace: {{ .Release.Namespace }} - labels: - {{- include "kubevela.labels" . | nindent 4 }} -spec: - replicas: {{ .Values.apiServer.replicaCount }} - selector: - matchLabels: - {{- include "kubevela-apiserver.selectorLabels" . | nindent 6 }} - template: - metadata: - labels: - {{- include "kubevela-apiserver.selectorLabels" . | nindent 8 }} - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "kubevela.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - containers: - - name: {{ include "kubevela.fullname" . }}-apiserver - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - args: - - "apiserver" - - "--port={{ .Values.apiServer.port }}" - image: {{ .Values.imageRegistry }}{{ .Values.apiserverImage.repository }}:{{ .Values.apiserverImage.tag }} - imagePullPolicy: {{ quote .Values.apiserverImage.pullPolicy }} - resources: - {{- toYaml .Values.resources | nindent 12 }} - ports: - - containerPort: {{ .Values.apiServer.port }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} ---- -apiVersion: v1 -kind: Service -metadata: - name: {{ include "kubevela.fullname" . }}-apiserver - namespace: {{ .Release.Namespace }} - labels: - {{- include "kubevela.labels" . | nindent 4 }} -spec: - type: {{ .Values.apiServer.Service.type }} - ports: - - port: 80 - targetPort: {{ .Values.apiServer.port }} - protocol: TCP - name: http - selector: - {{- include "kubevela-apiserver.selectorLabels" . | nindent 6 }} -{{- end -}} \ No newline at end of file diff --git a/charts/vela-core/values.yaml b/charts/vela-core/values.yaml index dea0cf26b..252f99f53 100644 --- a/charts/vela-core/values.yaml +++ b/charts/vela-core/values.yaml @@ -13,10 +13,6 @@ image: repository: oamdev/vela-core tag: latest pullPolicy: Always -apiserverImage: - repository: oamdev/vela-apiserver - tag: v1.1.2 - pullPolicy: Always imagePullSecrets: [] nameOverride: "" @@ -110,13 +106,6 @@ dependCheckWait: 30s # OAMSpecVer is the oam spec version controller want to setup OAMSpecVer: "v0.3" -apiServer: - enabled: true - port: 8000 - replicaCount: 1 - Service: - type: ClusterIP - multicluster: enabled: false clusterGateway: diff --git a/charts/vela-minimal/templates/_helpers.tpl b/charts/vela-minimal/templates/_helpers.tpl index 396aee7c9..fcef7edfc 100644 --- a/charts/vela-minimal/templates/_helpers.tpl +++ b/charts/vela-minimal/templates/_helpers.tpl @@ -51,11 +51,6 @@ app.kubernetes.io/name: {{ include "kubevela.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end -}} -{{- define "kubevela-apiserver.selectorLabels" -}} -app.kubernetes.io/name: {{ include "kubevela.name" . }}-apiserver -app.kubernetes.io/instance: {{ .Release.Name }}-apiserver -{{- end -}} - {{- define "kubevela-cluster-gateway.selectorLabels" -}} app.kubernetes.io/name: {{ include "kubevela.name" . }}-cluster-gateway app.kubernetes.io/instance: {{ .Release.Name }}-cluster-gateway diff --git a/charts/vela-minimal/templates/kubevela-apiserver.yaml b/charts/vela-minimal/templates/kubevela-apiserver.yaml deleted file mode 100644 index 428e967d0..000000000 --- a/charts/vela-minimal/templates/kubevela-apiserver.yaml +++ /dev/null @@ -1,68 +0,0 @@ -{{- if .Values.apiServer.enabled -}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "kubevela.fullname" . }}-apiserver - namespace: {{ .Release.Namespace }} - labels: - {{- include "kubevela.labels" . | nindent 4 }} -spec: - replicas: {{ .Values.apiServer.replicaCount }} - selector: - matchLabels: - {{- include "kubevela-apiserver.selectorLabels" . | nindent 6 }} - template: - metadata: - labels: - {{- include "kubevela-apiserver.selectorLabels" . | nindent 8 }} - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "kubevela.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - containers: - - name: {{ include "kubevela.fullname" . }}-apiserver - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - args: - - "apiserver" - - "--bind-addr=0.0.0.0:{{ .Values.apiServer.port }}" - image: {{ .Values.imageRegistry }}{{ .Values.image.repository }}:{{ .Values.image.tag }} - imagePullPolicy: {{ quote .Values.image.pullPolicy }} - resources: - {{- toYaml .Values.resources | nindent 12 }} - ports: - - containerPort: {{ .Values.apiServer.port }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} ---- -apiVersion: v1 -kind: Service -metadata: - name: {{ include "kubevela.fullname" . }}-apiserver - namespace: {{ .Release.Namespace }} - labels: - {{- include "kubevela.labels" . | nindent 4 }} -spec: - type: {{ .Values.apiServer.Service.type }} - ports: - - port: 80 - targetPort: {{ .Values.apiServer.port }} - protocol: TCP - name: http - selector: - {{- include "kubevela-apiserver.selectorLabels" . | nindent 6 }} -{{- end -}} \ No newline at end of file diff --git a/charts/vela-minimal/values.yaml b/charts/vela-minimal/values.yaml index 865c74986..7dbd2dfaf 100644 --- a/charts/vela-minimal/values.yaml +++ b/charts/vela-minimal/values.yaml @@ -105,13 +105,6 @@ dependCheckWait: 30s # OAMSpecVer is the oam spec version controller want to setup OAMSpecVer: "minimal" -apiServer: - enabled: false - port: 8000 - replicaCount: 1 - Service: - type: ClusterIP - multicluster: enabled: false clusterGateway: