diff --git a/.idea/k8s-infrastructure.iml b/.idea/k8s-infrastructure.iml index b76bd97d..0b88a068 100644 --- a/.idea/k8s-infrastructure.iml +++ b/.idea/k8s-infrastructure.iml @@ -5,6 +5,7 @@ + diff --git a/charts/cronjob/README.md b/charts/cronjob/README.md index d0559008..c4016b20 100644 --- a/charts/cronjob/README.md +++ b/charts/cronjob/README.md @@ -23,5 +23,3 @@ A Helm chart for creating cron jobs | schedule | string | `"*/5 * * * *"` | | | successfulJobsHistoryLimit | int | `3` | | ----------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) diff --git a/charts/hostpath-provisioner/README.md b/charts/hostpath-provisioner/README.md index 916e2f6e..060e0c41 100644 --- a/charts/hostpath-provisioner/README.md +++ b/charts/hostpath-provisioner/README.md @@ -25,5 +25,3 @@ A chart to install a storage provisioner for single node installs. | resources | object | `{}` | | | tolerations | list | `[]` | | ----------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) diff --git a/charts/mosca/README.md b/charts/mosca/README.md index bbc3c13d..f91e63f1 100644 --- a/charts/mosca/README.md +++ b/charts/mosca/README.md @@ -38,5 +38,3 @@ A Helm chart for the Mosca.io MQTT Broker | volumeMounts | list | `[]` | | | volumes | list | `[]` | | ----------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) diff --git a/charts/smartthings-mqtt-bridge/README.md b/charts/smartthings-mqtt-bridge/README.md index 702f2940..0e08a862 100644 --- a/charts/smartthings-mqtt-bridge/README.md +++ b/charts/smartthings-mqtt-bridge/README.md @@ -27,5 +27,3 @@ A Helm chart for the smartthings-mqtt-bridge | service.type | string | `"ClusterIP"` | | | tolerations | list | `[]` | | ----------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) diff --git a/install-k8s/1-fedoraPostInstall.sh b/install-k8s/1-fedoraPostInstall.sh index fd6d424a..336c3fa2 100755 --- a/install-k8s/1-fedoraPostInstall.sh +++ b/install-k8s/1-fedoraPostInstall.sh @@ -10,7 +10,7 @@ printf "Upgrade ================================================================ sudo dnf -y update || exit 1 printf "Install screen, and other tools =============================================================================\n" -sudo dnf -y install screen htop git p7zip rdiff-backup fail2ban +sudo dnf -y install screen htop nano iproute-tc fail2ban printf "Setting up fail2ban for sshd ================================================================================\n" sudo cp ./jail.local /etc/fail2ban/jail.local diff --git a/install-k8s/2-configK8SControlPlane.sh b/install-k8s/2-configK8SControlPlane.sh index c8b4dc15..88252239 100755 --- a/install-k8s/2-configK8SControlPlane.sh +++ b/install-k8s/2-configK8SControlPlane.sh @@ -6,6 +6,7 @@ printf "\nInstalling kubernetes ================================================ # Check if kubeadm already ran, do kubeadm reset to re-run if [[ ! -f "/etc/kubernetes/kubelet.conf" ]]; then sudo systemctl enable kubelet.service + sudo hostnamectl set-hostname --static k8s-control-plane sudo kubeadm config images pull sudo kubeadm init --config=./kubeadm.yaml || exit 1 else diff --git a/install-k8s/configNode.sh b/install-k8s/configNode.sh index c5b1fb65..0160e1e8 100755 --- a/install-k8s/configNode.sh +++ b/install-k8s/configNode.sh @@ -5,26 +5,28 @@ if [[ $EUID = 0 ]]; then exit 1 fi +printf "\nInstalling cri-o from its repo ==================================================================\n" if ! dnf list installed cri-o > /dev/null 2>&1; then - printf "\nInstall cri-o and crun ================================================================================\n" - sudo dnf -y module enable cri-o:1.24 || exit 1 - sudo dnf -y install crun cri-o || exit 1 - sudo dnf update --exclude="cri-*" || exit 1 - - printf "\nRaising user watches to the highest number to allow kubelet to work with lots of containers ===========\n" - echo fs.inotify.max_user_watches=1048576 | sudo tee --append /etc/sysctl.conf - echo fs.inotify.max_user_instances=1048576 | sudo tee --append /etc/sysctl.conf -fi; + sudo bash -c 'cat < /etc/yum.repos.d/kubernetes.repo [kubernetes] name=Kubernetes -baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64 +baseurl=https://pkgs.k8s.io/core:/stable:/v1.28/rpm/ enabled=1 gpgcheck=1 -repo_gpgcheck=1 -gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg -exclude=kube* - -[kubernetes-unstable] -name=Kubernetes-unstable -baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64-unstable -enabled=0 -gpgcheck=1 -repo_gpgcheck=1 -gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg -exclude=kube* +gpgkey=https://pkgs.k8s.io/core:/stable:/v1.28/rpm/repodata/repomd.xml.key +exclude=kubelet kubeadm kubectl cri-tools kubernetes-cni EOF' - sudo dnf -y install --enablerepo=kubernetes kubelet-1.24.11-0 kubectl-1.24.11-0 kubeadm-1.24.11-0 --disableexcludes=kubernetes || exit 1 + sudo dnf -y install --enablerepo=kubernetes kubelet kubectl kubeadm --disableexcludes=kubernetes || exit 1 + # cockpit-pcp enables the metric graphs in cockpit sudo dnf -y install cockpit-pcp || exit 1 # enable cni plugins @@ -75,7 +68,6 @@ sudo systemctl enable --now cockpit.socket || exit 1 if dnf list installed zram-generator-defaults > /dev/null 2>&1; then printf "\nDisabling swap ==========================================================================================\n" sudo dnf -y remove zram-generator-defaults - sudo systemctl stop swap-create@zram0 || exit 1 sudo swapoff /dev/zram0 || exit 1 fi diff --git a/temp-files/grafana-prometheus/README.md b/temp-files/grafana-prometheus/README.md index fce205b2..c91985d0 100644 --- a/temp-files/grafana-prometheus/README.md +++ b/temp-files/grafana-prometheus/README.md @@ -10,5 +10,3 @@ A chart for installing grafana config maps | ---- | ------ | --- | | gandazgul | | | ----------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)