From 0e7977694ff9147a17612750ca50ef07bd711da6 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Fri, 23 Feb 2024 22:53:21 -0800 Subject: [PATCH] Allow CNI networking to be set to none * Set CNI networking to "none" to skip installing any CNI provider (i.e. no flannel, Calico, or Cilium). In this mode, cluster nodes will be NotReady until you add your own CNI stack * Motivation: I now tend to manage CNI components as addon modules just like other applications overlaid onto a cluster. It allows for faster iteration and may eventually become the recommendation --- CHANGES.md | 1 + README.md | 7 ++++++- aws/fedora-coreos/kubernetes/butane/controller.yaml | 4 ++-- aws/flatcar-linux/kubernetes/butane/controller.yaml | 4 ++-- azure/fedora-coreos/kubernetes/butane/controller.yaml | 4 ++-- azure/flatcar-linux/kubernetes/butane/controller.yaml | 4 ++-- bare-metal/fedora-coreos/kubernetes/butane/controller.yaml | 4 ++-- bare-metal/flatcar-linux/kubernetes/butane/controller.yaml | 4 ++-- .../fedora-coreos/kubernetes/butane/controller.yaml | 4 ++-- .../flatcar-linux/kubernetes/butane/controller.yaml | 4 ++-- .../fedora-coreos/kubernetes/butane/controller.yaml | 4 ++-- .../flatcar-linux/kubernetes/butane/controller.yaml | 4 ++-- 12 files changed, 27 insertions(+), 21 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index d013160a..0e5177f5 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,6 +8,7 @@ Notable changes between versions. * Kubernetes [v1.29.2](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.29.md#v1292) * Update flannel from v0.22.2 to [v0.24.2](https://github.com/flannel-io/flannel/releases/tag/v0.24.2) +* Allow CNI `networking` to be set to "none" to skip bootstrapping flannel, Calico, or Cilium ([#1419](https://github.com/poseidon/typhoon/pull/1419)) ## v1.29.1 diff --git a/README.md b/README.md index 58a62182..8fa49a89 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,9 @@ -# Typhoon [![Release](https://img.shields.io/github/v/release/poseidon/typhoon)](https://github.com/poseidon/typhoon/releases) [![Stars](https://img.shields.io/github/stars/poseidon/typhoon)](https://github.com/poseidon/typhoon/stargazers) [![Sponsors](https://img.shields.io/github/sponsors/poseidon?logo=github)](https://github.com/sponsors/poseidon) [![Mastodon](https://img.shields.io/badge/follow-news-6364ff?logo=mastodon)](https://fosstodon.org/@typhoon) +# Typhoon + +[![Release](https://img.shields.io/github/v/release/poseidon/typhoon?style=flat-square)](https://github.com/poseidon/typhoon/releases) +[![Stars](https://img.shields.io/github/stars/poseidon/typhoon?style=flat-square)](https://github.com/poseidon/typhoon/stargazers) +[![Sponsors](https://img.shields.io/github/sponsors/poseidon?logo=github&style=flat-square)](https://github.com/sponsors/poseidon) +[![Mastodon](https://img.shields.io/badge/follow-news-6364ff?logo=mastodon&style=flat-square)](https://fosstodon.org/@typhoon) diff --git a/aws/fedora-coreos/kubernetes/butane/controller.yaml b/aws/fedora-coreos/kubernetes/butane/controller.yaml index 1c89c359..636498c8 100644 --- a/aws/fedora-coreos/kubernetes/butane/controller.yaml +++ b/aws/fedora-coreos/kubernetes/butane/controller.yaml @@ -177,8 +177,8 @@ storage: mv static-manifests/* /etc/kubernetes/manifests/ mkdir -p /opt/bootstrap/assets mv manifests /opt/bootstrap/assets/manifests - mv manifests-networking/* /opt/bootstrap/assets/manifests/ - rm -rf assets auth static-manifests tls manifests-networking + mv manifests-networking/* /opt/bootstrap/assets/manifests/ 2>/dev/null || true + rm -rf assets auth static-manifests tls manifests manifests-networking chcon -R -u system_u -t container_file_t /etc/kubernetes/pki - path: /opt/bootstrap/apply mode: 0544 diff --git a/aws/flatcar-linux/kubernetes/butane/controller.yaml b/aws/flatcar-linux/kubernetes/butane/controller.yaml index 0cfc11f3..b1cec1c4 100644 --- a/aws/flatcar-linux/kubernetes/butane/controller.yaml +++ b/aws/flatcar-linux/kubernetes/butane/controller.yaml @@ -177,8 +177,8 @@ storage: mv static-manifests/* /etc/kubernetes/manifests/ mkdir -p /opt/bootstrap/assets mv manifests /opt/bootstrap/assets/manifests - mv manifests-networking/* /opt/bootstrap/assets/manifests/ - rm -rf assets auth static-manifests tls manifests-networking + mv manifests-networking/* /opt/bootstrap/assets/manifests/ 2>/dev/null || true + rm -rf assets auth static-manifests tls manifests manifests-networking - path: /opt/bootstrap/apply mode: 0544 contents: diff --git a/azure/fedora-coreos/kubernetes/butane/controller.yaml b/azure/fedora-coreos/kubernetes/butane/controller.yaml index 893d44c9..e93486af 100644 --- a/azure/fedora-coreos/kubernetes/butane/controller.yaml +++ b/azure/fedora-coreos/kubernetes/butane/controller.yaml @@ -172,8 +172,8 @@ storage: mv static-manifests/* /etc/kubernetes/manifests/ mkdir -p /opt/bootstrap/assets mv manifests /opt/bootstrap/assets/manifests - mv manifests-networking/* /opt/bootstrap/assets/manifests/ - rm -rf assets auth static-manifests tls manifests-networking + mv manifests-networking/* /opt/bootstrap/assets/manifests/ 2>/dev/null || true + rm -rf assets auth static-manifests tls manifests-networking manifests chcon -R -u system_u -t container_file_t /etc/kubernetes/pki - path: /opt/bootstrap/apply mode: 0544 diff --git a/azure/flatcar-linux/kubernetes/butane/controller.yaml b/azure/flatcar-linux/kubernetes/butane/controller.yaml index 8f9a7e7d..26b02ab3 100644 --- a/azure/flatcar-linux/kubernetes/butane/controller.yaml +++ b/azure/flatcar-linux/kubernetes/butane/controller.yaml @@ -173,8 +173,8 @@ storage: mv static-manifests/* /etc/kubernetes/manifests/ mkdir -p /opt/bootstrap/assets mv manifests /opt/bootstrap/assets/manifests - mv manifests-networking/* /opt/bootstrap/assets/manifests/ - rm -rf assets auth static-manifests tls manifests-networking + mv manifests-networking/* /opt/bootstrap/assets/manifests/ 2>/dev/null || true + rm -rf assets auth static-manifests tls manifests-networking manifests - path: /opt/bootstrap/apply mode: 0544 contents: diff --git a/bare-metal/fedora-coreos/kubernetes/butane/controller.yaml b/bare-metal/fedora-coreos/kubernetes/butane/controller.yaml index 52c442f6..a91af370 100644 --- a/bare-metal/fedora-coreos/kubernetes/butane/controller.yaml +++ b/bare-metal/fedora-coreos/kubernetes/butane/controller.yaml @@ -182,8 +182,8 @@ storage: mv static-manifests/* /etc/kubernetes/manifests/ mkdir -p /opt/bootstrap/assets mv manifests /opt/bootstrap/assets/manifests - mv manifests-networking/* /opt/bootstrap/assets/manifests/ - rm -rf assets auth static-manifests tls manifests-networking + mv manifests-networking/* /opt/bootstrap/assets/manifests/ 2>/dev/null || true + rm -rf assets auth static-manifests tls manifests-networking manifests chcon -R -u system_u -t container_file_t /etc/kubernetes/pki - path: /opt/bootstrap/apply mode: 0544 diff --git a/bare-metal/flatcar-linux/kubernetes/butane/controller.yaml b/bare-metal/flatcar-linux/kubernetes/butane/controller.yaml index 040ee557..4eb70071 100644 --- a/bare-metal/flatcar-linux/kubernetes/butane/controller.yaml +++ b/bare-metal/flatcar-linux/kubernetes/butane/controller.yaml @@ -184,8 +184,8 @@ storage: mv static-manifests/* /etc/kubernetes/manifests/ mkdir -p /opt/bootstrap/assets mv manifests /opt/bootstrap/assets/manifests - mv manifests-networking/* /opt/bootstrap/assets/manifests/ - rm -rf assets auth static-manifests tls manifests-networking + mv manifests-networking/* /opt/bootstrap/assets/manifests/ 2>/dev/null || true + rm -rf assets auth static-manifests tls manifests-networking manifests - path: /opt/bootstrap/apply mode: 0544 contents: diff --git a/digital-ocean/fedora-coreos/kubernetes/butane/controller.yaml b/digital-ocean/fedora-coreos/kubernetes/butane/controller.yaml index e79a83ab..8695daec 100644 --- a/digital-ocean/fedora-coreos/kubernetes/butane/controller.yaml +++ b/digital-ocean/fedora-coreos/kubernetes/butane/controller.yaml @@ -179,8 +179,8 @@ storage: mv static-manifests/* /etc/kubernetes/manifests/ mkdir -p /opt/bootstrap/assets mv manifests /opt/bootstrap/assets/manifests - mv manifests-networking/* /opt/bootstrap/assets/manifests/ - rm -rf assets auth static-manifests tls manifests-networking + mv manifests-networking/* /opt/bootstrap/assets/manifests/ 2>/dev/null || true + rm -rf assets auth static-manifests tls manifests-networking manifests chcon -R -u system_u -t container_file_t /etc/kubernetes/pki - path: /opt/bootstrap/apply mode: 0544 diff --git a/digital-ocean/flatcar-linux/kubernetes/butane/controller.yaml b/digital-ocean/flatcar-linux/kubernetes/butane/controller.yaml index a7ec4183..eea709b1 100644 --- a/digital-ocean/flatcar-linux/kubernetes/butane/controller.yaml +++ b/digital-ocean/flatcar-linux/kubernetes/butane/controller.yaml @@ -182,8 +182,8 @@ storage: mv static-manifests/* /etc/kubernetes/manifests/ mkdir -p /opt/bootstrap/assets mv manifests /opt/bootstrap/assets/manifests - mv manifests-networking/* /opt/bootstrap/assets/manifests/ - rm -rf assets auth static-manifests tls manifests-networking + mv manifests-networking/* /opt/bootstrap/assets/manifests/ 2>/dev/null || true + rm -rf assets auth static-manifests tls manifests-networking manifests - path: /opt/bootstrap/apply mode: 0544 contents: diff --git a/google-cloud/fedora-coreos/kubernetes/butane/controller.yaml b/google-cloud/fedora-coreos/kubernetes/butane/controller.yaml index 93b7af44..c8500578 100644 --- a/google-cloud/fedora-coreos/kubernetes/butane/controller.yaml +++ b/google-cloud/fedora-coreos/kubernetes/butane/controller.yaml @@ -171,8 +171,8 @@ storage: mv static-manifests/* /etc/kubernetes/manifests/ mkdir -p /opt/bootstrap/assets mv manifests /opt/bootstrap/assets/manifests - mv manifests-networking/* /opt/bootstrap/assets/manifests/ - rm -rf assets auth static-manifests tls manifests-networking + mv manifests-networking/* /opt/bootstrap/assets/manifests/ 2>/dev/null || true + rm -rf assets auth static-manifests tls manifests-networking manifests chcon -R -u system_u -t container_file_t /etc/kubernetes/pki - path: /opt/bootstrap/apply mode: 0544 diff --git a/google-cloud/flatcar-linux/kubernetes/butane/controller.yaml b/google-cloud/flatcar-linux/kubernetes/butane/controller.yaml index 30c1462f..2ce2c085 100644 --- a/google-cloud/flatcar-linux/kubernetes/butane/controller.yaml +++ b/google-cloud/flatcar-linux/kubernetes/butane/controller.yaml @@ -172,8 +172,8 @@ storage: mv static-manifests/* /etc/kubernetes/manifests/ mkdir -p /opt/bootstrap/assets mv manifests /opt/bootstrap/assets/manifests - mv manifests-networking/* /opt/bootstrap/assets/manifests/ - rm -rf assets auth static-manifests tls manifests-networking + mv manifests-networking/* /opt/bootstrap/assets/manifests/ 2>/dev/null || true + rm -rf assets auth static-manifests tls manifests-networking manifests - path: /opt/bootstrap/apply mode: 0544 contents: