diff --git a/README.rst b/README.rst index 4294a73a7..11eb9113c 100644 --- a/README.rst +++ b/README.rst @@ -17,11 +17,6 @@ Communication * Join us on `IRC `_: #openstack-helm on oftc -* Community `IRC Meetings - `_: - [Every Tuesday @ 3PM UTC], #openstack-meeting-alt on oftc -* Meeting Agenda Items: `Agenda - `_ * Join us on `Slack `_ - #openstack-helm diff --git a/roles/deploy-env/defaults/main.yaml b/roles/deploy-env/defaults/main.yaml index 156a63677..d60897fce 100644 --- a/roles/deploy-env/defaults/main.yaml +++ b/roles/deploy-env/defaults/main.yaml @@ -10,10 +10,10 @@ # See the License for the specific language governing permissions and # limitations under the License. --- -kube_version_repo: "v1.30" +kube_version_repo: "v1.31" # the list of k8s package versions are available here # https://pkgs.k8s.io/core:/stable:/{{ kube_version_repo }}/deb/Packages -kube_version: "1.30.3-1.1" +kube_version: "1.31.3-1.1" helm_version: "v3.14.0" crictl_version: "v1.30.1" @@ -50,6 +50,7 @@ loopback_image_size: 12G coredns_resolver_setup: true metallb_setup: false +metallb_version: "0.13.12" metallb_pool_cidr: "172.24.128.0/24" metallb_openstack_endpoint_cidr: "172.24.128.100/24" diff --git a/roles/deploy-env/tasks/metallb.yaml b/roles/deploy-env/tasks/metallb.yaml index 9be2a32ad..d2f167c2e 100644 --- a/roles/deploy-env/tasks/metallb.yaml +++ b/roles/deploy-env/tasks/metallb.yaml @@ -24,6 +24,7 @@ kubernetes.core.helm: name: metallb chart_ref: metallb/metallb + chart_version: "{{ metallb_version }}" namespace: metallb-system create_namespace: true diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 91e3c4ee8..5cce701fd 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -101,14 +101,16 @@ loopback_device: /dev/loop100 loopback_image: "/opt/ext_vol/openstack-helm/ceph-loop.img" ceph_osd_data_device: /dev/loop100 - kube_version_repo: "v1.30" - kube_version: "1.30.3-1.1" + kube_version_repo: "v1.31" + kube_version: "1.31.3-1.1" calico_setup: true calico_version: "v3.27.4" cilium_setup: false cilium_version: "1.16.0" flannel_setup: false flannel_version: v0.25.4 + metallb_setup: false + metallb_version: "0.13.12" helm_version: "v3.14.0" crictl_version: "v1.30.1" zuul_osh_infra_relative_path: ../openstack-helm-infra