Skip to content

Commit ff36054

Browse files
sinclert-canonicalsinclert-canonical
authored
[DPE-8600] Point certificates charm to 1/stable (#69)
1 parent aada62e commit ff36054

File tree

7 files changed

+35
-34
lines changed

7 files changed

+35
-34
lines changed

‎kubernetes/tests/integration/test_exporter_with_tls.py‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,14 @@
3434

3535
if juju_.is_3_or_higher:
3636
tls_app_name = "self-signed-certificates"
37-
if architecture.architecture == "arm64":
38-
tls_channel = "latest/edge"
39-
else:
40-
tls_channel = "latest/stable"
37+
tls_channel = "1/stable"
4138
tls_config = {"ca-common-name": "Test CA"}
39+
tls_base = "ubuntu@24.04"
4240
else:
4341
tls_app_name = "tls-certificates-operator"
44-
if architecture.architecture == "arm64":
45-
tls_channel = "legacy/edge"
46-
else:
47-
tls_channel = "legacy/stable"
42+
tls_channel = "legacy/edge" if architecture.architecture == "arm64" else "legacy/stable"
4843
tls_config = {"generate-self-signed-certificates": "true", "ca-common-name": "Test CA"}
44+
tls_base = "ubuntu@22.04"
4945

5046

5147
# TODO: remove after https://github.com/canonical/grafana-agent-k8s-operator/issues/309 fixed
@@ -138,7 +134,7 @@ async def test_exporter_endpoint(ops_test: OpsTest, charm) -> None:
138134
application_name=tls_app_name,
139135
channel=tls_channel,
140136
config=tls_config,
141-
base="ubuntu@22.04",
137+
base=tls_base,
142138
)
143139

144140
await ops_test.model.wait_for_idle([tls_app_name], status="active", timeout=SLOW_TIMEOUT)

‎kubernetes/tests/integration/test_expose_external.py‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,14 @@
3636
TLS_SETUP_SLEEP_TIME = 30
3737
if juju_.is_3_or_higher:
3838
TLS_APP_NAME = "self-signed-certificates"
39-
if architecture.architecture == "arm64":
40-
TLS_CHANNEL = "latest/edge"
41-
else:
42-
TLS_CHANNEL = "latest/stable"
39+
TLS_CHANNEL = "1/stable"
4340
TLS_CONFIG = {"ca-common-name": "Test CA"}
41+
TLS_BASE = "ubuntu@24.04"
4442
else:
4543
TLS_APP_NAME = "tls-certificates-operator"
46-
if architecture.architecture == "arm64":
47-
TLS_CHANNEL = "legacy/edge"
48-
else:
49-
TLS_CHANNEL = "legacy/stable"
44+
TLS_CHANNEL = "legacy/edge" if architecture.architecture == "arm64" else "legacy/stable"
5045
TLS_CONFIG = {"generate-self-signed-certificates": "true", "ca-common-name": "Test CA"}
46+
TLS_BASE = "ubuntu@22.04"
5147

5248

