airship
/
porthole
Code Issues Proposed changes

Updated dependences 

This PS updates openstack modules versions to
Antelope 2023.1, ceph utilities version to Reef
18.2.1 and kubectl to 1.29.2

Change-Id: Ic8f5c0a7b03a33bcef667bb16291aea93ca3be3a
This commit is contained in:
Sergiy Markin 2024-03-04 22:13:01 +00:00
parent 1c4248ae74
commit 30a7c4699b
11 changed files with 76 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
images/calicoctl-utility/Dockerfile.ubuntu_focal
View File

@ -32,7 +32,7 @@ RUN set -xe \
python3-pip \
&& pip3 install --no-cache-dir --upgrade pip \
&& pip3 install --no-cache-dir \
oslo.rootwrap==6.3.1 \
oslo.rootwrap==7.0.1 \
&& apt-get clean -y \
&& rm -rf /var/lib/apt/lists/*

2
images/calicoctl-utility/Dockerfile_calicoq_calicoctl.ubuntu_focal
View File

@ -38,7 +38,7 @@ RUN set -xe \
python3-pip \
&& pip3 install --upgrade pip \
&& pip3 install \
oslo.rootwrap==6.3.1 \
oslo.rootwrap==7.0.1 \
&& apt-get clean -y \
&& rm -rf /var/lib/apt/lists/*

14
images/ceph-utility/Dockerfile.ubuntu_focal
View File

@ -8,13 +8,13 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
org.opencontainers.image.vendor='The Airship Authors' \
org.opencontainers.image.licenses='Apache-2.0'
# Quincy 17.2.6
ARG CEPH_RELEASE=quincy
ARG CEPH_RELEASE_TAG=17.2.6-1focal
ARG KUBE_VERSION=1.29.0
# Reef 18.2.1
ARG CEPH_RELEASE=reef
ARG CEPH_RELEASE_TAG=18.2.1-1focal
ARG KUBE_VERSION=1.29.2
ARG CEPH_REPO=https://mirror.mirantis.com/acicd/ceph-quincy/
ARG CEPH_KEY=https://mirror.mirantis.com/acicd/ceph-quincy/release.asc
ARG CEPH_REPO=https://mirror.mirantis.com/acicd/ceph-reef/
ARG CEPH_KEY=https://mirror.mirantis.com/acicd/ceph-reef/release.asc
ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key
RUN set -xe \
@ -48,7 +48,7 @@ RUN set -xe \
python3-pip \
&& pip3 install --no-cache-dir --upgrade pip \
&& pip3 install --no-cache-dir \
oslo.rootwrap==6.3.1 \
oslo.rootwrap==7.0.1 \
&& curl --silent -L https://dl.k8s.io/v${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz \
| tar -zC /usr/bin --strip-components=3 --wildcards -x "*/*/*/kubectl" \
&& apt-get purge --autoremove -y apt-transport-https \

4
images/compute-utility/Dockerfile.ubuntu_focal
View File

@ -8,7 +8,7 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
org.opencontainers.image.vendor='The Airship Authors' \
org.opencontainers.image.licenses='Apache-2.0'
ARG KUBE_VERSION=1.29.0
ARG KUBE_VERSION=1.29.2
ARG DEBIAN_FRONTEND=noninteractive
@ -37,7 +37,7 @@ RUN set -xe \
python3-pip \
&& pip3 install --no-cache-dir --upgrade pip \
&& pip3 install --no-cache-dir \
oslo.rootwrap==6.3.1 \
oslo.rootwrap==7.0.1 \
&& curl --silent -L https://dl.k8s.io/v${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz \
| tar -zC /usr/bin --strip-components=3 --wildcards -x "*/*/*/kubectl" \
&& apt-get clean \

8
images/etcdctl-utility/Dockerfile.ubuntu_focal
View File

@ -9,7 +9,7 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
org.opencontainers.image.licenses='Apache-2.0'
ARG ETCDCTL_VERSION=v3.5.11
ARG KUBE_VERSION=1.29.0
ARG KUBE_VERSION=1.29.2
ENV GOOGLE_URL=https://storage.googleapis.com/etcd
ENV GITHUB_URL=https://github.com/etcd-io/etcd/releases/download
@ -35,9 +35,9 @@ RUN set -xe \
&& pip3 install --no-cache-dir --upgrade pip \
&& pip3 install --no-cache-dir \
munch \
oslo.rootwrap==6.3.1 \
python-openstackclient==5.8.0 \
python-swiftclient==3.13.1 \
oslo.rootwrap==7.0.1 \
python-openstackclient==6.2.0 \
python-swiftclient==4.2.0 \
&& curl --silent -L "${DOWNLOAD_URL}/${ETCDCTL_VERSION}/etcd-${ETCDCTL_VERSION}-linux-amd64.tar.gz" \
| tar -zC /usr/local/bin --strip-components=1 --wildcards -x "*/etcdctl" \
&& curl --silent -L https://dl.k8s.io/v${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz \

