diff --git a/charms/octavia-k8s/.zuul.yaml b/charms/octavia-k8s/.zuul.yaml index 4bd2ae4c..fc2ae5c1 100644 --- a/charms/octavia-k8s/.zuul.yaml +++ b/charms/octavia-k8s/.zuul.yaml @@ -1,11 +1,11 @@ - project: templates: - - openstack-python3-charm-yoga-jobs + - openstack-python3-charm-jobs - openstack-cover-jobs - microk8s-func-test vars: charm_build_name: octavia-k8s juju_channel: 3.1/stable juju_classic_mode: false - microk8s_channel: 1.26-strict/stable + microk8s_channel: 1.28-strict/stable microk8s_classic_mode: false diff --git a/charms/octavia-k8s/README.md b/charms/octavia-k8s/README.md index 053ccb9e..bb6e519a 100644 --- a/charms/octavia-k8s/README.md +++ b/charms/octavia-k8s/README.md @@ -51,7 +51,7 @@ octavia-k8s requires the following relations: The charm by default uses following images: - ghcr.io/canonical/octavia-consolidated:2023.1 + ghcr.io/canonical/octavia-consolidated:2023.2 ## Contributing diff --git a/charms/octavia-k8s/metadata.yaml b/charms/octavia-k8s/metadata.yaml index c586d9c0..af5eb88a 100644 --- a/charms/octavia-k8s/metadata.yaml +++ b/charms/octavia-k8s/metadata.yaml @@ -42,18 +42,18 @@ resources: octavia-api-image: type: oci-image description: OCI image for OpenStack octavia - # ghcr.io/canonical/octavia-api:2023.1 - upstream-source: ghcr.io/canonical/octavia-consolidated:2023.1 + # ghcr.io/canonical/octavia-api:2023.2 + upstream-source: ghcr.io/canonical/octavia-consolidated:2023.2 octavia-driver-agent-image: type: oci-image description: OCI image for OpenStack Octavia Driver Agent - # ghcr.io/canonical/octavia-driver-agent:2023.1 - upstream-source: ghcr.io/canonical/octavia-consolidated:2023.1 + # ghcr.io/canonical/octavia-driver-agent:2023.2 + upstream-source: ghcr.io/canonical/octavia-consolidated:2023.2 octavia-housekeeping-image: type: oci-image description: OCI image for OpenStack Octavia Housekeeping - # ghcr.io/canonical/octavia-housekeeping:2023.1 - upstream-source: ghcr.io/canonical/octavia-consolidated:2023.1 + # ghcr.io/canonical/octavia-housekeeping:2023.2 + upstream-source: ghcr.io/canonical/octavia-consolidated:2023.2 requires: database: diff --git a/charms/octavia-k8s/osci.yaml b/charms/octavia-k8s/osci.yaml index 2211123f..0cb2ddd6 100644 --- a/charms/octavia-k8s/osci.yaml +++ b/charms/octavia-k8s/osci.yaml @@ -7,4 +7,4 @@ build_type: charmcraft publish_charm: true charmcraft_channel: 2.0/stable - publish_channel: 2023.1/edge + publish_channel: 2023.2/edge diff --git a/charms/octavia-k8s/tests/bundles/smoke.yaml b/charms/octavia-k8s/tests/bundles/smoke.yaml index c450ba85..c474f234 100644 --- a/charms/octavia-k8s/tests/bundles/smoke.yaml +++ b/charms/octavia-k8s/tests/bundles/smoke.yaml @@ -20,12 +20,14 @@ applications: trust: false rabbitmq: charm: ch:rabbitmq-k8s - channel: 3.9/edge + channel: 3.12/edge scale: 1 trust: true + options: + minimum-replicas: 1 keystone: charm: ch:keystone-k8s - channel: 2023.1/edge + channel: 2023.2/edge scale: 1 trust: true options: @@ -35,7 +37,7 @@ applications: credential-keys: 5M neutron: charm: ch:neutron-k8s - channel: 2023.1/edge + channel: 2023.2/edge scale: 1 trust: true options: @@ -45,9 +47,9 @@ applications: scale: 1 trust: true resources: - octavia-api-image: ghcr.io/canonical/octavia-consolidated:2023.1 - octavia-driver-agent-image: ghcr.io/canonical/octavia-consolidated:2023.1 - octavia-housekeeping-image: ghcr.io/canonical/octavia-consolidated:2023.1 + octavia-api-image: ghcr.io/canonical/octavia-consolidated:2023.2 + octavia-driver-agent-image: ghcr.io/canonical/octavia-consolidated:2023.2 + octavia-housekeeping-image: ghcr.io/canonical/octavia-consolidated:2023.2 ovn-central: charm: ch:ovn-central-k8s channel: 23.03/edge