diff --git a/.github/workflows/containers-openstack.yaml b/.github/workflows/containers-openstack.yaml index 15399da06..8a4157b8e 100644 --- a/.github/workflows/containers-openstack.yaml +++ b/.github/workflows/containers-openstack.yaml @@ -40,7 +40,6 @@ jobs: - nova - neutron - placement - - skyline - openstack-client - octavia uses: ./.github/workflows/build-container-reuse.yaml @@ -56,6 +55,7 @@ jobs: matrix: project: - horizon + - skyline uses: ./.github/workflows/build-container-reuse.yaml secrets: inherit with: diff --git a/charts/argocd-understack/values.yaml b/charts/argocd-understack/values.yaml index a5dcf94c5..99ea5796f 100644 --- a/charts/argocd-understack/values.yaml +++ b/charts/argocd-understack/values.yaml @@ -467,7 +467,7 @@ site: wave: 4 # -- Chart version for Skyline # renovate: datasource=helm depName=skyline registryUrl=https://tarballs.opendev.org/openstack/openstack-helm - chartVersion: 2026.1.38+418cc5a89 + chartVersion: 2026.1.39+cb8a7b596 # -- Open vSwitch (Networking) openvswitch: diff --git a/components/images-openstack.yaml b/components/images-openstack.yaml index 09d9f2e55..e330c313d 100644 --- a/components/images-openstack.yaml +++ b/components/images-openstack.yaml @@ -93,9 +93,9 @@ images: glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy" # skyline - skyline: "ghcr.io/rackerlabs/understack/skyline:2026.1" - skyline_db_sync: "ghcr.io/rackerlabs/understack/skyline:2026.1" - skyline_nginx: "ghcr.io/rackerlabs/understack/skyline:2026.1" + skyline: "ghcr.io/rackerlabs/understack/skyline:2026.2" + skyline_db_sync: "ghcr.io/rackerlabs/understack/skyline:2026.2" + skyline_nginx: "ghcr.io/rackerlabs/understack/skyline:2026.2" # cinder cinder_api: "ghcr.io/rackerlabs/understack/cinder:2026.1" diff --git a/components/skyline/values.yaml b/components/skyline/values.yaml index 9da3fd864..aa05cd56d 100644 --- a/components/skyline/values.yaml +++ b/components/skyline/values.yaml @@ -37,6 +37,13 @@ pod: db_sync: limits: cpu: null + skyline: + requests: + memory: "1024Mi" + cpu: "1000m" + limits: + memory: "2048Mi" + cpu: null annotations: # we need to modify the annotations on OpenStack Helm diff --git a/containers/skyline/Dockerfile b/containers/skyline/Dockerfile index 3e01e5e31..e2fd2ce1e 100644 --- a/containers/skyline/Dockerfile +++ b/containers/skyline/Dockerfile @@ -1,4 +1,4 @@ # syntax=docker/dockerfile:1 ARG OPENSTACK_VERSION="required_argument" -FROM quay.io/airshipit/skyline:${OPENSTACK_VERSION}-ubuntu_noble AS final +FROM quay.io/airshipit/skyline:${OPENSTACK_VERSION}-ubuntu_resolute AS final