Switch charm to Bobcat
Switch charm to Bobcat release. Microk8s 1.28 will be the default for Bobcat. Also ensure images are being collected from ghcr.io/canonical Change-Id: I1444344fc9b98d661f2dea7f7d45fd3d08574eb6
This commit is contained in:
@@ -1,11 +1,11 @@
|
|||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- openstack-python3-charm-yoga-jobs
|
- openstack-python3-charm-jobs
|
||||||
- openstack-cover-jobs
|
- openstack-cover-jobs
|
||||||
- microk8s-func-test
|
- microk8s-func-test
|
||||||
vars:
|
vars:
|
||||||
charm_build_name: octavia-k8s
|
charm_build_name: octavia-k8s
|
||||||
juju_channel: 3.1/stable
|
juju_channel: 3.1/stable
|
||||||
juju_classic_mode: false
|
juju_classic_mode: false
|
||||||
microk8s_channel: 1.26-strict/stable
|
microk8s_channel: 1.28-strict/stable
|
||||||
microk8s_classic_mode: false
|
microk8s_classic_mode: false
|
||||||
|
@@ -51,7 +51,7 @@ octavia-k8s requires the following relations:
|
|||||||
|
|
||||||
The charm by default uses following images:
|
The charm by default uses following images:
|
||||||
|
|
||||||
ghcr.io/canonical/octavia-consolidated:2023.1
|
ghcr.io/canonical/octavia-consolidated:2023.2
|
||||||
|
|
||||||
## Contributing
|
## Contributing
|
||||||
|
|
||||||
|
@@ -42,18 +42,18 @@ resources:
|
|||||||
octavia-api-image:
|
octavia-api-image:
|
||||||
type: oci-image
|
type: oci-image
|
||||||
description: OCI image for OpenStack octavia
|
description: OCI image for OpenStack octavia
|
||||||
# ghcr.io/canonical/octavia-api:2023.1
|
# ghcr.io/canonical/octavia-api:2023.2
|
||||||
upstream-source: ghcr.io/canonical/octavia-consolidated:2023.1
|
upstream-source: ghcr.io/canonical/octavia-consolidated:2023.2
|
||||||
octavia-driver-agent-image:
|
octavia-driver-agent-image:
|
||||||
type: oci-image
|
type: oci-image
|
||||||
description: OCI image for OpenStack Octavia Driver Agent
|
description: OCI image for OpenStack Octavia Driver Agent
|
||||||
# ghcr.io/canonical/octavia-driver-agent:2023.1
|
# ghcr.io/canonical/octavia-driver-agent:2023.2
|
||||||
upstream-source: ghcr.io/canonical/octavia-consolidated:2023.1
|
upstream-source: ghcr.io/canonical/octavia-consolidated:2023.2
|
||||||
octavia-housekeeping-image:
|
octavia-housekeeping-image:
|
||||||
type: oci-image
|
type: oci-image
|
||||||
description: OCI image for OpenStack Octavia Housekeeping
|
description: OCI image for OpenStack Octavia Housekeeping
|
||||||
# ghcr.io/canonical/octavia-housekeeping:2023.1
|
# ghcr.io/canonical/octavia-housekeeping:2023.2
|
||||||
upstream-source: ghcr.io/canonical/octavia-consolidated:2023.1
|
upstream-source: ghcr.io/canonical/octavia-consolidated:2023.2
|
||||||
|
|
||||||
requires:
|
requires:
|
||||||
database:
|
database:
|
||||||
|
@@ -7,4 +7,4 @@
|
|||||||
build_type: charmcraft
|
build_type: charmcraft
|
||||||
publish_charm: true
|
publish_charm: true
|
||||||
charmcraft_channel: 2.0/stable
|
charmcraft_channel: 2.0/stable
|
||||||
publish_channel: 2023.1/edge
|
publish_channel: 2023.2/edge
|
||||||
|
@@ -20,12 +20,14 @@ applications:
|
|||||||
trust: false
|
trust: false
|
||||||
rabbitmq:
|
rabbitmq:
|
||||||
charm: ch:rabbitmq-k8s
|
charm: ch:rabbitmq-k8s
|
||||||
channel: 3.9/edge
|
channel: 3.12/edge
|
||||||
scale: 1
|
scale: 1
|
||||||
trust: true
|
trust: true
|
||||||
|
options:
|
||||||
|
minimum-replicas: 1
|
||||||
keystone:
|
keystone:
|
||||||
charm: ch:keystone-k8s
|
charm: ch:keystone-k8s
|
||||||
channel: 2023.1/edge
|
channel: 2023.2/edge
|
||||||
scale: 1
|
scale: 1
|
||||||
trust: true
|
trust: true
|
||||||
options:
|
options:
|
||||||
@@ -35,7 +37,7 @@ applications:
|
|||||||
credential-keys: 5M
|
credential-keys: 5M
|
||||||
neutron:
|
neutron:
|
||||||
charm: ch:neutron-k8s
|
charm: ch:neutron-k8s
|
||||||
channel: 2023.1/edge
|
channel: 2023.2/edge
|
||||||
scale: 1
|
scale: 1
|
||||||
trust: true
|
trust: true
|
||||||
options:
|
options:
|
||||||
@@ -45,9 +47,9 @@ applications:
|
|||||||
scale: 1
|
scale: 1
|
||||||
trust: true
|
trust: true
|
||||||
resources:
|
resources:
|
||||||
octavia-api-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.1
|
octavia-driver-agent-image: ghcr.io/canonical/octavia-consolidated:2023.2
|
||||||
octavia-housekeeping-image: ghcr.io/canonical/octavia-consolidated:2023.1
|
octavia-housekeeping-image: ghcr.io/canonical/octavia-consolidated:2023.2
|
||||||
ovn-central:
|
ovn-central:
|
||||||
charm: ch:ovn-central-k8s
|
charm: ch:ovn-central-k8s
|
||||||
channel: 23.03/edge
|
channel: 23.03/edge
|
||||||
|
Reference in New Issue
Block a user