5349
async def confirm_cluster_ip_endpoints(ops_test: OpsTest) -> None:
@@ -197,7 +193,7 @@ async def test_expose_external_with_tls(ops_test: OpsTest) -> None:
197193
TLS_APP_NAME,
198194
channel=TLS_CHANNEL,
199195
config=TLS_CONFIG,
200-
base="ubuntu@22.04",
196+
base=TLS_BASE,
201197
)
202198
async with ops_test.fast_forward("60s"):
203199
await ops_test.model.wait_for_idle(

‎kubernetes/tests/integration/test_tls.py‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,14 @@
3030

3131
if juju_.is_3_or_higher:
3232
tls_app_name = "self-signed-certificates"
33-
if architecture.architecture == "arm64":
34-
tls_channel = "latest/edge"
35-
else:
36-
tls_channel = "latest/stable"
33+
tls_channel = "1/stable"
3734
tls_config = {"ca-common-name": "Test CA"}
35+
tls_base = "ubuntu@24.04"
3836
else:
3937
tls_app_name = "tls-certificates-operator"
40-
if architecture.architecture == "arm64":
41-
tls_channel = "legacy/edge"
42-
else:
43-
tls_channel = "legacy/stable"
38+
tls_channel = "legacy/edge" if architecture.architecture == "arm64" else "legacy/stable"
4439
tls_config = {"generate-self-signed-certificates": "true", "ca-common-name": "Test CA"}
40+
tls_base = "ubuntu@22.04"
4541

4642

4743
@pytest.mark.abort_on_fail
@@ -79,7 +75,7 @@ async def test_deploy_and_relate(ops_test: OpsTest, charm) -> None:
7975
application_name=tls_app_name,
8076
channel=tls_channel,
8177
config=tls_config,
82-
base="ubuntu@22.04",
78+
base=tls_base,
8379
),
8480
ops_test.model.deploy(
8581
TEST_APP_NAME,

‎machines/tests/integration/test_data_integrator.py‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,14 @@
2929

3030
if juju_.is_3_or_higher:
3131
tls_app_name = "self-signed-certificates"
32-
tls_channel = "latest/edge" if architecture.architecture == "arm64" else "latest/stable"
32+
tls_channel = "1/stable"
3333
tls_config = {"ca-common-name": "Test CA"}
34+
tls_series = "noble"
3435
else:
3536
tls_app_name = "tls-certificates-operator"
3637
tls_channel = "legacy/edge" if architecture.architecture == "arm64" else "legacy/stable"
3738
tls_config = {"generate-self-signed-certificates": "true", "ca-common-name": "Test CA"}
39+
tls_series = "jammy"
3840

3941

4042
@pytest.mark.abort_on_fail
@@ -59,7 +61,11 @@ async def test_external_connectivity_with_data_integrator(
5961
series=series,
6062
),
6163
ops_test.model.deploy(
62-
tls_app_name, application_name=tls_app_name, channel=tls_channel, config=tls_config
64+
tls_app_name,
65+
application_name=tls_app_name,
66+
channel=tls_channel,
67+
config=tls_config,
68+
series=tls_series,
6369
),
6470
ops_test.model.deploy(
6571
DATA_INTEGRATOR_APP_NAME,

‎machines/tests/integration/test_exporter_with_tls.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,14 @@
2929

3030
if juju_.is_3_or_higher:
3131
tls_app_name = "self-signed-certificates"
32-
tls_channel = "latest/edge" if architecture.architecture == "arm64" else "latest/stable"
32+
tls_channel = "1/stable"
3333
tls_config = {"ca-common-name": "Test CA"}
34+
tls_series = "noble"
3435
else:
3536
tls_app_name = "tls-certificates-operator"
3637
tls_channel = "legacy/edge" if architecture.architecture == "arm64" else "legacy/stable"
3738
tls_config = {"generate-self-signed-certificates": "true", "ca-common-name": "Test CA"}
39+
tls_series = "jammy"
3840

3941

4042
@pytest.mark.abort_on_fail
@@ -138,7 +140,7 @@ async def test_exporter_endpoint(ops_test: OpsTest, charm, series) -> None:
138140
application_name=tls_app_name,
139141
channel=tls_channel,
140142
config=tls_config,
141-
series="jammy",
143+
series=tls_series,
142144
)
143145
await ops_test.model.wait_for_idle([tls_app_name], status="active", timeout=SLOW_TIMEOUT)
144146

‎machines/tests/integration/test_hacluster.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,14 @@
3434

3535
if juju_.is_3_or_higher:
3636
tls_app_name = "self-signed-certificates"
37-
tls_channel = "latest/edge" if architecture.architecture == "arm64" else "latest/stable"
37+
tls_channel = "1/stable"
3838
tls_config = {"ca-common-name": "Test CA"}
39+
tls_series = "noble"
3940
else:
4041
tls_app_name = "tls-certificates-operator"
4142
tls_channel = "legacy/edge" if architecture.architecture == "arm64" else "legacy/stable"
4243
tls_config = {"generate-self-signed-certificates": "true", "ca-common-name": "Test CA"}
44+
tls_series = "jammy"
4345

4446
vip = None
4547

@@ -266,6 +268,7 @@ async def test_tls_along_with_ha_cluster(ops_test: OpsTest, series) -> None:
266268
application_name=tls_app_name,
267269
channel=tls_channel,
268270
config=tls_config,
271+
series=tls_series,
269272
)
270273

271274
logger.info("Ensure auto-generated TLS cert before relation with TLS")

‎machines/tests/integration/test_tls.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,14 @@
2626

2727
if juju_.is_3_or_higher:
2828
tls_app_name = "self-signed-certificates"
29-
tls_channel = "latest/edge" if architecture.architecture == "arm64" else "latest/stable"
29+
tls_channel = "1/stable"
3030
tls_config = {"ca-common-name": "Test CA"}
31+
tls_series = "noble"
3132
else:
3233
tls_app_name = "tls-certificates-operator"
3334
tls_channel = "legacy/edge" if architecture.architecture == "arm64" else "legacy/stable"
3435
tls_config = {"generate-self-signed-certificates": "true", "ca-common-name": "Test CA"}
36+
tls_series = "jammy"
3537

3638

3739
@pytest.mark.abort_on_fail
@@ -61,7 +63,7 @@ async def test_build_deploy_and_relate(ops_test: OpsTest, charm, series) -> None
6163
application_name=tls_app_name,
6264
channel=tls_channel,
6365
config=tls_config,
64-
series="jammy",
66+
series=tls_series,
6567
),
6668
ops_test.model.deploy(
6769
TEST_APP_NAME,

0 commit comments

Comments
 (0)