Merge pull request replicatedhq#582 from replicatedhq/mike-libcrypt-fix

FIX broken SCP after install on CentOS 8

Makefile

@@ -136,6 +136,7 @@ dist/kubernetes-%.tar.gz:
 	${MAKE} build/packages/kubernetes/$*/ubuntu-16.04
 	${MAKE} build/packages/kubernetes/$*/ubuntu-18.04
 	${MAKE} build/packages/kubernetes/$*/rhel-7
+	${MAKE} build/packages/kubernetes/$*/rhel-8
 	mkdir -p dist
 	tar cf - -C build packages/kubernetes/$* | gzip > dist/kubernetes-$*.tar.gz
 
@@ -348,6 +349,18 @@ build/packages/kubernetes/%/rhel-7:
 	docker cp k8s-rhel7-$*:/packages/archives/. build/packages/kubernetes/$*/rhel-7/
 	docker rm k8s-rhel7-$*
 
+build/packages/kubernetes/%/rhel-8:
+	docker build \
+		--build-arg KUBERNETES_VERSION=$* \
+		-t kurl/rhel-8-k8s:$* \
+		-f bundles/k8s-rhel8/Dockerfile \
+		bundles/k8s-rhel8
+	-docker rm -f k8s-rhel8-$* 2>/dev/null
+	docker create --name k8s-rhel8-$* kurl/rhel-8-k8s:$*
+	mkdir -p build/packages/kubernetes/$*/rhel-8
+	docker cp k8s-rhel8-$*:/packages/archives/. build/packages/kubernetes/$*/rhel-8/
+	docker rm k8s-rhel8-$*
+
 build/templates: build/templates/install.tmpl build/templates/join.tmpl build/templates/upgrade.tmpl build/templates/tasks.tmpl
 
 build/bin:

bundles/k8s-rhel8/Dockerfile

@@ -0,0 +1,16 @@
+FROM centos:8
+ARG KUBERNETES_VERSION
+COPY ./kubernetes.repo /etc/yum.repos.d/kubernetes.repo
+RUN mkdir -p /packages/archives
+
+RUN yum install yum-utils -y
+RUN yumdownloader --resolve --destdir=/packages/archives -y \
+	kubelet-${KUBERNETES_VERSION} \
+	kubeadm-${KUBERNETES_VERSION} \
+	kubectl-${KUBERNETES_VERSION} \
+	kubernetes-cni \
+	git
+
+# First upgrade step requires upgraded kubeadm binary before kubeadm package is upgraded
+# https://kubernetes.io/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-11/
+RUN curl -sSL https://dl.k8s.io/release/v${KUBERNETES_VERSION}/bin/linux/amd64/kubeadm > /packages/archives/kubeadm

bundles/k8s-rhel8/kubernetes.repo

@@ -0,0 +1,7 @@
+[kubernetes]
+name=Kubernetes                
+baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
+enabled=1
+gpgcheck=1
+repo_gpgcheck=1
+gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg

scripts/common/kubernetes.sh

@@ -81,12 +81,24 @@ function kubernetes_install_host_packages() {
             ;;
 
         centos|rhel|amzn)
-            rpm --upgrade --force --nodeps $DIR/packages/kubernetes/${k8sVersion}/rhel-7/*.rpm
-            # TODO still required on 1.15+, and only CentOS/RHEL?
-            if [ -n "$DOCKER_VERSION" ]; then
-                service docker restart
-            fi
-            ;;
+            case "$LSB_DIST$DIST_VERSION" in
+                rhel8.0|rhel8.1|rhel8.2|centos8.0|centos8.1|centos8.2)
+                    rpm --upgrade --force --nodeps $DIR/packages/kubernetes/${k8sVersion}/rhel-8/*.rpm
+                    # TODO still required on 1.15+, and only CentOS/RHEL?
+                    if [ -n "$DOCKER_VERSION" ]; then
+                        service docker restart
+                    fi
+                    ;;
+
+                *)
+                    rpm --upgrade --force --nodeps $DIR/packages/kubernetes/${k8sVersion}/rhel-7/*.rpm
+                    # TODO still required on 1.15+, and only CentOS/RHEL?
+                    if [ -n "$DOCKER_VERSION" ]; then
+                        service docker restart
+                    fi
+                    ;;
+            esac
+        ;;
     esac
 
     if [ "$CLUSTER_DNS" != "$DEFAULT_CLUSTER_DNS" ]; then