Calico cleanup, add efs-csi

This commit is contained in:
Stefan Reimer 2020-07-29 14:46:55 +01:00
parent bbc60e778f
commit 2b5103c6ee
7 changed files with 62 additions and 25 deletions

View File

@ -0,0 +1,34 @@
# Once pod is running:
# kubectl -n NAME-SPACE-TO-TEST exec -it pod/POD_NAME /bin/sh
apiVersion: apps/v1
kind: Deployment
metadata:
name: netshoot
namespace: kube-system
labels:
app: netshoot
spec:
replicas: 2
strategy:
type: Recreate
selector:
matchLabels:
app: netshoot
template:
metadata:
labels:
app: netshoot
spec:
containers:
- name: netshoot
image: nicolaka/netshoot
imagePullPolicy: Always
command:
- /bin/sleep
args:
- "3600"
affinity:
podAntiAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
- topologyKey: "kubernetes.io/hostname"

View File

@ -2,7 +2,7 @@ apiVersion: v2
name: kubezero name: kubezero
description: KubeZero ArgoCD Application - Root App of Apps chart of KubeZero description: KubeZero ArgoCD Application - Root App of Apps chart of KubeZero
type: application type: application
version: 0.3.10 version: 0.3.11
home: https://kubezero.com home: https://kubezero.com
icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
keywords: keywords:
@ -15,4 +15,4 @@ dependencies:
- name: kubezero-lib - name: kubezero-lib
version: ">= 0.1.1" version: ">= 0.1.1"
repository: https://zero-down-time.github.io/kubezero/ repository: https://zero-down-time.github.io/kubezero/
kubeVersion: ">= 1.16.0" kubeVersion: ">= 1.16.12"

View File

