feat: CI version bump, some 1.23 cleanups, basic Cilium config

This commit is contained in:
Stefan Reimer 2022-07-31 22:52:00 +00:00
parent dfbb4d48e6
commit 3e4119de23
5 changed files with 26 additions and 5 deletions

View File

@ -9,7 +9,7 @@ fi
export WORKDIR=/tmp/kubezero export WORKDIR=/tmp/kubezero
export HOSTFS=/host export HOSTFS=/host
export CHARTS=/charts export CHARTS=/charts
export VERSION=v1.23 export VERSION=$(kubeadm version --output json | jq -r .clientVersion.gitVersion)
export KUBECONFIG="${HOSTFS}/root/.kube/config" export KUBECONFIG="${HOSTFS}/root/.kube/config"

View File

@ -16,7 +16,7 @@ users:
- name: kubernetes-admin - name: kubernetes-admin
user: user:
exec: exec:
apiVersion: client.authentication.k8s.io/v1alpha1 apiVersion: client.authentication.k8s.io/v1beta1
command: aws-iam-authenticator command: aws-iam-authenticator
args: args:
- "token" - "token"

View File

@ -2,7 +2,7 @@ apiVersion: v2
name: kubezero-ci name: kubezero-ci
description: KubeZero umbrella chart for all things CI description: KubeZero umbrella chart for all things CI
type: application type: application
version: 0.5.4 version: 0.5.5
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:
@ -22,7 +22,7 @@ dependencies:
repository: https://gocd.github.io/helm-chart repository: https://gocd.github.io/helm-chart
condition: gocd.enabled condition: gocd.enabled
- name: gitea - name: gitea
version: 5.0.5 version: 5.0.9
repository: https://dl.gitea.io/charts/ repository: https://dl.gitea.io/charts/
condition: gitea.enabled condition: gitea.enabled
- name: jenkins - name: jenkins

View File

@ -17,7 +17,7 @@ gitea:
enabled: false enabled: false
image: image:
tag: 1.16.8 tag: 1.17.0
rootless: true rootless: true
securityContext: securityContext:

View File

@ -33,6 +33,27 @@ cilium:
#-- Ensure this is false if multus is enabled #-- Ensure this is false if multus is enabled
exclusive: false exclusive: false
cluster:
# This should match the second octet + 1 of clusterPoolIPv4PodCIDRList,
# to prevent IP space overlap and easy tracking
id: 1
name: default
ipam:
operator:
clusterPoolIPv4PodCIDRList:
- 10.0.0.0/16
hostServices:
enabled: true
# Does this conflict with Calico in parallel ?
nodePort:
enabled: true
# Keep it simple for now
l7Proxy: false
cgroup: cgroup:
autoMount: autoMount:
enabled: false enabled: false