From 93b7f2554e9a7dd0e176d4a2b413e0609bc88cbc Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Mon, 8 Aug 2022 20:21:49 -0700 Subject: [PATCH] Remove ineffective iptables-legacy.stamp * Typhoon Fedora CoreOS is already using iptables nf_tables since F36. The file to pin to legacy iptables was renamed to /etc/coreos/iptables-legacy.stamp --- CHANGES.md | 6 ++++++ aws/fedora-coreos/kubernetes/fcc/controller.yaml | 1 - aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml | 1 - azure/fedora-coreos/kubernetes/fcc/controller.yaml | 1 - azure/fedora-coreos/kubernetes/workers/fcc/worker.yaml | 1 - digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml | 1 - digital-ocean/fedora-coreos/kubernetes/fcc/worker.yaml | 1 - google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml | 1 - .../fedora-coreos/kubernetes/workers/fcc/worker.yaml | 1 - 9 files changed, 6 insertions(+), 8 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 82e94c89..d7da176f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,6 +8,12 @@ Notable changes between versions. * Update Calico from v3.23.1 to [v3.23.3](https://github.com/projectcalico/calico/releases/tag/v3.23.3) * Remove use of deprecated Terraform [template](https://registry.terraform.io/providers/hashicorp/template) provider ([#1194](https://github.com/poseidon/typhoon/pull/1194)) +### Fedora CoreOS + +* Remove ineffective `/etc/fedora-coreos/iptables-legacy.stamp` ([#1201](https://github.com/poseidon/typhoon/pull/1201)) + * Typhoon already uses iptables v1.8.7 (nf_tables) since F36 + * Staying on legacy iptables required a file in `/etc/coreos` + ### Flatcar Linux * Migrate Flatcar Linux from Ignition spec v2.3.0 to v3.3.0 (**action required**) diff --git a/aws/fedora-coreos/kubernetes/fcc/controller.yaml b/aws/fedora-coreos/kubernetes/fcc/controller.yaml index 449bbdba..80ededea 100644 --- a/aws/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/aws/fedora-coreos/kubernetes/fcc/controller.yaml @@ -224,7 +224,6 @@ storage: ETCD_PEER_CERT_FILE=/etc/ssl/certs/etcd/peer.crt ETCD_PEER_KEY_FILE=/etc/ssl/certs/etcd/peer.key ETCD_PEER_CLIENT_CERT_AUTH=true - - path: /etc/fedora-coreos/iptables-legacy.stamp - path: /etc/containerd/config.toml overwrite: true contents: diff --git a/aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml b/aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml index be74c2c4..46e88985 100644 --- a/aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml +++ b/aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml @@ -136,7 +136,6 @@ storage: DefaultCPUAccounting=yes DefaultMemoryAccounting=yes DefaultBlockIOAccounting=yes - - path: /etc/fedora-coreos/iptables-legacy.stamp - path: /etc/containerd/config.toml overwrite: true contents: diff --git a/azure/fedora-coreos/kubernetes/fcc/controller.yaml b/azure/fedora-coreos/kubernetes/fcc/controller.yaml index eecdea39..92682bf1 100644 --- a/azure/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/azure/fedora-coreos/kubernetes/fcc/controller.yaml @@ -219,7 +219,6 @@ storage: ETCD_PEER_CERT_FILE=/etc/ssl/certs/etcd/peer.crt ETCD_PEER_KEY_FILE=/etc/ssl/certs/etcd/peer.key ETCD_PEER_CLIENT_CERT_AUTH=true - - path: /etc/fedora-coreos/iptables-legacy.stamp - path: /etc/containerd/config.toml overwrite: true contents: diff --git a/azure/fedora-coreos/kubernetes/workers/fcc/worker.yaml b/azure/fedora-coreos/kubernetes/workers/fcc/worker.yaml index 204741e9..b19542ba 100644 --- a/azure/fedora-coreos/kubernetes/workers/fcc/worker.yaml +++ b/azure/fedora-coreos/kubernetes/workers/fcc/worker.yaml @@ -131,7 +131,6 @@ storage: DefaultCPUAccounting=yes DefaultMemoryAccounting=yes DefaultBlockIOAccounting=yes - - path: /etc/fedora-coreos/iptables-legacy.stamp - path: /etc/containerd/config.toml overwrite: true contents: diff --git a/digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml b/digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml index da7df489..eef982aa 100644 --- a/digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml @@ -226,7 +226,6 @@ storage: ETCD_PEER_CERT_FILE=/etc/ssl/certs/etcd/peer.crt ETCD_PEER_KEY_FILE=/etc/ssl/certs/etcd/peer.key ETCD_PEER_CLIENT_CERT_AUTH=true - - path: /etc/fedora-coreos/iptables-legacy.stamp - path: /etc/containerd/config.toml overwrite: true contents: diff --git a/digital-ocean/fedora-coreos/kubernetes/fcc/worker.yaml b/digital-ocean/fedora-coreos/kubernetes/fcc/worker.yaml index 682b4acb..1567a82d 100644 --- a/digital-ocean/fedora-coreos/kubernetes/fcc/worker.yaml +++ b/digital-ocean/fedora-coreos/kubernetes/fcc/worker.yaml @@ -133,7 +133,6 @@ storage: DefaultCPUAccounting=yes DefaultMemoryAccounting=yes DefaultBlockIOAccounting=yes - - path: /etc/fedora-coreos/iptables-legacy.stamp - path: /etc/containerd/config.toml overwrite: true contents: diff --git a/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml b/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml index e27fc86c..602ff6e6 100644 --- a/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml @@ -219,7 +219,6 @@ storage: ETCD_PEER_CERT_FILE=/etc/ssl/certs/etcd/peer.crt ETCD_PEER_KEY_FILE=/etc/ssl/certs/etcd/peer.key ETCD_PEER_CLIENT_CERT_AUTH=true - - path: /etc/fedora-coreos/iptables-legacy.stamp - path: /etc/containerd/config.toml overwrite: true contents: diff --git a/google-cloud/fedora-coreos/kubernetes/workers/fcc/worker.yaml b/google-cloud/fedora-coreos/kubernetes/workers/fcc/worker.yaml index 204741e9..b19542ba 100644 --- a/google-cloud/fedora-coreos/kubernetes/workers/fcc/worker.yaml +++ b/google-cloud/fedora-coreos/kubernetes/workers/fcc/worker.yaml @@ -131,7 +131,6 @@ storage: DefaultCPUAccounting=yes DefaultMemoryAccounting=yes DefaultBlockIOAccounting=yes - - path: /etc/fedora-coreos/iptables-legacy.stamp - path: /etc/containerd/config.toml overwrite: true contents: