diff --git a/bootstrap.sh b/bootstrap.sh index 9ae3857..89bb87f 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -17,26 +17,30 @@ kubectl get csr \ | xargs -r kubectl certificate approve # prometheus crds (required by cilium) -PROMETHEUS_VERSION="58.3.1" +PROMETHEUS_VERSION="62.3.1" kubectl apply -f \ https://raw.githubusercontent.com/prometheus-community/helm-charts/kube-prometheus-stack-${PROMETHEUS_VERSION}/charts/kube-prometheus-stack/charts/crds/crds/crd-servicemonitors.yaml # cilium -CILIUM_VERSION=1.15.4 +CILIUM_VERSION=1.16.1 helm repo add cilium https://helm.cilium.io/ helm repo update helm upgrade --install \ cilium cilium/cilium --version $CILIUM_VERSION \ -f config/cilium.yaml \ - -n kube-system + -n networking --create-namespace # local path provisioner +LOCAL_PATH_VERSION=v0.0.28 git clone https://github.com/rancher/local-path-provisioner.git +cd local-path-provisioner +git checkout $LOCAL_PATH_VERSION helm upgrade --install \ local-path-provisioner \ - ./local-path-provisioner/deploy/chart/local-path-provisioner \ - -f config/local-path-provisioner.yaml \ - -n kube-system + ./deploy/chart/local-path-provisioner \ + -f ../config/local-path-provisioner.yaml \ + -n storage --create-namespace +cd .. rm -rf local-path-provisioner # sealed secrets diff --git a/config/cilium.yaml b/config/cilium.yaml index c32f865..de04910 100644 --- a/config/cilium.yaml +++ b/config/cilium.yaml @@ -1,10 +1,12 @@ -k8sServiceHost: 10.0.0.10 +k8sServiceHost: 10.0.0.20 k8sServicePort: 6443 tolerations: - effect: NoSchedule key: node-role.kubernetes.io/control-plane - effect: NoSchedule key: node.kubernetes.io/not-ready + - effect: NoSchedule + key: node.mmontes.io/storage hubble: enabled: true metrics: diff --git a/config/local-path-provisioner.yaml b/config/local-path-provisioner.yaml index 5fffb66..27a1e96 100644 --- a/config/local-path-provisioner.yaml +++ b/config/local-path-provisioner.yaml @@ -1,7 +1,3 @@ -tolerations: - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane - storageClass: create: true defaultClass: true