This is an automated email from the ASF dual-hosted git repository.
tokers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git
The following commit(s) were added to refs/heads/master by this push:
new 6d926db chore: migrate chart to repo apisix-helm-charts (#258)
6d926db is described below
commit 6d926dba38cd86fef326e7b60fbdec2e9614503c
Author: Jun <junnp...@users.noreply.github.com>
AuthorDate: Thu Feb 25 13:13:23 2021 +0800
chore: migrate chart to repo apisix-helm-charts (#258)
---
charts/apisix-ingress-controller/.helmignore | 23 ---
charts/apisix-ingress-controller/Chart.yaml | 28 ----
charts/apisix-ingress-controller/README.md | 42 ------
.../crds/customresourcedefinitions.yaml | 70 ---------
.../apisix-ingress-controller/templates/NOTES.txt | 5 -
.../templates/_helpers.tpl | 80 ----------
.../templates/configmap.yaml | 41 -----
.../templates/deployment.yaml | 91 ------------
.../apisix-ingress-controller/templates/hpa.yaml | 44 ------
.../apisix-ingress-controller/templates/rbac.yaml | 165 ---------------------
.../templates/service-account.yaml | 22 ---
.../templates/service.yaml | 31 ----
charts/apisix-ingress-controller/values.yaml | 72 ---------
docs/en/latest/deployments/ack.md | 7 +-
docs/en/latest/deployments/aws.md | 7 +-
docs/en/latest/deployments/azure.md | 7 +-
docs/en/latest/deployments/gke.md | 7 +-
docs/en/latest/deployments/k3s-rke.md | 7 +-
docs/en/latest/deployments/kubesphere.md | 7 +-
docs/en/latest/deployments/minikube.md | 7 +-
docs/en/latest/deployments/tke.md | 7 +-
21 files changed, 24 insertions(+), 746 deletions(-)
diff --git a/charts/apisix-ingress-controller/.helmignore
b/charts/apisix-ingress-controller/.helmignore
deleted file mode 100644
index 0e8a0eb..0000000
--- a/charts/apisix-ingress-controller/.helmignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/charts/apisix-ingress-controller/Chart.yaml
b/charts/apisix-ingress-controller/Chart.yaml
deleted file mode 100644
index 80fa853..0000000
--- a/charts/apisix-ingress-controller/Chart.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-apiVersion: v2
-name: apisix-ingress-controller
-description: Apache APISIX Ingress Controller for Kubernetes
-icon: https://apache.org/logos/res/apisix/apisix.png
-keywords:
- - ingress
- - apisix
- - nginx
- - crd
-type: application
-version: 0.1.0
-appVersion: 0.2.0
diff --git a/charts/apisix-ingress-controller/README.md
b/charts/apisix-ingress-controller/README.md
deleted file mode 100644
index 741e625..0000000
--- a/charts/apisix-ingress-controller/README.md
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
--->
-
-# Apache APISIX Ingress Controller Helm Chart
-
-## Prerequisites
-
-- Kubernetes 1.12+
-- [Apache APISIX](https://github.com/apache/apisix#configure-and-installation)
-- [Helm v3.0+](https://helm.sh/docs/intro/quickstart/#install-helm)
-
-## Install
-
-To install the chart with release name `apisix-ingress-controller`:
-
-```bash
-helm install apisix-ingress-controller --namespace ingress-apisix .
-```
-
-## Uninstall
-
-To uninstall/delete the `apisix-ingress-controller` release:
-
-```bash
-helm uninstall apisix-ingress-controller --namespace ingress-apisix
-```
diff --git
a/charts/apisix-ingress-controller/crds/customresourcedefinitions.yaml
b/charts/apisix-ingress-controller/crds/customresourcedefinitions.yaml
deleted file mode 100644
index 58544a0..0000000
--- a/charts/apisix-ingress-controller/crds/customresourcedefinitions.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
- name: apisixroutes.apisix.apache.org
-spec:
- group: apisix.apache.org
- versions:
- - name: v1
- served: true
- storage: true
- scope: Namespaced
- names:
- plural: apisixroutes
- singular: apisixroute
- kind: ApisixRoute
- shortNames:
- - ar
----
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
- name: apisixtlses.apisix.apache.org
-spec:
- group: apisix.apache.org
- versions:
- - name: v1
- served: true
- storage: true
- scope: Namespaced
- names:
- plural: apisixtlses
- singular: apisixtls
- kind: ApisixTls
- shortNames:
- - atls
----
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
- name: apisixupstreams.apisix.apache.org
-spec:
- group: apisix.apache.org
- versions:
- - name: v1
- served: true
- storage: true
- scope: Namespaced
- names:
- plural: apisixupstreams
- singular: apisixupstream
- kind: ApisixUpstream
- shortNames:
- - au
diff --git a/charts/apisix-ingress-controller/templates/NOTES.txt
b/charts/apisix-ingress-controller/templates/NOTES.txt
deleted file mode 100644
index 7cac1e3..0000000
--- a/charts/apisix-ingress-controller/templates/NOTES.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Get the application URL by running these commands:
-export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l
"app.kubernetes.io/name={{ include "apisix-ingress-controller.name" .
}},app.kubernetes.io/instance={{ .Release.Name }}" -o
jsonpath="{.items[0].metadata.name}")
-export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }}
$POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
-echo "Visit http://127.0.0.1:8080 to use your application"
-kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME
8080:$CONTAINER_PORT
diff --git a/charts/apisix-ingress-controller/templates/_helpers.tpl
b/charts/apisix-ingress-controller/templates/_helpers.tpl
deleted file mode 100644
index b2a98f2..0000000
--- a/charts/apisix-ingress-controller/templates/_helpers.tpl
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "apisix-ingress-controller.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to
this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "apisix-ingress-controller.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "apisix-ingress-controller.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 |
trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "apisix-ingress-controller.labels" -}}
-helm.sh/chart: {{ include "apisix-ingress-controller.chart" . }}
-{{ include "apisix-ingress-controller.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "apisix-ingress-controller.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "apisix-ingress-controller.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "apisix-ingress-controller.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "apisix-ingress-controller.fullname" .)
.Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
diff --git a/charts/apisix-ingress-controller/templates/configmap.yaml
b/charts/apisix-ingress-controller/templates/configmap.yaml
deleted file mode 100644
index f80988d..0000000
--- a/charts/apisix-ingress-controller/templates/configmap.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-apiVersion: v1
-data:
- config.yaml: |
- # log options
- log_level: {{ .Values.config.logLevel | quote }}
- log_output: {{ .Values.config.logOutput | quote }}
- http_listen: {{ .Values.config.httpListen | quote }}
- enable_profiling: {{ .Values.config.enableProfiling }}
- kubernetes:
- kubeconfig: {{ .Values.config.kubernetes.kubeconfig | quote }}
- resync_interval: {{ .Values.config.kubernetes.resyncInterval | quote }}
- {{- if gt (len .Values.config.kubernetes.appNamespaces) 0 }}
- app_namespaces:
- {{- range .Values.config.kubernetes.appNamespaces }}
- - {{ . | quote }}
- {{- end }}
- {{- end }}
- apisix:
- base_url: {{ .Values.config.apisix.baseURL | quote }}
- admin_key: {{ .Values.config.apisix.adminKey | quote }}
-kind: ConfigMap
-metadata:
- name: {{ .Release.Name }}-configmap
- labels:
- {{- include "apisix-ingress-controller.labels" . | nindent 4 }}
diff --git a/charts/apisix-ingress-controller/templates/deployment.yaml
b/charts/apisix-ingress-controller/templates/deployment.yaml
deleted file mode 100644
index c87a5ff..0000000
--- a/charts/apisix-ingress-controller/templates/deployment.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: {{ include "apisix-ingress-controller.fullname" . }}
- labels:
- {{- include "apisix-ingress-controller.labels" . | nindent 4 }}
-spec:
- {{- if not .Values.autoscaling.enabled }}
- replicas: {{ .Values.replicaCount }}
- {{- end }}
- selector:
- matchLabels:
- {{- include "apisix-ingress-controller.selectorLabels" . | nindent 6 }}
- template:
- metadata:
- annotations:
- checksum/config: {{ include (print $.Template.BasePath
"/configmap.yaml") . | sha256sum }}
- labels:
- {{- include "apisix-ingress-controller.selectorLabels" . | nindent 8 }}
- spec:
- {{- with .Values.imagePullSecrets }}
- imagePullSecrets:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- serviceAccountName: {{ include
"apisix-ingress-controller.serviceAccountName" . }}
- volumes:
- - name: configuration
- configMap:
- name: {{ .Release.Name }}-configmap
- items:
- - key: config.yaml
- path: config.yaml
- containers:
- - name: {{ .Chart.Name }}
- command:
- - /ingress-apisix/apisix-ingress-controller
- - ingress
- - --config-path
- - /ingress-apisix/conf/config.yaml
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag |
default .Chart.AppVersion }}"
- imagePullPolicy: {{ .Values.image.pullPolicy }}
- ports:
- - name: http
- containerPort: {{ (.Values.config.httpListen | split ":")._1 }}
- protocol: TCP
- livenessProbe:
- httpGet:
- path: /healthz
- port: {{ (.Values.config.httpListen | split ":")._1 }}
- readinessProbe:
- httpGet:
- path: /healthz
- port: {{ (.Values.config.httpListen | split ":")._1 }}
- resources:
- {{- toYaml .Values.resources | nindent 12 }}
- volumeMounts:
- - mountPath: /ingress-apisix/conf
- name: configuration
- env:
- - name: POD_NAMESPACE
- valueFrom:
- fieldRef:
- fieldPath: metadata.namespace
- - name: POD_NAME
- valueFrom:
- fieldRef:
- fieldPath: metadata.name
- {{- with .Values.nodeSelector }}
- nodeSelector:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- {{- with .Values.tolerations }}
- tolerations:
- {{- toYaml . | nindent 8 }}
- {{- end }}
diff --git a/charts/apisix-ingress-controller/templates/hpa.yaml
b/charts/apisix-ingress-controller/templates/hpa.yaml
deleted file mode 100644
index b959386..0000000
--- a/charts/apisix-ingress-controller/templates/hpa.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
- {{- if .Values.autoscaling.enabled }}
-apiVersion: autoscaling/v2beta1
-kind: HorizontalPodAutoscaler
-metadata:
- name: {{ include "apisix-ingress-controller.fullname" . }}
- labels:
- {{- include "apisix-ingress-controller.labels" . | nindent 4 }}
-spec:
- scaleTargetRef:
- apiVersion: apps/v1
- kind: Deployment
- name: {{ include "apisix-ingress-controller.fullname" . }}
- minReplicas: {{ .Values.autoscaling.minReplicas }}
- maxReplicas: {{ .Values.autoscaling.maxReplicas }}
- metrics:
- {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
- - type: Resource
- resource:
- name: cpu
- targetAverageUtilization: {{
.Values.autoscaling.targetCPUUtilizationPercentage }}
- {{- end }}
- {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
- - type: Resource
- resource:
- name: memory
- targetAverageUtilization: {{
.Values.autoscaling.targetMemoryUtilizationPercentage }}
- {{- end }}
-{{- end }}
diff --git a/charts/apisix-ingress-controller/templates/rbac.yaml
b/charts/apisix-ingress-controller/templates/rbac.yaml
deleted file mode 100644
index f36cd0b..0000000
--- a/charts/apisix-ingress-controller/templates/rbac.yaml
+++ /dev/null
@@ -1,165 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-{{- if .Values.rbac.create }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
- name: {{ .Release.Name }}-clusterrole
-rules:
- - apiGroups:
- - ""
- resources:
- - configmaps
- - endpoints
- - persistentvolumeclaims
- - pods
- - replicationcontrollers
- - replicationcontrollers/scale
- - serviceaccounts
- - services
- - secrets
- verbs:
- - get
- - list
- - watch
- - apiGroups:
- - ""
- resources:
- - bindings
- - events
- - limitranges
- - namespaces/status
- - pods/log
- - pods/status
- - replicationcontrollers/status
- - resourcequotas
- - resourcequotas/status
- verbs:
- - get
- - list
- - watch
- - apiGroups:
- - ""
- resources:
- - namespaces
- verbs:
- - get
- - list
- - watch
- - apiGroups:
- - apps
- resources:
- - controllerrevisions
- - daemonsets
- - deployments
- - deployments/scale
- - replicasets
- - replicasets/scale
- - statefulsets
- - statefulsets/scale
- verbs:
- - get
- - list
- - watch
- - apiGroups:
- - autoscaling
- resources:
- - horizontalpodautoscalers
- verbs:
- - get
- - list
- - watch
- - apiGroups:
- - batch
- resources:
- - cronjobs
- - jobs
- verbs:
- - get
- - list
- - watch
- - apiGroups:
- - extensions
- resources:
- - daemonsets
- - deployments
- - deployments/scale
- - ingresses
- - networkpolicies
- - replicasets
- - replicasets/scale
- - replicationcontrollers/scale
- verbs:
- - get
- - list
- - watch
- - apiGroups:
- - policy
- resources:
- - poddisruptionbudgets
- verbs:
- - get
- - list
- - watch
- - apiGroups:
- - networking.k8s.io
- resources:
- - ingresses
- - networkpolicies
- verbs:
- - get
- - list
- - watch
- - apiGroups:
- - metrics.k8s.io
- resources:
- - pods
- verbs:
- - get
- - list
- - watch
- - apiGroups:
- - apisix.apache.org
- resources:
- - apisixroutes
- - apisixupstreams
- - apisixservices
- - apisixtlses
- verbs:
- - get
- - list
- - watch
- - apiGroups:
- - coordination.k8s.io
- resources:
- - leases
- verbs:
- - '*'
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
- name: {{ .Release.Name }}-clusterrolebinding
-roleRef:
- apiGroup: rbac.authorization.k8s.io
- kind: ClusterRole
- name: {{ .Release.Name }}-clusterrole
-subjects:
- - kind: ServiceAccount
- name: {{ include "apisix-ingress-controller.serviceAccountName" . }}
- namespace: {{ .Release.Namespace }}
-{{- end }}
diff --git a/charts/apisix-ingress-controller/templates/service-account.yaml
b/charts/apisix-ingress-controller/templates/service-account.yaml
deleted file mode 100644
index f749221..0000000
--- a/charts/apisix-ingress-controller/templates/service-account.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-{{- if .Values.serviceAccount.create }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
- name: {{ include "apisix-ingress-controller.serviceAccountName" . }}
-{{- end }}
diff --git a/charts/apisix-ingress-controller/templates/service.yaml
b/charts/apisix-ingress-controller/templates/service.yaml
deleted file mode 100644
index 00d94e3..0000000
--- a/charts/apisix-ingress-controller/templates/service.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ include "apisix-ingress-controller.fullname" . }}
- labels:
- {{- include "apisix-ingress-controller.labels" . | nindent 4 }}
-spec:
- type: ClusterIP
- ports:
- - port: {{ .Values.service.port }}
- targetPort: {{ (.Values.config.httpListen | split ":")._1 }}
- protocol: TCP
- name: http
- selector:
- {{- include "apisix-ingress-controller.selectorLabels" . | nindent 4 }}
diff --git a/charts/apisix-ingress-controller/values.yaml
b/charts/apisix-ingress-controller/values.yaml
deleted file mode 100644
index 465f0ec..0000000
--- a/charts/apisix-ingress-controller/values.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Default values for apisix-ingress-controller.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-#
-nameOverride: ""
-
-fullnameOverride: ""
-
-rbac:
- # Specifies whether RBAC resources should be created
- create: true
-
-serviceAccount:
- # Specifies whether a ServiceAccount should be created
- create: true
- # The name of the ServiceAccount to use.
- # If not set and create is true, a name is generated using the fullname
template
- name: ~
-
-replicaCount: 1
-
-image:
- repository: apache/apisix-ingress-controller
- pullPolicy: IfNotPresent
- tag: "0.2.0"
-
-imagePullSecrets: []
-
-service:
- port: 80
-
-config:
- logLevel: "info"
- logOutput: "stderr"
- httpListen: ":8080"
- enableProfiling: true
- kubernetes:
- kubeconfig: ""
- resyncInterval: "60s"
- appNamespaces: ["*"]
- apisix:
- baseURL: "http://127.0.0.1:9080/apisix/admin";
- adminKey: "edd1c9f034335f136f87ad84b625c8f1"
-
-resources: {}
-
-autoscaling:
- enabled: false
- minReplicas: 1
- maxReplicas: 100
- targetCPUUtilizationPercentage: 80
- # targetMemoryUtilizationPercentage: 80
-
-nodeSelector: {}
-tolerations: []
diff --git a/docs/en/latest/deployments/ack.md
b/docs/en/latest/deployments/ack.md
index d6435ac..f46238c 100644
--- a/docs/en/latest/deployments/ack.md
+++ b/docs/en/latest/deployments/ack.md
@@ -27,7 +27,6 @@ This document explains how to install Ingress APISIX on
[ali-cloud ACK](https://
* Download the kube config for your ACK, follow the
[introduction](https://www.alibabacloud.com/help/zh/doc-detail/86378.html).
* Install [Helm](https://helm.sh/).
* Clone [Apache APISIX Charts](https://github.com/apache/apisix-helm-chart).
-* Clone
[apisix-ingress-controller](https://github.com/apache/apisix-ingress-controller).
* Make sure your target namespace exists, `kubectl` operations thorough this
document will be executed in namespace `ingress-apisix`.
## Install APISIX
@@ -37,8 +36,8 @@ This document explains how to install Ingress APISIX on
[ali-cloud ACK](https://
```shell
cd /path/to/apisix-helm-chart
helm repo add bitnami https://charts.bitnami.com/bitnami
-helm dependency update ./chart/apisix
-helm install apisix ./chart/apisix \
+helm dependency update ./charts/apisix
+helm install apisix ./charts/apisix \
--set gateway.type=LoadBalancer \
--set allow.ipList="{0.0.0.0/0}" \
--namespace ingress-apisix \
@@ -60,7 +59,7 @@ Another thing should be concerned that the `allow.ipList`
field should be custom
You can also install apisix-ingress-controller by Helm Charts, it's
recommended to install it in the same namespace with Apache APISIX.
```shell
-cd /path/to/apisix-ingress-controller
+cd /path/to/apisix-helm-chart
# install apisix-ingress-controller
helm install apisix-ingress-controller ./charts/apisix-ingress-controller \
--set image.tag=dev \
diff --git a/docs/en/latest/deployments/aws.md
b/docs/en/latest/deployments/aws.md
index 8130f41..34ba842 100644
--- a/docs/en/latest/deployments/aws.md
+++ b/docs/en/latest/deployments/aws.md
@@ -27,7 +27,6 @@ This document explains how to install Ingress APISIX on
[Amazon EKS](https://ama
* Install [Helm](https://helm.sh/).
* Download the kube config for your EKS from [aws cli
interface](https://amazonaws-china.com/cli/).
* Clone [Apache APISIX Charts](https://github.com/apache/apisix-helm-chart).
-* Clone
[apisix-ingress-controller](https://github.com/apache/apisix-ingress-controller).
* Make sure your target namespace exists, kubectl operations thorough this
document will be executed in namespace `ingress-apisix`.
## Install APISIX
@@ -37,8 +36,8 @@ This document explains how to install Ingress APISIX on
[Amazon EKS](https://ama
```shell
cd /path/to/apisix-helm-chart
helm repo add bitnami https://charts.bitnami.com/bitnami
-helm dependency update ./chart/apisix
-helm install apisix ./chart/apisix \
+helm dependency update ./charts/apisix
+helm install apisix ./charts/apisix \
--set gateway.type=LoadBalancer \
--set allow.ipList="{0.0.0.0/0}" \
--namespace ingress-apisix \
@@ -60,7 +59,7 @@ Another thing should be concerned that the `allow.ipList`
field should be custom
You can also install apisix-ingress-controller by Helm Charts, it's
recommended to install it in the same namespace with Apache APISIX.
```shell
-cd /path/to/apisix-ingress-controller
+cd /path/to/apisix-helm-chart
# install apisix-ingress-controller
helm install apisix-ingress-controller ./charts/apisix-ingress-controller \
--set image.tag=dev \
diff --git a/docs/en/latest/deployments/azure.md
b/docs/en/latest/deployments/azure.md
index 1845750..4dc6dba 100644
--- a/docs/en/latest/deployments/azure.md
+++ b/docs/en/latest/deployments/azure.md
@@ -27,7 +27,6 @@ This document explains how to install Ingress APISIX on
[Auzre AKS](https://docs
* Install [Azure
CLI](https://docs.microsoft.com/en-us/cli/azure/#:~:text=The%20Azure%20command%2Dline%20interface,with%20an%20emphasis%20on%20automation.)
and download the credentials by running `az aks get-credentials`.
* Install [Helm](https://helm.sh/).
* Clone [Apache APISIX Charts](https://github.com/apache/apisix-helm-chart).
-* Clone
[apisix-ingress-controller](https://github.com/apache/apisix-ingress-controller).
* Make sure your target namespace exists, kubectl operations thorough this
document will be executed in namespace `ingress-apisix`.
## Install APISIX
@@ -37,8 +36,8 @@ This document explains how to install Ingress APISIX on
[Auzre AKS](https://docs
```shell
cd /path/to/apisix-helm-chart
helm repo add bitnami https://charts.bitnami.com/bitnami
-helm dependency update ./chart/apisix
-helm install apisix ./chart/apisix \
+helm dependency update ./charts/apisix
+helm install apisix ./charts/apisix \
--set gateway.type=LoadBalancer \
--set allow.ipList="{0.0.0.0/0}" \
--namespace ingress-apisix
@@ -60,7 +59,7 @@ Another thing should be concerned that the `allow.ipList`
field should be custom
You can also install apisix-ingress-controller by Helm Charts, it's
recommended to install it in the same namespace with Apache APISIX.
```shell
-cd /path/to/apisix-ingress-controller
+cd /path/to/apisix-helm-chart
# install apisix-ingress-controller
helm install apisix-ingress-controller ./charts/apisix-ingress-controller \
--set image.tag=dev \
diff --git a/docs/en/latest/deployments/gke.md
b/docs/en/latest/deployments/gke.md
index 5c1ec07..cd03a1c 100644
--- a/docs/en/latest/deployments/gke.md
+++ b/docs/en/latest/deployments/gke.md
@@ -27,7 +27,6 @@ This document explains how to install Ingress APISIX on
[Google Cloud GKE](https
* Install [Google Cloud SDK](https://cloud.google.com/sdk) and get the
credentials or you can just use the [Cloud
Shell](https://cloud.google.com/shell).
* Install [Helm](https://helm.sh/).
* Clone [Apache APISIX Charts](https://github.com/apache/apisix-helm-chart).
-* Clone
[apisix-ingress-controller](https://github.com/apache/apisix-ingress-controller).
* Make sure your target namespace exists, kubectl operations thorough this
document will be executed in namespace `ingress-apisix`.
## Install APISIX
@@ -37,8 +36,8 @@ This document explains how to install Ingress APISIX on
[Google Cloud GKE](https
```shell
cd /path/to/apisix-helm-chart
helm repo add bitnami https://charts.bitnami.com/bitnami
-helm dependency update ./chart/apisix
-helm install apisix ./chart/apisix \
+helm dependency update ./charts/apisix
+helm install apisix ./charts/apisix \
--set gateway.type=LoadBalancer \
--set allow.ipList="{0.0.0.0/0}" \
--namespace ingress-apisix
@@ -60,7 +59,7 @@ Another thing should be concerned that the `allow.ipList`
field should be custom
You can also install apisix-ingress-controller by Helm Charts, it's
recommended to install it in the same namespace with Apache APISIX.
```shell
-cd /path/to/apisix-ingress-controller
+cd /path/to/apisix-helm-chart
# install apisix-ingress-controller
helm install apisix-ingress-controller ./charts/apisix-ingress-controller \
--set image.tag=dev \
diff --git a/docs/en/latest/deployments/k3s-rke.md
b/docs/en/latest/deployments/k3s-rke.md
index 9d582e1..b45c907 100644
--- a/docs/en/latest/deployments/k3s-rke.md
+++ b/docs/en/latest/deployments/k3s-rke.md
@@ -29,7 +29,6 @@ It's a good choice to use Ingress APISIX as the north-south
API gateway in K3S.
* Install [K3S](https://rancher.com/docs/k3s/latest/en/installation/) or
[Rancher RKE](https://rancher.com/docs/rke/latest/en/installation/).
* Install [Helm](https://helm.sh/).
* Clone [Apache APISIX Charts](https://github.com/apache/apisix-helm-chart).
-* Clone
[apisix-ingress-controller](https://github.com/apache/apisix-ingress-controller).
* Make sure your target namespace exists, kubectl operations thorough this
document will be executed in namespace `ingress-apisix`.
## Install APISIX
@@ -39,8 +38,8 @@ It's a good choice to use Ingress APISIX as the north-south
API gateway in K3S.
```shell
cd /path/to/apisix-helm-chart
helm repo add bitnami https://charts.bitnami.com/bitnami
-helm dependency update ./chart/apisix
-helm install apisix ./chart/apisix \
+helm dependency update ./charts/apisix
+helm install apisix ./charts/apisix \
--set gateway.type=NodePort \
--set allow.ipList="{0.0.0.0/0}" \
--namespace ingress-apisix \
@@ -62,7 +61,7 @@ Another thing should be concerned that the `allow.ipList`
field should be custom
You can also install apisix-ingress-controller by Helm Charts, it's
recommended to install it in the same namespace with Apache APISIX.
```shell
-cd /path/to/apisix-ingress-controller
+cd /path/to/apisix-helm-chart
# install apisix-ingress-controller
helm install apisix-ingress-controller ./charts/apisix-ingress-controller \
--set image.tag=dev \
diff --git a/docs/en/latest/deployments/kubesphere.md
b/docs/en/latest/deployments/kubesphere.md
index a9f7fd7..3d15bae 100644
--- a/docs/en/latest/deployments/kubesphere.md
+++ b/docs/en/latest/deployments/kubesphere.md
@@ -28,7 +28,6 @@ KubeSphere is a distributed operating system managing cloud
native applications
* Install [KubeSphere](https://kubesphere.io/docs/quick-start/), you can
choose [All-in-one Installation on
Linux](https://kubesphere.io/docs/quick-start/all-in-one-on-linux/) or [Minimal
KubeSphere on
Kubernetes](https://kubesphere.io/docs/quick-start/minimal-kubesphere-on-k8s/).
* Install [Helm](https://helm.sh/).
* Clone [Apache APISIX Charts](https://github.com/apache/apisix-helm-chart).
-* Clone
[apisix-ingress-controller](https://github.com/apache/apisix-ingress-controller).
* Make sure your target namespace exists, kubectl operations of this document
will be executed in namespace `ingress-apisix`.
## Install APISIX
@@ -38,8 +37,8 @@ KubeSphere is a distributed operating system managing cloud
native applications
```shell
cd /path/to/apisix-helm-chart
helm repo add bitnami https://charts.bitnami.com/bitnami
-helm dependency update ./chart/apisix
-helm install apisix ./chart/apisix \
+helm dependency update ./charts/apisix
+helm install apisix ./charts/apisix \
--set gateway.type=NodePort \
--set allow.ipList="{0.0.0.0/0}" \
--namespace ingress-apisix \
@@ -58,7 +57,7 @@ Another thing that should be concerned that the
`allow.ipList` field should be c
You can also install apisix-ingress-controller by Helm Charts. It's
recommended to install it in the same namespace with Apache APISIX.
```shell
-cd /path/to/apisix-ingress-controller
+cd /path/to/apisix-helm-chart
# install apisix-ingress-controller
helm install apisix-ingress-controller ./charts/apisix-ingress-controller \
--set image.tag=dev \
diff --git a/docs/en/latest/deployments/minikube.md
b/docs/en/latest/deployments/minikube.md
index 362abb4..3454102 100644
--- a/docs/en/latest/deployments/minikube.md
+++ b/docs/en/latest/deployments/minikube.md
@@ -26,7 +26,6 @@ This document explains how to install Ingress APISIX on
[Minikube](https://minik
* Install [Minikube](https://minikube.sigs.k8s.io/docs/start/).
* Install [Helm](https://helm.sh/).
* Clone [Apache APISIX Charts](https://github.com/apache/apisix-helm-chart).
-* Clone
[apisix-ingress-controller](https://github.com/apache/apisix-ingress-controller).
* Make sure your target namespace exists, kubectl operations thorough this
document will be executed in namespace `ingress-apisix`.
## Install APISIX
@@ -36,8 +35,8 @@ This document explains how to install Ingress APISIX on
[Minikube](https://minik
```shell
cd /path/to/apisix-helm-chart
helm repo add bitnami https://charts.bitnami.com/bitnami
-helm dependency update ./chart/apisix
-helm install apisix ./chart/apisix \
+helm dependency update ./charts/apisix
+helm install apisix ./charts/apisix \
--set allow.ipList="{0.0.0.0/0}" \
--namespace ingress-apisix
kubectl get service --namespace ingress-apisix
@@ -52,7 +51,7 @@ One thing should be concerned that the `allow.ipList` field
should be customized
You can also install apisix-ingress-controller by Helm Charts, it's
recommended to install it in the same namespace with Apache APISIX.
```shell
-cd /path/to/apisix-ingress-controller
+cd /path/to/apisix-helm-chart
# install apisix-ingress-controller
helm install apisix-ingress-controller ./charts/apisix-ingress-controller \
--set image.tag=dev \
diff --git a/docs/en/latest/deployments/tke.md
b/docs/en/latest/deployments/tke.md
index 96b9db3..97fa0e5 100644
--- a/docs/en/latest/deployments/tke.md
+++ b/docs/en/latest/deployments/tke.md
@@ -27,7 +27,6 @@ This document explains how to install Ingress APISIX on
[Tencent TKE](https://cl
* Install [Helm](https://helm.sh/).
* Download the kube config for your TKE Console.
* Clone [Apache APISIX Charts](https://github.com/apache/apisix-helm-chart).
-* Clone
[apisix-ingress-controller](https://github.com/apache/apisix-ingress-controller).
* Make sure your target namespace exists, kubectl operations thorough this
document will be executed in namespace `ingress-apisix`.
## Install APISIX
@@ -37,8 +36,8 @@ This document explains how to install Ingress APISIX on
[Tencent TKE](https://cl
```shell
cd /path/to/apisix-helm-chart
helm repo add bitnami https://charts.bitnami.com/bitnami
-helm dependency update ./chart/apisix
-helm install apisix ./chart/apisix \
+helm dependency update ./charts/apisix
+helm install apisix ./charts/apisix \
--set gateway.type=LoadBalancer \
--set allow.ipList="{0.0.0.0/0}" \
--set etcd.persistence.size=10Gi \
@@ -63,7 +62,7 @@ Another thing should be concerned that the `allow.ipList`
field should be custom
You can also install apisix-ingress-controller by Helm Charts, it's
recommended to install it in the same namespace with Apache APISIX.
```shell
-cd /path/to/apisix-ingress-controller
+cd /path/to/apisix-helm-chart
# install apisix-ingress-controller
helm install apisix-ingress-controller ./charts/apisix-ingress-controller \
--set image.tag=dev \
