From 267a730f840d0ef5aceef9a66d4997ef91c053b7 Mon Sep 17 00:00:00 2001 From: Konrad Bańka Date: Tue, 23 Jun 2020 08:07:46 +0200 Subject: Update single-node KUD installation variables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Single host installation requires some kubespray variables defined differently from what is currently defined by default. All-in-one installation script has been updated to provide these differences. CI-building script has been updated and removed applying variables there, as it's not specific just for CI, but for every single-node installation. Issue-ID: MULTICLOUD-1093 Signed-off-by: Konrad Bańka Change-Id: I26c1835d87df41c087b8dfff9f52095083b6c160 --- kud/ci/k8s-cluster.yml | 83 ---------------------------------- kud/ci/kud-installer.sh | 1 - kud/hosting_providers/baremetal/aio.sh | 2 +- 3 files changed, 1 insertion(+), 85 deletions(-) delete mode 100644 kud/ci/k8s-cluster.yml (limited to 'kud') diff --git a/kud/ci/k8s-cluster.yml b/kud/ci/k8s-cluster.yml deleted file mode 100644 index 8191d4b4..00000000 --- a/kud/ci/k8s-cluster.yml +++ /dev/null @@ -1,83 +0,0 @@ -# SPDX-license-identifier: Apache-2.0 -############################################################################## -# Copyright (c) 2018 -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -# Kubernetes configuration dirs and system namespace. -# Those are where all the additional config stuff goes -# kubernetes normally puts in /srv/kubernetes. -# This puts them in a sane location and namespace. -# Editing those values will almost surely break something. -system_namespace: kube-system - -docker_version: 'latest' - -# Logging directory (sysvinit systems) -kube_log_dir: "/var/log/kubernetes" - -kube_api_anonymous_auth: true - -# Users to create for basic auth in Kubernetes API via HTTP -# Optionally add groups for user -kube_api_pwd: "secret" -kube_users: - kube: - pass: "{{kube_api_pwd}}" - role: admin - groups: - - system:masters - -## It is possible to activate / deactivate selected authentication methods (basic auth, static token auth) -#kube_oidc_auth: false -kube_basic_auth: true -kube_token_auth: true - -# Choose network plugin (calico, contiv, weave or flannel) -# Can also be set to 'cloud', which lets the cloud provider setup appropriate routing -kube_network_plugin: flannel - -# Make a copy of kubeconfig (admin.conf) on the host that runs Ansible to inventory/artifacts -kubeconfig_localhost: true -# Copy kubectl binary on the host that runs Ansible to inventory/artifacts -kubectl_localhost: true -# Disable nodelocal dns cache -enable_nodelocaldns: false -# Enable MountPropagation gate feature -local_volumes_enabled: true -local_volume_provisioner_enabled: true - -## Change this to use another Kubernetes version, e.g. a current beta release -kube_version: v1.16.9 - -# Helm deployment -helm_enabled: true - -# Kube-proxy proxyMode configuration. -# NOTE: Ipvs is based on netfilter hook function, but uses hash table as the underlying data structure and -# works in the kernel space -# https://kubernetes.io/docs/concepts/services-networking/service/#proxy-mode-ipvs -#kube_proxy_mode: ipvs - -# Download container images only once then push to cluster nodes in batches -download_run_once: False - -# Where the binaries will be downloaded. -# Note: ensure that you've enough disk space (about 1G) -local_release_dir: "/tmp/releases" -download_cache_dir: "/tmp/kubespray_cache" -retry_stagger: 10 - -#Set download_localhost: True to make localhost the download delegate. This can be useful if -#cluster nodes cannot access external addresses. To use this requires that docker is installed -#and running on the ansible master and that the current user is either in the docker group or -#can do passwordless sudo, to be able to access docker. -download_localhost: False - -# Subnet for cluster IPs -kube_service_addresses: 10.244.0.0/18 -# Subnet for Pod IPs -kube_pods_subnet: 10.244.64.0/18 diff --git a/kud/ci/kud-installer.sh b/kud/ci/kud-installer.sh index 956a15a6..73c1628b 100755 --- a/kud/ci/kud-installer.sh +++ b/kud/ci/kud-installer.sh @@ -9,6 +9,5 @@ set -x -e -o pipefail curr_dir="$(readlink -f "$(dirname "${BASH_SOURCE[0]}")")" -cp ${curr_dir}/k8s-cluster.yml ${curr_dir}/../hosting_providers/vagrant/inventory/group_vars/k8s-cluster.yml cd ${curr_dir}/../hosting_providers/baremetal ./aio.sh diff --git a/kud/hosting_providers/baremetal/aio.sh b/kud/hosting_providers/baremetal/aio.sh index 6a304141..e16a082b 100755 --- a/kud/hosting_providers/baremetal/aio.sh +++ b/kud/hosting_providers/baremetal/aio.sh @@ -21,7 +21,7 @@ OVN_CENTRAL_IP_ADDRESS=${OVN_CENTRAL_IP_ADDRESS:-$(hostname -I | cut -d ' ' -f 1 echo "Preparing inventory for ansible" cat < inventory/hosts.ini [all] -localhost ansible_ssh_host=${OVN_CENTRAL_IP_ADDRESS} ansible_ssh_port=22 +localhost ansible_ssh_host=${OVN_CENTRAL_IP_ADDRESS} ansible_ssh_port=22 download_run_once=False download_localhost=False download_cache_dir=/tmp/kubespray_cache retry_stagger=10 [kube-master] localhost -- cgit 1.2.3-korg