github/kubevela
1
0
Fork 0
mirror of https://github.com/kubevela/kubevela.git synced 2026-08-23 22:46:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Feat: remove apiserver component from the chart (#2838)

Browse Source 
Co-authored-by: barnettZQG <yiyun.pro>
This commit is contained in:
barnettZQG
2021-11-30 12:42:18 +08:00
committed by GitHub
co-authored by lnx01
parent 13b07674f1
commit 2abd98301f
6 changed files with 0 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/vela-core/templates/_helpers.tpl
-5
View File
@@ -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
charts/vela-core/templates/kubevela-apiserver.yaml
-68
View File
@@ -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 -}}
charts/vela-core/values.yaml
-11
View File
@@ -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:
charts/vela-minimal/templates/_helpers.tpl
-5
View File
@@ -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
charts/vela-minimal/templates/kubevela-apiserver.yaml
-68
View File
@@ -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 -}}
charts/vela-minimal/values.yaml
-7
View File
@@ -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: