ZeroDownTime
/
kubezero
3
0
Fork 0
Code Issues 1 Pull Requests 23 Releases Wiki Activity

Upgrade stable to reflect changes in global values handling allowing pinning clusters to branches #1

Manually merged
stefan merged 2 commits from master into stable 2020-05-15 09:57:04 +00:00
Conversation 0 Commits 2 Files Changed 14 +159 -37
14 changed files with 159 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
charts/kubezero-app/Chart.yaml
View File

@ -2,7 +2,7 @@ apiVersion: v2
name: kubezero-app
description: KubeZero ArgoCD Application - Root chart of the KubeZero
type: application
version: 0.1.10
version: 0.2.0
home: https://kubezero.com
icon: https://cdn.zero-downtime.net/assets/logo_small.png
keywords:
@ -11,3 +11,4 @@ keywords:
- gitops
maintainers:
- name: Quarky9
kubeVersion: ">= 1.16.0"

20
charts/kubezero-app/templates/_apps_common.yaml
View File

@ -9,26 +9,30 @@ metadata:
helm.sh/chart: {{ .root.Chart.Name }}-{{ .root.Chart.Version | replace "+" "_" }}
app.kubernetes.io/managed-by: {{ .root.Release.Service }}
app.kubernetes.io/part-of: kubezero
{{- if not .retain }}
finalizers:
- resources-finalizer.argocd.argoproj.io
{{ end }}
spec:
project: kubezero
source:
repoURL: {{ default .root.Values.defaultSource.repoURL }}
targetRevision: {{ default .root.Values.defaultSource.targetRevision }}
repoURL: {{ .root.Values.global.defaultSource.repoURL }}
targetRevision: {{ .root.Values.global.defaultSource.targetRevision }}
{{- if eq .type "helm" }}
{{ $values := index .root.Values .name "values" }}
path: {{ default .root.Values.defaultSource.pathPrefix }}charts/kubezero-{{ .name }}
{{- if $values }}
{{- $my_values := index .root.Values .name "values" }}
path: {{ .root.Values.global.defaultSource.pathPrefix}}charts/kubezero-{{ .name }}
{{- if $my_values }}
helm:
values: |
{{- toYaml $values | nindent 8 }}
{{- toYaml $my_values | nindent 8 }}
{{- end }}
{{- else }}
path: {{ default .root.Values.defaultSource.pathPrefix }}artifacts/kubezero-{{ .name }}
path: {{ .root.Values.global.defaultSource.pathPrefix }}artifacts/kubezero-{{ .name }}
{{- end }}
destination:
server: {{ default .root.Values.defaultDestination.server }}
server: {{ .root.Values.global.defaultDestination.server }}
namespace: {{ default "kube-system" .namespace }}
syncPolicy:

2
charts/kubezero-app/templates/calico.yaml
View File

@ -1,3 +1,3 @@
{{- if .Values.calico.enabled }}
{{ template "kubezero.app" dict "root" . "name" "calico" "type" "kustomize" }}
{{ template "kubezero.app" dict "root" . "name" "calico" "type" "kustomize" "retain" true }}
{{- end }}

3
charts/kubezero-app/templates/kiam.yaml Normal file
View File

@ -0,0 +1,3 @@
{{- if index .Values "kiam" "enabled" }}
{{ template "kubezero.app" dict "root" . "name" "kiam" "type" "helm" }}
{{- end }}

21
charts/kubezero-app/values-all.yaml
View File

@ -1,13 +1,17 @@
defaultDestination:
server: https://kubernetes.default.svc
global:
defaultDestination:
server: https://kubernetes.default.svc
defaultSource:
# 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
# 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
repoURL: https://github.com/zero-down-time/kubezero
targetRevision: HEAD
pathPrefix: ''
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: true
@ -17,3 +21,6 @@ local-volume-provisioner:
cert-manager:
enabled: true
kiam:
enabled: true

28
charts/kubezero-app/values.yaml
View File

@ -1,16 +1,17 @@
defaultDestination:
server: https://kubernetes.default.svc
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: ''
# 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
@ -20,3 +21,6 @@ local-volume-provisioner:
cert-manager:
enabled: false
kiam:
enabled: false

3
charts/kubezero-cert-manager/Chart.yaml
View File

