New cleaned up KubeZero layout

This commit is contained in:
Stefan Reimer 2020-06-25 13:52:07 +01:00
parent 3e5d9056cb
commit 86cfb147e3
20 changed files with 151 additions and 155 deletions

View File

@ -1,2 +1,4 @@
# Ignore sub-charts # Ignore sub-charts
charts/*/charts/* charts/*/charts/*
charts/kubezero-lib
deploy

View File

@ -1,27 +0,0 @@
kubezero-app
============
KubeZero ArgoCD Application - Root chart of the KubeZero
Current chart version is `0.2.4`
Source code can be found [here](https://kubezero.com)
## Chart Requirements
| Repository | Name | Version |
|------------|------|---------|
| https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.1 |
## Chart Values
| Key | Type | Default | Description |
|-----|------|---------|-------------|
| aws-ebs-csi-driver.enabled | bool | `false` | |
| calico.enabled | bool | `false` | |
| cert-manager.enabled | bool | `false` | |
| global.defaultDestination.server | string | `"https://kubernetes.default.svc"` | |
| global.defaultSource.pathPrefix | string | `""` | |
| global.defaultSource.repoURL | string | `"https://github.com/zero-down-time/kubezero"` | |
| global.defaultSource.targetRevision | string | `"HEAD"` | |
| kiam.enabled | bool | `false` | |
| local-volume-provisioner.enabled | bool | `false` | |

View File

@ -1,29 +0,0 @@
global:
defaultDestination:
server: https://kubernetes.default.svc
# This repoURL is used a base for all the repoURLs applications
# Setting this to a eg. private git repo incl. the use of pathPrefix allows kubezero to be
# integrated into any repository as a git subtree if for example public internet access is unavailable
defaultSource:
# defaultSource.repoURL -- default repository for argocd applications
repoURL: https://github.com/zero-down-time/kubezero
# defaultSource.targetRevision -- default tracking of repoURL
targetRevision: HEAD
# defaultSource.pathPrefix -- optional path prefix within repoURL to support eg. remote subtrees
pathPrefix: ''
calico:
enabled: false
local-volume-provisioner:
enabled: false
cert-manager:
enabled: false
kiam:
enabled: false
aws-ebs-csi-driver:
enabled: false

View File

@ -1,8 +1,7 @@
apiVersion: v2 apiVersion: v2
name: kubezero-app description: KubeZero ArgoCD Helm chart to install ArgoCD itself and the KubeZero ArgoCD Application
description: KubeZero ArgoCD Application - Root chart of the KubeZero name: kubezero-argo-cd
type: application version: 0.3.0
version: 0.2.4
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:
@ -11,8 +10,12 @@ keywords:
- gitops - gitops
maintainers: maintainers:
- name: Quarky9 - name: Quarky9
dependencies:
dependencies: 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/
- name: argo-cd
version: 2.3.2
repository: https://argoproj.github.io/argo-helm
kubeVersion: ">= 1.16.0" kubeVersion: ">= 1.16.0"

View File

@ -0,0 +1,42 @@
kubezero-argo-cd
================
KubeZero ArgoCD Helm chart to install ArgoCD itself and the KubeZero ArgoCD Application
Current chart version is `0.3.0`
Source code can be found [here](https://kubezero.com)
## Chart Requirements
| Repository | Name | Version |
|------------|------|---------|
| https://argoproj.github.io/argo-helm | argo-cd | 2.3.2 |
| https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.1 |
## Chart Values
| Key | Type | Default | Description |
|-----|------|---------|-------------|
| argo-cd.controller.nodeSelector."node-role.kubernetes.io/master" | string | `""` | |
| argo-cd.controller.tolerations[0].effect | string | `"NoSchedule"` | |
| argo-cd.controller.tolerations[0].key | string | `"node-role.kubernetes.io/master"` | |
| argo-cd.dex.enabled | bool | `false` | |
| argo-cd.installCRDs | bool | `false` | |
| argo-cd.istio.enabled | bool | `false` | Deploy Istio VirtualService to expose ArgoCD |
| argo-cd.istio.gateway | string | `"ingressgateway.istio-system.svc.cluster.local"` | Name of the Istio gateway to add the VirtualService to |
| argo-cd.redis.nodeSelector."node-role.kubernetes.io/master" | string | `""` | |
| argo-cd.redis.tolerations[0].effect | string | `"NoSchedule"` | |
| argo-cd.redis.tolerations[0].key | string | `"node-role.kubernetes.io/master"` | |
| argo-cd.repoServer.nodeSelector."node-role.kubernetes.io/master" | string | `""` | |
| argo-cd.repoServer.tolerations[0].effect | string | `"NoSchedule"` | |
| argo-cd.repoServer.tolerations[0].key | string | `"node-role.kubernetes.io/master"` | |
| argo-cd.server.config.url | string | `"argocd.example.com"` | ArgoCD hostname to be exposed via Istio |
| argo-cd.server.extraArgs[0] | string | `"--insecure"` | |
| argo-cd.server.nodeSelector."node-role.kubernetes.io/master" | string | `""` | |
| argo-cd.server.service.servicePortHttpsName | string | `"grpc"` | |
| argo-cd.server.tolerations[0].effect | string | `"NoSchedule"` | |
| argo-cd.server.tolerations[0].key | string | `"node-role.kubernetes.io/master"` | |
| kubezero.global.defaultDestination | object | `{"server":"https://kubernetes.default.svc"}` | Destination cluster |
| kubezero.global.defaultSource.pathPrefix | string | `""` | optional path prefix within repoURL to support eg. remote subtrees |
| kubezero.global.defaultSource.repoURL | string | `"https://github.com/zero-down-time/kubezero"` | default repository for argocd applications |
| kubezero.global.defaultSource.targetRevision | string | `"HEAD"` | default tracking of repoURL |

View File

@ -8,20 +8,16 @@ metadata:
spec: spec:
project: kubezero project: kubezero
source: source:
repoURL: {{ .Values.global.defaultSource.repoURL }} repoURL: {{ .Values.kubezero.global.defaultSource.repoURL }}
targetRevision: {{ .Values.global.defaultSource.targetRevision }} targetRevision: {{ .Values.kubezero.global.defaultSource.targetRevision }}
path: {{ .Values.global.defaultSource.pathPrefix}}charts/kubezero-app path: {{ .Values.kubezero.global.defaultSource.pathPrefix}}charts/kubezero
helm: helm:
values: | values: |
global:
{{- toYaml .Values.global | nindent 10 }}
{{- if .Values.kubezero }}
{{- toYaml .Values.kubezero | nindent 8 }} {{- toYaml .Values.kubezero | nindent 8 }}
{{- end }}
destination: destination:
server: {{ .Values.global.defaultDestination.server }} server: {{ .Values.kubezero.global.defaultDestination.server }}
namespace: argocd namespace: argocd
syncPolicy: syncPolicy:
automated: automated:

View File

@ -1,4 +1,4 @@
{{- if .Values.istio.enabled }} {{- if index .Values "argo-cd" "istio" "enabled" }}
apiVersion: networking.istio.io/v1alpha3 apiVersion: networking.istio.io/v1alpha3
kind: VirtualService kind: VirtualService
metadata: metadata:
@ -7,7 +7,7 @@ metadata:
{{ include "kubezero-lib.labels" . | indent 4 }} {{ include "kubezero-lib.labels" . | indent 4 }}
spec: spec:
gateways: gateways:
- {{ .Values.istio.gateway }} - {{ index .Values "argo-cd" "istio" "gateway" }}
hosts: hosts:
- {{ index .Values "argo-cd" "server" "config" "url" }} - {{ index .Values "argo-cd" "server" "config" "url" }}
http: http:

View File

@ -0,0 +1,73 @@
kubezero:
global:
# kubezero.global.defaultDestination -- Destination cluster
defaultDestination:
server: https://kubernetes.default.svc
# This repoURL is used a base for all the repoURLs applications
# Setting this to a eg. private git repo incl. the use of pathPrefix allows kubezero to be
# integrated into any repository as a git subtree if for example public internet access is unavailable
defaultSource:
# kubezero.global.defaultSource.repoURL -- default repository for argocd applications
repoURL: https://github.com/zero-down-time/kubezero
# kubezero.global.defaultSource.targetRevision -- default tracking of repoURL
targetRevision: HEAD
# kubezero.global.defaultSource.pathPrefix -- optional path prefix within repoURL to support eg. remote subtrees
pathPrefix: ''
argo-cd:
installCRDs: false
#configs:
# secret:
# `htpasswd -nbBC 10 "" $ARGO_PWD | tr -d ':\n' | sed 's/$2y/$2a/'`
# argocdServerAdminPassword: "$2a$10$ivKzaXVxMqdeDSfS3nqi1Od3iDbnL7oXrixzDfZFRHlXHnAG6LydG"
# argocdServerAdminPasswordMtime: "2020-04-24T15:33:09BST"
# Run Argo on the controllers
controller:
nodeSelector:
node-role.kubernetes.io/master: ""
tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
repoServer:
nodeSelector:
node-role.kubernetes.io/master: ""
tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
server:
config:
# argo-cd.server.config.url -- ArgoCD hostname to be exposed via Istio
url: argocd.example.com
# Rename former https port to grpc, works with istio + insecure
service:
servicePortHttpsName: grpc
extraArgs:
- --insecure
nodeSelector:
node-role.kubernetes.io/master: ""
tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
redis:
nodeSelector:
node-role.kubernetes.io/master: ""
tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
dex:
enabled: false
istio:
# argo-cd.istio.enabled -- Deploy Istio VirtualService to expose ArgoCD
enabled: false
# argo-cd.istio.gateway -- Name of the Istio gateway to add the VirtualService to
gateway: ingressgateway.istio-system.svc.cluster.local

View File

@ -1,7 +1,8 @@
apiVersion: v2 apiVersion: v2
description: KubeZero Helm chart to install Zero Down Time Kuberenetes platform
name: kubezero name: kubezero
version: 0.2.6 description: KubeZero ArgoCD Application - Root App of Apps chart of KubeZero
type: application
version: 0.3.0
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:
@ -10,12 +11,8 @@ keywords:
- gitops - gitops
maintainers: maintainers:
- name: Quarky9 - name: Quarky9
dependencies:
dependencies: 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/
- name: argo-cd
version: 2.3.2
repository: https://argoproj.github.io/argo-helm
kubeVersion: ">= 1.16.0" kubeVersion: ">= 1.16.0"

View File

@ -1,8 +1,8 @@
kubezero kubezero
======== ========
KubeZero Helm chart to install Zero Down Time Kuberenetes platform KubeZero ArgoCD Application - Root App of Apps chart of KubeZero
Current chart version is `0.2.6` Current chart version is `0.3.0`
Source code can be found [here](https://kubezero.com) Source code can be found [here](https://kubezero.com)
@ -10,34 +10,18 @@ Source code can be found [here](https://kubezero.com)
| Repository | Name | Version | | Repository | Name | Version |
|------------|------|---------| |------------|------|---------|
| https://argoproj.github.io/argo-helm | argo-cd | 2.3.2 |
| https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.1 | | https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.1 |
## Chart Values ## Chart Values
| Key | Type | Default | Description | | Key | Type | Default | Description |
|-----|------|---------|-------------| |-----|------|---------|-------------|
| argo-cd.controller.nodeSelector."node-role.kubernetes.io/master" | string | `""` | | | aws-ebs-csi-driver.enabled | bool | `false` | |
| argo-cd.controller.tolerations[0].effect | string | `"NoSchedule"` | | | calico.enabled | bool | `false` | |
| argo-cd.controller.tolerations[0].key | string | `"node-role.kubernetes.io/master"` | | | cert-manager.enabled | bool | `false` | |
| argo-cd.dex.enabled | bool | `false` | |
| argo-cd.installCRDs | bool | `false` | |
| argo-cd.redis.nodeSelector."node-role.kubernetes.io/master" | string | `""` | |
| argo-cd.redis.tolerations[0].effect | string | `"NoSchedule"` | |
| argo-cd.redis.tolerations[0].key | string | `"node-role.kubernetes.io/master"` | |
| argo-cd.repoServer.nodeSelector."node-role.kubernetes.io/master" | string | `""` | |
| argo-cd.repoServer.tolerations[0].effect | string | `"NoSchedule"` | |
| argo-cd.repoServer.tolerations[0].key | string | `"node-role.kubernetes.io/master"` | |
| argo-cd.server.config.url | string | `"argocd.example.com"` | ArgoCD hostname to be exposed via Istio |
| argo-cd.server.extraArgs[0] | string | `"--insecure"` | |
| argo-cd.server.nodeSelector."node-role.kubernetes.io/master" | string | `""` | |
| argo-cd.server.service.servicePortHttpsName | string | `"grpc"` | |
| argo-cd.server.tolerations[0].effect | string | `"NoSchedule"` | |
| argo-cd.server.tolerations[0].key | string | `"node-role.kubernetes.io/master"` | |
| global.defaultDestination.server | string | `"https://kubernetes.default.svc"` | | | global.defaultDestination.server | string | `"https://kubernetes.default.svc"` | |
| global.defaultSource.pathPrefix | string | `""` | | | global.defaultSource.pathPrefix | string | `""` | |
| global.defaultSource.repoURL | string | `"https://github.com/zero-down-time/kubezero"` | | | global.defaultSource.repoURL | string | `"https://github.com/zero-down-time/kubezero"` | |
| global.defaultSource.targetRevision | string | `"HEAD"` | | | global.defaultSource.targetRevision | string | `"HEAD"` | |
| istio.enabled | bool | `false` | Deploy Istio VirtualService to expose ArgoCD | | kiam.enabled | bool | `false` | |
| istio.gateway | string | `"ingressgateway.istio-system.svc.cluster.local"` | Name of the Istio gateway to add the VirtualService to | | local-volume-provisioner.enabled | bool | `false` | |
| kubezero | object | `{}` | Kubezero configuration, values.yaml please see kubezeroApp |

View File

@ -13,62 +13,17 @@ global:
# defaultSource.pathPrefix -- optional path prefix within repoURL to support eg. remote subtrees # defaultSource.pathPrefix -- optional path prefix within repoURL to support eg. remote subtrees
pathPrefix: '' pathPrefix: ''
# kubezero -- Kubezero configuration, values.yaml please see kubezeroApp calico:
kubezero: {} enabled: true
argo-cd: cert-manager:
installCRDs: false enabled: true
#configs: local-volume-provisioner:
# secret: enabled: false
# `htpasswd -nbBC 10 "" $ARGO_PWD | tr -d ':\n' | sed 's/$2y/$2a/'`
# argocdServerAdminPassword: "$2a$10$ivKzaXVxMqdeDSfS3nqi1Od3iDbnL7oXrixzDfZFRHlXHnAG6LydG" kiam:
# argocdServerAdminPasswordMtime: "2020-04-24T15:33:09BST" enabled: false
# Run Argo on the controllers aws-ebs-csi-driver:
controller:
nodeSelector:
node-role.kubernetes.io/master: ""
tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
repoServer:
nodeSelector:
node-role.kubernetes.io/master: ""
tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
server:
config:
# argo-cd.server.config.url -- ArgoCD hostname to be exposed via Istio
url: argocd.example.com
# Rename former https port to grpc, works with istio + insecure
service:
servicePortHttpsName: grpc
extraArgs:
- --insecure
nodeSelector:
node-role.kubernetes.io/master: ""
tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
redis:
nodeSelector:
node-role.kubernetes.io/master: ""
tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
dex:
enabled: false
istio:
# istio.enabled -- Deploy Istio VirtualService to expose ArgoCD
enabled: false enabled: false
# istio.gateway -- Name of the Istio gateway to add the VirtualService to
gateway: ingressgateway.istio-system.svc.cluster.local