From 7be95f28db6c796f385f6ea31652aaf4790b67ec Mon Sep 17 00:00:00 2001 From: Spyros Trigazis Date: Thu, 30 Mar 2017 11:10:46 +0200 Subject: [PATCH] Update Fedora images New release of Fedora Atomic [1]. The new release of Fedora Ironic includes the same packages. Main changes: Kubernetes 1.5.3 etcd 3.1.3 Plus several fixes and version bumps. Add :Z when mounting certs in the swarm containers to set selinux labels properly. [1] http://www.projectatomic.io/blog/2017/03/fedora_atomic_mar28/ (cherry picked from 706371f380f52f96e920f50595b0632bf59b2ef7) Change-Id: Ia2881f5c6b84993850f2642c7a7f240ce6ad3f73 Closes-Bug: #1677664 --- .../swarm/fragments/write-swarm-agent-service.sh | 2 +- .../swarm/fragments/write-swarm-master-service.sh | 2 +- .../k8s_fedora_atomic_v1/templates/kubecluster.yaml | 2 +- .../k8s_fedora_ironic_v1/image/kubernetes/Readme.md | 10 +++++----- .../image/kubernetes/package-installs.yaml | 3 ++- .../k8s_fedora_ironic_v1/templates/kubecluster.yaml | 2 +- magnum/tests/contrib/gate_hook.sh | 4 ++-- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh b/magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh index faddf0052e..3e3447191c 100644 --- a/magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh +++ b/magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh @@ -35,7 +35,7 @@ ExecStartPre=-/usr/bin/docker pull swarm:$SWARM_VERSION ExecStart=/usr/bin/docker run -e http_proxy=$HTTP_PROXY \\ -e https_proxy=$HTTPS_PROXY \\ -e no_proxy=$NO_PROXY \\ - -v $CERT_DIR:$CERT_DIR \\ + -v $CERT_DIR:$CERT_DIR:Z \\ --name swarm-agent \\ swarm:$SWARM_VERSION \\ join \\ diff --git a/magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh b/magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh index fbb1a17a93..eefba1914c 100644 --- a/magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh +++ b/magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh @@ -19,7 +19,7 @@ ExecStartPre=-/usr/bin/docker kill swarm-manager ExecStartPre=-/usr/bin/docker rm swarm-manager ExecStartPre=-/usr/bin/docker pull swarm:$SWARM_VERSION ExecStart=/usr/bin/docker run --name swarm-manager \\ - -v $CERT_DIR:$CERT_DIR \\ + -v $CERT_DIR:$CERT_DIR:Z \\ -p 2376:2375 \\ -e http_proxy=$HTTP_PROXY \\ -e https_proxy=$HTTPS_PROXY \\ diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml index d2fad7475a..8eec685bb5 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml @@ -286,7 +286,7 @@ parameters: kube_version: type: string description: version of kubernetes used for kubernetes cluster - default: v1.5.2 + default: v1.5.3 insecure_registry_url: type: string diff --git a/magnum/drivers/k8s_fedora_ironic_v1/image/kubernetes/Readme.md b/magnum/drivers/k8s_fedora_ironic_v1/image/kubernetes/Readme.md index 066fa6bc33..9df646cdc1 100644 --- a/magnum/drivers/k8s_fedora_ironic_v1/image/kubernetes/Readme.md +++ b/magnum/drivers/k8s_fedora_ironic_v1/image/kubernetes/Readme.md @@ -12,23 +12,23 @@ An example fedora based image and uploaded to glance with the following: export PATH="${PWD}/dib-utils/bin:$PATH" export ELEMENTS_PATH=diskimage-builder/elements export ELEMENTS_PATH=${ELEMENTS_PATH}:magnum/magnum/drivers/k8s_fedora_ironic_v1/image - export DIB_RELEASE=24 + export DIB_RELEASE=25 diskimage-builder/bin/disk-image-create baremetal \ fedora selinux-permissive \ kubernetes \ - -o fedora-24-kubernetes.qcow2 + -o fedora-25-kubernetes.qcow2 KERNEL_ID=`glance image-create --name fedora-k8s-kernel \ --visibility public \ --disk-format=aki \ --container-format=aki \ - --file=fedora-24-kubernetes.vmlinuz \ + --file=fedora-25-kubernetes.vmlinuz \ | grep id | tr -d '| ' | cut --bytes=3-57` RAMDISK_ID=`glance image-create --name fedora-k8s-ramdisk \ --visibility public \ --disk-format=ari \ --container-format=ari \ - --file=fedora-24-kubernetes.initrd \ + --file=fedora-25-kubernetes.initrd \ | grep id | tr -d '| ' | cut --bytes=3-57` BASE_ID=`glance image-create --name fedora-k8s \ --os-distro fedora \ @@ -37,6 +37,6 @@ An example fedora based image and uploaded to glance with the following: --container-format=bare \ --property kernel_id=$KERNEL_ID \ --property ramdisk_id=$RAMDISK_ID \ - --file=fedora-24-kubernetes.qcow2 \ + --file=fedora-25-kubernetes.qcow2 \ | grep -v kernel | grep -v ramdisk \ | grep id | tr -d '| ' | cut --bytes=3-57` diff --git a/magnum/drivers/k8s_fedora_ironic_v1/image/kubernetes/package-installs.yaml b/magnum/drivers/k8s_fedora_ironic_v1/image/kubernetes/package-installs.yaml index ea99a147d8..28b297717b 100644 --- a/magnum/drivers/k8s_fedora_ironic_v1/image/kubernetes/package-installs.yaml +++ b/magnum/drivers/k8s_fedora_ironic_v1/image/kubernetes/package-installs.yaml @@ -1,4 +1,5 @@ kubernetes: etcd: flannel: -docker-io: \ No newline at end of file +docker-io: +python2: diff --git a/magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml index 03d7a8754f..7b1e64d454 100644 --- a/magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml @@ -289,7 +289,7 @@ parameters: kube_version: type: string description: version of kubernetes used for kubernetes cluster - default: v1.5.2 + default: v1.5.3 insecure_registry_url: type: string diff --git a/magnum/tests/contrib/gate_hook.sh b/magnum/tests/contrib/gate_hook.sh index 63c4e701e0..5a29715845 100755 --- a/magnum/tests/contrib/gate_hook.sh +++ b/magnum/tests/contrib/gate_hook.sh @@ -38,8 +38,8 @@ if [ "$coe" = "mesos" ]; then elif [ "$coe" = "k8s-coreos" ]; then export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL=http://beta.release.core-os.net/amd64-usr/1298.4.0/coreos_production_openstack_image.img.bz2" elif [ "${coe}${special}" = "k8s-ironic" ]; then - export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='https://fedorapeople.org/groups/magnum/fedora-25-kubernetes-ironic-ocata.tar.gz'" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-25-kubernetes-ironic-ocata'" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='https://fedorapeople.org/groups/magnum/fedora-kubernetes-ironic-ocata.tar.gz'" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-kubernetes-ironic-ocata'" export DEVSTACK_GATE_VIRT_DRIVER="ironic" # NOTE(yuanying): Current implementation requires only 1 subnet under network