@ -2,7 +2,7 @@ apiVersion: v2
name: kubezero-cert-manager
description: KubeZero Umbrella Chart for cert-manager
type: application
version: 0.3.1
version: 0.3.2
home: https://kubezero.com
icon: https://cdn.zero-downtime.net/assets/logo_small.png
keywords:
@ -14,3 +14,4 @@ dependencies:
- name: cert-manager
version: 0.15.0
repository: https://charts.jetstack.io
kubeVersion: ">= 1.16.0"

23
charts/kubezero-kiam/.helmignore Normal file
View File

@ -0,0 +1,23 @@
# 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/

17
charts/kubezero-kiam/Chart.yaml Normal file
View File

@ -0,0 +1,17 @@
apiVersion: v2
name: kubezero-kiam
description: KubeZero Umbrella Chart for Kiam
type: application
version: 0.1.0
home: https://kubezero.com
icon: https://cdn.zero-downtime.net/assets/logo_small.png
keywords:
- kubezero
- kiam
maintainers:
- name: Quarky9
dependencies:
- name: kiam
version: 5.7.0
repository: https://uswitch.github.io/kiam-helm-charts/charts/
kubeVersion: ">= 1.16.0"

42
charts/kubezero-kiam/values.yaml Normal file
View File

@ -0,0 +1,42 @@
kiam:
server:
# assumeRoleArn: <INSERT_CLOUDFORMATION_OUTPUT_KiamServerRoleArn>
useHostNetwork: true
sslCertHostPath: /etc/ssl/certs
tlsSecret: kiam-server-tls
service:
port: 6444
targetPort: 6444
deployment:
enabled: true
replicas: 2
tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
nodeSelector:
node-role.kubernetes.io/master: ""
prometheus:
servicemonitor:
enabled: false
# log:
# level: warn
agent:
host:
iptables: true
whiteListRouteRegexp: '^/latest/(meta-data/instance-id|dynamic)'
sslCertHostPath: /etc/ssl/certs
tlsSecret: kiam-agent-tls
tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
prometheus:
servicemonitor:
enabled: false
# log:
# level: warn
# extraEnv:
# - name: GRPC_GO_LOG_SEVERITY_LEVEL
# value: "info"
# - name: GRPC_GO_LOG_VERBOSITY_LEVEL
# value: "8"

5
charts/kubezero/Chart.yaml
View File

@ -1,7 +1,7 @@
apiVersion: v2
description: KubeZero Helm chart to install Zero Down Time Kuberenetes platform
name: kubezero
version: 0.2.3
version: 0.2.4
home: https://kubezero.com
icon: https://cdn.zero-downtime.net/assets/logo_small.png
keywords:
@ -12,5 +12,6 @@ maintainers:
- name: Quarky9
dependencies:
- name: argo-cd
version: 2.2.15
version: 2.3.2
repository: https://argoproj.github.io/argo-helm
kubeVersion: ">= 1.16.0"

10
charts/kubezero/templates/app.yaml
View File

@ -11,16 +11,18 @@ metadata:
spec:
project: kubezero
source:
repoURL: https://github.com/Zero-Down-Time/kubezero
targetRevision: HEAD
path: charts/kubezero-app
repoURL: {{ .Values.global.defaultSource.repoURL }}
targetRevision: {{ .Values.global.defaultSource.targetRevision }}
path: {{ .Values.global.defaultSource.pathPrefix}}charts/kubezero-app
{{ if .Values.kubezero }}
helm:
values: |
{{- toYaml .Values.kubezero | nindent 8 }}
{{- end }}
destination:
server: https://kubernetes.default.svc
server: {{ .Values.global.defaultDestination.server }}
namespace: argocd
syncPolicy:
automated:

15
charts/kubezero/values.yaml
View File

@ -1,3 +1,18 @@
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: ''
# kubezero -- Kubezero configuration, values.yaml please see kubezeroApp
kubezero: {}

4
scripts/publish.sh
View File

@ -12,6 +12,8 @@ rm -rf $SRCROOT/output && git clone -b gh-pages ssh://git@git.zero-downtime.net:
helm repo add stable https://kubernetes-charts.storage.googleapis.com
helm repo add argoproj https://argoproj.github.io/argo-helm
helm repo add jetstack https://charts.jetstack.io
helm repo add uswitch https://uswitch.github.io/kiam-helm-charts/charts/
for dir in $(find $SRCROOT/charts -mindepth 1 -maxdepth 1 -type d);
do
@ -33,7 +35,7 @@ do
fi
echo "Processing $dir"
helm --debug package $dir
helm lint $dir && helm --debug package $dir
done
cp $SRCROOT/*.tgz output/