From 0fa4eb13e95d8c60805456ccaa7760031d3e73f2 Mon Sep 17 00:00:00 2001 From: Derek Carr Date: Wed, 15 Aug 2018 10:38:03 -0400 Subject: [PATCH 1/2] Fix perm errors with selinux enabled --- modules/bootkube/resources/bootkube.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/bootkube/resources/bootkube.sh b/modules/bootkube/resources/bootkube.sh index eaecb9b4ff2..6c718287613 100644 --- a/modules/bootkube/resources/bootkube.sh +++ b/modules/bootkube/resources/bootkube.sh @@ -5,8 +5,8 @@ echo "Rendering Kubernetes core manifests..." # shellcheck disable=SC2154 /usr/bin/docker run \ - --volume "$(pwd)":/assets \ - --volume /etc/kubernetes:/etc/kubernetes \ + --volume "$(pwd)":/assets:z \ + --volume /etc/kubernetes:/etc/kubernetes:z \ "${kube_core_renderer_image}" \ --config=/assets/kco-config.yaml \ --output=/assets @@ -16,7 +16,7 @@ echo "Rendering TNC manifests..." # shellcheck disable=SC2154 /usr/bin/docker run \ --user 0 \ - --volume "$(pwd)":/assets \ + --volume "$(pwd)":/assets:z \ "${tnc_operator_image}" \ --config=/assets/tnco-config.yaml \ --render-bootstrap=true \ @@ -37,7 +37,7 @@ echo "Starting etcd certificate signer..." # shellcheck disable=SC2154,SC2034 signer_id=$(/usr/bin/docker run -d \ --tmpfs /tmp \ - --volume /opt/tectonic/tls:/opt/tectonic/tls:ro \ + --volume /opt/tectonic/tls:/opt/tectonic/tls:ro,z \ --network host \ "${etcd_cert_signer_image}" \ serve \ @@ -61,7 +61,7 @@ while true; do --rm \ --name etcdctl \ --env ETCDCTL_API=3 \ - --volume /opt/tectonic/tls:/opt/tectonic/tls:ro \ + --volume /opt/tectonic/tls:/opt/tectonic/tls:ro,z \ "${etcdctl_image}" \ /usr/local/bin/etcdctl \ --dial-timeout=10m \ @@ -96,8 +96,8 @@ echo "Starting bootkube..." # shellcheck disable=SC2154 /usr/bin/docker run \ - --volume "$(pwd)":/assets \ - --volume /etc/kubernetes:/etc/kubernetes \ + --volume "$(pwd)":/assets:z \ + --volume /etc/kubernetes:/etc/kubernetes:z \ --network=host \ --entrypoint=/bootkube \ "${bootkube_image}" \ From 06ceaee0f2acb86941ced8c9a65ba039348e648a Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Wed, 15 Aug 2018 12:22:43 -0700 Subject: [PATCH 2/2] config.tf: bump operator images This includes the fixes needed to work with SELinux. --- config.tf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/config.tf b/config.tf index 3d14025ba71..aa98e9865bf 100644 --- a/config.tf +++ b/config.tf @@ -61,18 +61,18 @@ variable "tectonic_container_images" { awscli = "quay.io/coreos/awscli:025a357f05242fdad6a81e8a6b520098aa65a600" gcloudsdk = "google/cloud-sdk:178.0.0-alpine" bootkube = "quay.io/coreos/bootkube:v0.10.0" - tnc_operator = "quay.io/coreos/tectonic-node-controller-operator-dev:df42b97af403702013f4739fc82cd005cfd0c766" + tnc_operator = "quay.io/coreos/tectonic-node-controller-operator-dev:6705af4bcf26f899e347c88ffddc892a236648e4" etcd_cert_signer = "quay.io/coreos/kube-etcd-signer-server:678cc8e6841e2121ebfdb6e2db568fce290b67d6" etcd = "quay.io/coreos/etcd:v3.2.14" hyperkube = "openshift/origin-node:latest" - kube_core_renderer = "quay.io/coreos/kube-core-renderer-dev:df42b97af403702013f4739fc82cd005cfd0c766" - kube_core_operator = "quay.io/coreos/kube-core-operator-dev:df42b97af403702013f4739fc82cd005cfd0c766" - tectonic_channel_operator = "quay.io/coreos/tectonic-channel-operator-dev:df42b97af403702013f4739fc82cd005cfd0c766" - kube_addon_operator = "quay.io/coreos/kube-addon-operator-dev:df42b97af403702013f4739fc82cd005cfd0c766" + kube_core_renderer = "quay.io/coreos/kube-core-renderer-dev:6705af4bcf26f899e347c88ffddc892a236648e4" + kube_core_operator = "quay.io/coreos/kube-core-operator-dev:6705af4bcf26f899e347c88ffddc892a236648e4" + tectonic_channel_operator = "quay.io/coreos/tectonic-channel-operator-dev:6705af4bcf26f899e347c88ffddc892a236648e4" + kube_addon_operator = "quay.io/coreos/kube-addon-operator-dev:6705af4bcf26f899e347c88ffddc892a236648e4" tectonic_alm_operator = "quay.io/coreos/tectonic-alm-operator:v0.3.1" - tectonic_ingress_controller_operator = "quay.io/coreos/tectonic-ingress-controller-operator-dev:df42b97af403702013f4739fc82cd005cfd0c766" - tectonic_utility_operator = "quay.io/coreos/tectonic-utility-operator-dev:df42b97af403702013f4739fc82cd005cfd0c766" - tectonic_network_operator = "quay.io/coreos/tectonic-network-operator-dev:df42b97af403702013f4739fc82cd005cfd0c766" + tectonic_ingress_controller_operator = "quay.io/coreos/tectonic-ingress-controller-operator-dev:6705af4bcf26f899e347c88ffddc892a236648e4" + tectonic_utility_operator = "quay.io/coreos/tectonic-utility-operator-dev:6705af4bcf26f899e347c88ffddc892a236648e4" + tectonic_network_operator = "quay.io/coreos/tectonic-network-operator-dev:6705af4bcf26f899e347c88ffddc892a236648e4" } }