8
images/mysqlclient-utility/Dockerfile.ubuntu_focal
View File

@ -8,7 +8,7 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
org.opencontainers.image.vendor='The Airship Authors' \
org.opencontainers.image.licenses='Apache-2.0'
ARG KUBE_VERSION=1.29.0
ARG KUBE_VERSION=1.29.2
ARG MARIADB_VERSION=10.6
ARG PERCONA_TOOLKIT_VERSION=3.5.5
@ -38,9 +38,9 @@ RUN set -xe \
&& pip3 install --no-cache-dir --upgrade pip \
&& pip3 install --no-cache-dir \
munch \
oslo.rootwrap==6.3.1 \
python-openstackclient==5.8.0 \
python-swiftclient==3.13.1 \
oslo.rootwrap==7.0.1 \
python-openstackclient==6.2.0 \
python-swiftclient==4.2.0 \
&& sed -i 's/$PrivDropToUser syslog/$PrivDropToUser nobody/' /etc/rsyslog.conf \
&& curl --silent -L https://dl.k8s.io/v${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz \
| tar -zC /usr/bin --strip-components=3 --wildcards -x "*/*/*/kubectl" \

14
images/openstack-utility/Dockerfile.ubuntu_focal
View File

@ -23,13 +23,13 @@ RUN set -xe \
&& pip3 install --no-cache-dir --upgrade pip \
&& pip3 install --no-cache-dir \
munch \
oslo.rootwrap==6.3.1 \
python-openstackclient==5.8.0 \
python-glanceclient==3.6.0 \
python-novaclient==17.7.0 \
python-neutronclient==7.8.0 \
python-cinderclient==8.3.0 \
python-heatclient==2.5.1 \
oslo.rootwrap==7.0.1 \
python-openstackclient==6.2.0 \
python-glanceclient==4.3.0 \
python-novaclient==18.3.0 \
python-neutronclient==9.0.0 \
python-cinderclient==9.3.0 \
python-heatclient==3.2.0 \
&& apt-get clean -y \
&& rm -rf /var/lib/apt/lists/*

8
images/postgresql-utility/Dockerfile.ubuntu_focal
View File

@ -8,7 +8,7 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
org.opencontainers.image.vendor='The Airship Authors' \
org.opencontainers.image.licenses='Apache-2.0'
ARG KUBE_VERSION=1.29.0
ARG KUBE_VERSION=1.29.2
RUN set -xe \
&& export DEBIAN_FRONTEND=noninteractive \
@ -33,9 +33,9 @@ RUN set -xe \
&& pip3 install --no-cache-dir --upgrade pip \
&& pip3 install --no-cache-dir \
munch \
oslo.rootwrap==6.3.1 \
python-openstackclient==5.8.0 \
python-swiftclient==3.13.1 \
oslo.rootwrap==7.0.1 \
python-openstackclient==6.2.0 \
python-swiftclient==4.2.0 \
&& curl --silent -L https://dl.k8s.io/v${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz \
| tar -zC /usr/bin --strip-components=3 --wildcards -x "*/*/*/kubectl" \
&& curl -o /tmp/rclone.deb https://downloads.rclone.org/rclone-current-linux-amd64.deb \

16
requirements-direct.txt
View File

@ -4,10 +4,18 @@
# When modifying this file `tox -e freeze-req` must be run to regenerate the requirements-frozen.txt.
kubeconfig
kubernetes==26.1.0
oslo.config<=8.7.1
oslo.log<=4.6.0
kubernetes==29.0.0
pbr<=5.5.1
requests==2.23.0
chardet>=3.0.2,<3.1.0
urllib3>=1.21.1,<=1.25
urllib3>=1.21.1,<=1.25
# Openstack Antelope 2023.1
# https://releases.openstack.org/antelope/index.html
oslo.config==9.1.1
oslo.context==5.1.1
oslo.i18n==6.0.0
oslo.log==5.2.0
oslo.serialization==5.1.1
oslo.utils==6.1.0

44
requirements-frozen.txt
View File

@ -1,39 +1,39 @@
cachetools==5.3.1
certifi==2023.5.7
cachetools==5.3.3
certifi==2024.2.2
chardet==3.0.4
debtcollector==2.5.0
google-auth==2.19.0
debtcollector==3.0.0
google-auth==2.28.1
idna==2.10
iso8601==1.1.0
iso8601==2.1.0
kubeconfig==1.1.1
kubernetes==26.1.0
msgpack==1.0.5
netaddr==0.8.0
kubernetes==29.0.0
msgpack==1.0.8
netaddr==1.2.1
netifaces==0.11.0
oauthlib==3.2.2
oslo.config==8.7.1
oslo.config==9.1.1
oslo.context==5.1.1
oslo.i18n==6.0.0
oslo.log==4.6.0
oslo.log==5.2.0
oslo.serialization==5.1.1
oslo.utils==6.1.0
packaging==23.1
packaging==23.2
pbr==5.5.1
pip==23.1.2
pyasn1==0.5.0
pip==23.3.1
pyasn1==0.5.1
pyasn1-modules==0.3.0
pyparsing==3.0.9
python-dateutil==2.8.2
pytz==2023.3
PyYAML==6.0
pyparsing==3.1.1
python-dateutil==2.9.0.post0
pytz==2024.1
PyYAML==6.0.1
requests==2.23.0
requests-oauthlib==1.3.1
rfc3986==2.0.0
rsa==4.9
setuptools==67.7.2
setuptools==69.0.2
six==1.16.0
stevedore==5.1.0
stevedore==5.2.0
urllib3==1.24.3
websocket-client==1.5.2
wheel==0.40.0
wrapt==1.15.0
websocket-client==1.7.0
wheel==0.42.0
wrapt==1.16.0

15
zuul.d/base.yaml
View File

@ -119,7 +119,10 @@
loopback_device: /dev/loop100
loopback_image: "/opt/ext_vol/openstack-helm/ceph-loop.img"
ceph_osd_data_device: /dev/loop100
kube_version: "1.28.4-1.1"
kube_version_repo: "v1.29"
# the list of k8s package versions are available here
# https://pkgs.k8s.io/core:/stable:/{{ kube_version_repo }}/deb/Packages
kube_version: "1.29.2-1.1"
calico_version: "v3.27.0"
coredns_version: "v1.11.1"
helm_version: "v3.13.2"
@ -210,7 +213,10 @@
loopback_device: /dev/loop100
loopback_image: "/opt/ext_vol/openstack-helm/ceph-loop.img"
ceph_osd_data_device: /dev/loop100
kube_version: "1.28.4-1.1"
kube_version_repo: "v1.29"
# the list of k8s package versions are available here
# https://pkgs.k8s.io/core:/stable:/{{ kube_version_repo }}/deb/Packages
kube_version: "1.29.2-1.1"
calico_version: "v3.27.0"
coredns_version: "v1.11.1"
helm_version: "v3.13.2"
@ -334,7 +340,10 @@
loopback_device: /dev/loop100
loopback_image: "/opt/ext_vol/openstack-helm/ceph-loop.img"
ceph_osd_data_device: /dev/loop100
kube_version: "1.28.4-1.1"
kube_version_repo: "v1.29"
# the list of k8s package versions are available here
# https://pkgs.k8s.io/core:/stable:/{{ kube_version_repo }}/deb/Packages
kube_version: "1.29.2-1.1"
calico_version: "v3.27.0"
coredns_version: "v1.11.1"
helm_version: "v3.13.2"