Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjustments to test charm upgrades #217

Merged
merged 12 commits into from
Dec 18, 2024
Merged

Adjustments to test charm upgrades #217

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
147cc94
Adjustments to test charm upgrades
addyess Dec 14, 2024
963c140
Ignore pre-upgrade-check on k8s-workers
addyess Dec 16, 2024
3d58015
Render CharmURL to yaml
addyess Dec 16, 2024
bf57559
Maintain arch constraints before rendering
addyess Dec 16, 2024
a954641
Split upgrade to a different test runner
addyess Dec 16, 2024
48d52df
Wait for stable kube-system before upgrading
addyess Dec 16, 2024
702d4fa
Allow test modules to specify which series to deploy
addyess Dec 17, 2024
697b1e9
Merge branch 'main' into KU-2261/test-charm-upgrades
addyess Dec 17, 2024
1f877ed
Once kube-system is healthy, stop rescheduling update-status
addyess Dec 17, 2024
7006305
Test arm64 on focal, amd64 on jammy
addyess Dec 17, 2024
8ccaf1f
Integrate review comment
addyess Dec 17, 2024
b1a3178
increase amd64 test runner
addyess Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion charms/worker/k8s/src/inspector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def _get_client(self) -> Client:
self.client = Client(config=config.get())
return self.client

def get_nodes(self, labels: LabelSelector) -> Optional[List[Node]]:
def get_nodes(self, labels: Optional[LabelSelector] = None) -> Optional[List[Node]]:
"""Get nodes from the cluster.

Args:
Expand All @@ -56,6 +56,7 @@ def get_nodes(self, labels: LabelSelector) -> Optional[List[Node]]:
Raises:
ClusterInspectorError: If the nodes cannot be retrieved.
"""
labels = labels or {}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

labels are now "OPTIONAL"

client = self._get_client()
try:

Expand Down
6 changes: 3 additions & 3 deletions charms/worker/k8s/src/literals.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@
},
# NOTE: Update the dependencies for the k8s-service before releasing.
"k8s_service": {
"dependencies": {"k8s-worker": "^1.30, < 1.32"},
"dependencies": {"k8s-worker": "^1.31, < 1.33"},
"name": "k8s",
"upgrade_supported": "^1.30, < 1.32",
"version": "1.31.3",
"upgrade_supported": "^1.31, < 1.33",
"version": "1.32.0",
mateoflorido marked this conversation as resolved.
Show resolved Hide resolved
},
}
7 changes: 4 additions & 3 deletions charms/worker/k8s/src/upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,11 @@ def pre_upgrade_check(self) -> None:
Raises:
ClusterNotReadyError: If the cluster is not ready for an upgrade.
"""
if self.charm.is_worker:
log.info("TODO: Find some pre-upgrade checks for worker application.")
return
try:
nodes = self.cluster_inspector.get_nodes(
labels={"juju-charm": "k8s-worker" if self.charm.is_worker else "k8s"}
)
nodes = self.cluster_inspector.get_nodes()
failing_pods = self.cluster_inspector.verify_pods_running(["kube-system"])
except ClusterInspector.ClusterInspectorError as e:
raise ClusterNotReadyError(
Expand Down
15 changes: 7 additions & 8 deletions charms/worker/k8s/tests/unit/test_upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class TestK8sUpgrade(unittest.TestCase):
def setUp(self):
"""Set up common test fixtures."""
self.charm = MagicMock()
self.charm.is_worker = False
self.node_manager = MagicMock(spec=ClusterInspector)
self.upgrade = K8sUpgrade(
self.charm,
Expand Down Expand Up @@ -53,8 +54,8 @@ def test_pre_upgrade_check_worker_success(self):

self.upgrade.pre_upgrade_check()

self.node_manager.get_nodes.assert_called_once_with(labels={"juju-charm": "k8s-worker"})
self.node_manager.verify_pods_running.assert_called_once_with(["kube-system"])
self.node_manager.get_nodes.assert_not_called()
self.node_manager.verify_pods_running.assert_not_called()

def test_pre_upgrade_check_control_plane_success(self):
"""Test pre_upgrade_check succeeds for control plane nodes."""
Expand All @@ -64,15 +65,14 @@ def test_pre_upgrade_check_control_plane_success(self):

self.upgrade.pre_upgrade_check()

self.node_manager.get_nodes.assert_called_once_with(labels={"juju-charm": "k8s"})
self.node_manager.get_nodes.assert_called_once_with()
mateoflorido marked this conversation as resolved.
Show resolved Hide resolved

def test_pre_upgrade_check_unready_nodes(self):
"""Test pre_upgrade_check fails when nodes are not ready."""
self.charm.is_worker = True
self.node_manager.get_nodes.return_value = [
Node(metadata=ObjectMeta(name="worker-1")),
Node(metadata=ObjectMeta(name="worker-2")),
Node(metadata=ObjectMeta(name="worker-3")),
Node(metadata=ObjectMeta(name="k8s-1")),
Node(metadata=ObjectMeta(name="k8s-2")),
Node(metadata=ObjectMeta(name="k8s-3")),
]

with self.assertRaises(ClusterNotReadyError):
Expand All @@ -89,7 +89,6 @@ def test_pre_upgrade_check_cluster_inspector_error(self):

def test_pre_upgrade_check_pods_not_ready(self):
"""Test pre_upgrade_check fails when pods are not ready."""
self.charm.is_worker = True
self.node_manager.get_nodes.return_value = None
self.node_manager.verify_pods_running.return_value = "kube-system/pod-1"

Expand Down
Loading
Loading