From 10bbf0d1a54b20aa1301c8c6491657fe89e50ba7 Mon Sep 17 00:00:00 2001 From: rpotla Date: Tue, 21 Oct 2025 16:59:56 -0400 Subject: [PATCH 1/2] add firewall_id --- linode_api4/objects/lke.py | 1 + test/fixtures/lke_clusters_18881_pools_456.json | 1 + test/fixtures/lke_clusters_18882_pools_789.json | 1 + test/unit/objects/lke_test.py | 4 ++++ 4 files changed, 7 insertions(+) diff --git a/linode_api4/objects/lke.py b/linode_api4/objects/lke.py index 792aed988..0864052f1 100644 --- a/linode_api4/objects/lke.py +++ b/linode_api4/objects/lke.py @@ -205,6 +205,7 @@ class LKENodePool(DerivedBase): # directly exposed in the node pool response. "k8s_version": Property(mutable=True), "update_strategy": Property(mutable=True), + "firewall_id": Property(mutable=True), } def _parse_raw_node( diff --git a/test/fixtures/lke_clusters_18881_pools_456.json b/test/fixtures/lke_clusters_18881_pools_456.json index 9aa5fb0f0..7bf68a6f8 100644 --- a/test/fixtures/lke_clusters_18881_pools_456.json +++ b/test/fixtures/lke_clusters_18881_pools_456.json @@ -35,6 +35,7 @@ "bar": "foo" }, "label": "example-node-pool", + "firewall_id": 456, "type": "g6-standard-4", "disk_encryption": "enabled" } \ No newline at end of file diff --git a/test/fixtures/lke_clusters_18882_pools_789.json b/test/fixtures/lke_clusters_18882_pools_789.json index d3c17eedb..8a5ba21d8 100644 --- a/test/fixtures/lke_clusters_18882_pools_789.json +++ b/test/fixtures/lke_clusters_18882_pools_789.json @@ -15,5 +15,6 @@ "tags": [], "disk_encryption": "enabled", "k8s_version": "1.31.1+lke1", + "firewall_id": 789, "update_strategy": "rolling_update" } \ No newline at end of file diff --git a/test/unit/objects/lke_test.py b/test/unit/objects/lke_test.py index cb9589cfb..10284a0c9 100644 --- a/test/unit/objects/lke_test.py +++ b/test/unit/objects/lke_test.py @@ -52,6 +52,7 @@ def test_get_pool(self): assert pool.cluster_id == 18881 assert pool.type.id == "g6-standard-4" assert pool.label == "example-node-pool" + assert pool.firewall_id == 456 assert pool.disk_encryption == InstanceDiskEncryptionType.enabled assert pool.disks is not None @@ -254,6 +255,7 @@ def test_lke_node_pool_update(self): pool.tags = ["foobar"] pool.count = 5 pool.label = "testing-label" + pool.firewall_id = 852 pool.autoscaler = { "enabled": True, "min": 2, @@ -281,6 +283,7 @@ def test_lke_node_pool_update(self): "labels": { "updated-key": "updated-value", }, + "firewall_id": 852, "taints": [ { "key": "updated-key", @@ -551,6 +554,7 @@ def test_cluster_enterprise(self): assert pool.k8s_version == "1.31.1+lke1" assert pool.update_strategy == "rolling_update" assert pool.label == "enterprise-node-pool" + assert pool.firewall_id == 789 def test_lke_tiered_version(self): version = TieredKubeVersion(self.client, "1.32", "standard") From 0f84faf8b5403a8b81312017335e84fb3c3f0b01 Mon Sep 17 00:00:00 2001 From: Lena Garber Date: Mon, 27 Oct 2025 14:19:28 -0400 Subject: [PATCH 2/2] Add to integration tests --- test/integration/models/lke/test_lke.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test/integration/models/lke/test_lke.py b/test/integration/models/lke/test_lke.py index 241117442..71ebc1ff2 100644 --- a/test/integration/models/lke/test_lke.py +++ b/test/integration/models/lke/test_lke.py @@ -138,7 +138,7 @@ def lke_cluster_with_apl(test_linode_client): @pytest.fixture(scope="session") -def lke_cluster_enterprise(test_linode_client): +def lke_cluster_enterprise(e2e_test_firewall, test_linode_client): # We use the oldest version here so we can test upgrades version = sorted( v.id for v in test_linode_client.lke.tier("enterprise").versions() @@ -153,6 +153,7 @@ def lke_cluster_enterprise(test_linode_client): 3, k8s_version=version, update_strategy="rolling_update", + firewall_id=e2e_test_firewall.id, ) label = get_test_label() + "_cluster" @@ -434,13 +435,18 @@ def test_lke_cluster_with_apl(lke_cluster_with_apl): ) -def test_lke_cluster_enterprise(test_linode_client, lke_cluster_enterprise): +def test_lke_cluster_enterprise( + e2e_test_firewall, + test_linode_client, + lke_cluster_enterprise, +): lke_cluster_enterprise.invalidate() assert lke_cluster_enterprise.tier == "enterprise" pool = lke_cluster_enterprise.pools[0] assert str(pool.k8s_version) == lke_cluster_enterprise.k8s_version.id assert pool.update_strategy == "rolling_update" + assert pool.firewall_id == e2e_test_firewall.id target_version = sorted( v.id for v in test_linode_client.lke.tier("enterprise").versions()