@ -2,7 +2,7 @@ kubezero
======== ========
KubeZero ArgoCD Application - Root App of Apps chart of KubeZero KubeZero ArgoCD Application - Root App of Apps chart of KubeZero
Current chart version is `0.3.10` Current chart version is `0.3.11`
Source code can be found [here](https://kubezero.com) Source code can be found [here](https://kubezero.com)
@ -19,8 +19,6 @@ Source code can be found [here](https://kubezero.com)
| aws-ebs-csi-driver.enabled | bool | `false` | | | aws-ebs-csi-driver.enabled | bool | `false` | |
| aws-efs-csi-driver.enabled | bool | `false` | | | aws-efs-csi-driver.enabled | bool | `false` | |
| calico.enabled | bool | `true` | | | calico.enabled | bool | `true` | |
| calico.type | string | `"kustomize"` | |
| calico.values.migration | bool | `false` | |
| cert-manager.enabled | bool | `true` | | | cert-manager.enabled | bool | `true` | |
| global.defaultDestination.server | string | `"https://kubernetes.default.svc"` | | | global.defaultDestination.server | string | `"https://kubernetes.default.svc"` | |
| global.defaultSource.pathPrefix | string | `""` | | | global.defaultSource.pathPrefix | string | `""` | |

View File

@ -1,10 +1,8 @@
{{- if .Values.calico.enabled }} {{- if .Values.calico.enabled }}
{{ template "kubezero-app.app" dict "root" . "name" "calico" "type" .Values.calico.type "retain" true }} {{ template "kubezero-app.app" dict "root" . "name" "calico" "type" "helm" "retain" true }}
{{- if not .Values.calico.values.migration }}
syncPolicy: syncPolicy:
automated: automated:
prune: true prune: true
{{- end }}
ignoreDifferences: ignoreDifferences:
- group: apiextensions.k8s.io - group: apiextensions.k8s.io

View File

@ -17,9 +17,6 @@ platform: aws
calico: calico:
enabled: true enabled: true
type: kustomize
values:
migration: false
cert-manager: cert-manager:
enabled: true enabled: true

View File

@ -7,11 +7,9 @@ kubezero:
enabled: {{ .Values.calico.enabled }} enabled: {{ .Values.calico.enabled }}
type: {{ default "kustomize" .Values.calico.type }} type: {{ default "kustomize" .Values.calico.type }}
values: values:
migration: {{ default false .Values.calico.migration }}
prometheus: false
# prometheus: {{ .Values.prometheus.enabled }}
network: {{ default "vxlan" .Values.calico.network }} network: {{ default "vxlan" .Values.calico.network }}
mtu: {{ default "8941" .Values.calico.mtu }} mtu: {{ default "8941" .Values.calico.mtu }}
prometheus: {{ .Values.prometheus.enabled }}
cert-manager: cert-manager:
enabled: {{ index .Values "cert-manager" "enabled" }} enabled: {{ index .Values "cert-manager" "enabled" }}
{{- if not .Values.bootstrap }} {{- if not .Values.bootstrap }}
@ -52,6 +50,7 @@ kubezero:
iam.amazonaws.com/role: "{{ index .Values "aws-ebs-csi-driver" "IamArn" }}" iam.amazonaws.com/role: "{{ index .Values "aws-ebs-csi-driver" "IamArn" }}"
extraVolumeTags: extraVolumeTags:
Name: {{ .Values.ClusterName }} Name: {{ .Values.ClusterName }}
kiam: kiam:
enabled: {{ .Values.kiam.enabled }} enabled: {{ .Values.kiam.enabled }}
values: values:
@ -63,6 +62,17 @@ kubezero:
prometheus: prometheus:
servicemonitor: servicemonitor:
enabled: {{ .Values.prometheus.enabled }} enabled: {{ .Values.prometheus.enabled }}
aws-efs-csi-driver:
enabled: {{ index .Values "aws-efs-csi-driver" "enabled" }}
values:
aws-efs-csi-driver:
nodeSelector:
node.kubernetes.io/csi.efs.fs: {{ index .Values "aws-efs-csi-driver" "EfsId" }}
PersistentVolume:
create: true
EfsId: {{ index .Values "aws-efs-csi-driver" "EfsId" }}
Name: {{ default "kubezero-efs-pv" ( index .Values "aws-efs-csi-driver" "PVName" ) }}
{{- end }} {{- end }}
istio: istio:
@ -70,13 +80,9 @@ kubezero:
values: values:
istiod: istiod:
replicaCount: {{ ternary 2 1 .Values.HighAvailableControlplane }} replicaCount: {{ ternary 2 1 .Values.HighAvailableControlplane }}
{{- if .Values.istio.ingress }}
ingress: ingress:
private: {{ .Values.istio.ingress.private }} {{- toYaml .Values.istio.ingress | nindent 8 }}
type: {{ .Values.istio.ingress.type }}
replicaCount: {{ default 2 .Values.istio.ingress.replicaCount }}
dnsNames:
{{- with .Values.istio.ingress.dnsNames }}
{{- . | toYaml | nindent 8 }}
{{- end }} {{- end }}
{{- end }} {{- end }}
@ -90,7 +96,7 @@ argo-cd:
configs: configs:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- if and ( not .Values.bootstrap ) .Values.istio.enabled }} {{- if and ( not .Values.bootstrap ) ( index .Values "argo-cd" "istio" ) }}
istio: istio:
{{- with index .Values "argo-cd" "istio" }} {{- with index .Values "argo-cd" "istio" }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}

View File

@ -1,12 +1,11 @@
ClusterName: Test-cluster ClusterName: Test-cluster
Domain: example.com Domain: example.com
aws: true platform: aws
HighAvailableControlplane: false HighAvailableControlplane: false
calico: calico:
enabled: true enabled: true
migration: false
cert-manager: cert-manager:
enabled: true enabled: true
@ -16,6 +15,9 @@ aws-ebs-csi-driver:
enabled: true enabled: true
IamArn: "" IamArn: ""
aws-efs-csi-driver:
enabled: false
kiam: kiam:
enabled: true enabled: true
IamArn: "" IamArn: ""
@ -28,4 +30,6 @@ prometheus:
argo-cd: argo-cd:
server: {} server: {}
istio:
enabled: true
gateway: private-ingressgateway.istio-system.svc.cluster.local gateway: private-ingressgateway.istio-system.svc.cluster.local