airship/airshipctl
Code Issues Proposed changes

Uplift provider components in test site

Browse Source 
* uplift capi, cabpk, cacpk and capm3 in test site defination
  * uplift images in version catalogue
  * add api timeout in controlplane
  * add timeout for phases

Change-Id: I9de15c4e1979c12eeedb55fbe721b5e7adfe496b
Signed-off-by: Sreejith Punnapuzha <sreejith.punnapuzha@outlook.com>
This commit is contained in:
Sreejith Punnapuzha 2020-09-14 08:28:23 -05:00 committed by Sreejith Punnapuzha
parent cf1f55f3ca
commit f48456a69f
5 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/function/airshipctl-catalogues/versions-airshipctl.yaml
View File

@ -26,13 +26,13 @@ images:
manager: quay.io/metal3-io/cluster-api-provider-metal3
auth_proxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.0
cacpk:
manager: us.gcr.io/k8s-artifacts-prod/cluster-api/kubeadm-control-plane-controller:v0.3.3
manager: us.gcr.io/k8s-artifacts-prod/cluster-api/kubeadm-control-plane-controller:v0.3.7
auth_proxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1
cabpk:
manager: us.gcr.io/k8s-artifacts-prod/cluster-api/kubeadm-bootstrap-controller:v0.3.3
manager: us.gcr.io/k8s-artifacts-prod/cluster-api/kubeadm-bootstrap-controller:v0.3.7
auth_proxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1
capi:
manager: us.gcr.io/k8s-artifacts-prod/cluster-api/cluster-api-controller:v0.3.3
manager: us.gcr.io/k8s-artifacts-prod/cluster-api/cluster-api-controller:v0.3.7
auth_proxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1
baremetal_operator:
ironic: # ironic Deployment

24
manifests/function/clusterctl/clusterctl.yaml
View File

@ -5,40 +5,40 @@ metadata:
airshipit.org/deploy-k8s: "false"
name: clusterctl-v1
init-options:
core-provider: "cluster-api:v0.3.3"
core-provider: "cluster-api:v0.3.7"
bootstrap-providers:
- "kubeadm:v0.3.3"
- "kubeadm:v0.3.7"
infrastructure-providers:
- "metal3:v0.3.1"
- "metal3:v0.3.2"
control-plane-providers:
- "kubeadm:v0.3.3"
- "kubeadm:v0.3.7"
providers:
- name: "metal3"
type: "InfrastructureProvider"
variable-substitution: true
versions:
v0.3.1: manifests/function/capm3/v0.3.1
v0.3.2: manifests/function/capm3/v0.3.2
- name: "kubeadm"
type: "BootstrapProvider"
variable-substitution: true
versions:
v0.3.3: manifests/function/cabpk/v0.3.3
v0.3.7: manifests/function/cabpk/v0.3.7
- name: "cluster-api"
type: "CoreProvider"
variable-substitution: true
versions:
v0.3.3: manifests/function/capi/v0.3.3
v0.3.7: manifests/function/capi/v0.3.7
- name: "kubeadm"
type: "ControlPlaneProvider"
variable-substitution: true
versions:
v0.3.3: manifests/function/cacpk/v0.3.3
v0.3.7: manifests/function/cacpk/v0.3.7
# These default images can be overridden via the `replacements/` entrypoint
additional-vars:
CONTAINER_CAPM3_MANAGER: quay.io/metal3-io/cluster-api-provider-metal3:v0.3.1
CONTAINER_CACPK_MANAGER: us.gcr.io/k8s-artifacts-prod/cluster-api/kubeadm-control-plane-controller:v0.3.3
CONTAINER_CABPK_MANAGER: us.gcr.io/k8s-artifacts-prod/cluster-api/kubeadm-bootstrap-controller:v0.3.3
CONTAINER_CAPI_MANAGER: us.gcr.io/k8s-artifacts-prod/cluster-api/cluster-api-controller:v0.3.3
CONTAINER_CAPM3_MANAGER: quay.io/metal3-io/cluster-api-provider-metal3:v0.3.2
CONTAINER_CACPK_MANAGER: us.gcr.io/k8s-artifacts-prod/cluster-api/kubeadm-control-plane-controller:v0.3.7
CONTAINER_CABPK_MANAGER: us.gcr.io/k8s-artifacts-prod/cluster-api/kubeadm-bootstrap-controller:v0.3.7
CONTAINER_CAPI_MANAGER: us.gcr.io/k8s-artifacts-prod/cluster-api/cluster-api-controller:v0.3.7
CONTAINER_CAPM3_AUTH_PROXY: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.0
CONTAINER_CACPK_AUTH_PROXY: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1
CONTAINER_CABPK_AUTH_PROXY: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1

3
manifests/function/k8scontrol/controlplane.yaml
View File

@ -10,6 +10,9 @@ spec:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
name: cluster-controlplane
kubeadmConfigSpec:
clusterConfiguration:
apiServer:
timeoutForControlPlane: 1000s
preKubeadmCommands:
- echo 'root:r00tme' | chpasswd
- echo 'ubuntu:r00tme' | chpasswd

3
tools/deployment/30_deploy_controlplane.sh
View File

@ -17,6 +17,7 @@ set -ex
TARGET_IMAGE_DIR="/srv/iso"
EPHEMERAL_DOMAIN_NAME="air-ephemeral"
TARGET_IMAGE_URL="https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
export WAIT_TIMEOUT=${WAIT_TIMEOUT:-"2000s"}
# TODO (dukov) this is needed due to sushy tools inserts cdrom image to
# all vms. This can be removed once sushy tool is fixed
@ -46,7 +47,7 @@ fi
md5sum /srv/iso/target-image.qcow2 | cut -d ' ' -f 1 > ${TARGET_IMAGE_DIR}/target-image.qcow2.md5sum
echo "Create target k8s cluster resources"
airshipctl phase apply controlplane
airshipctl phase apply controlplane --wait-timeout $WAIT_TIMEOUT --debug
echo "Get kubeconfig from secret"
KUBECONFIG=""

3
tools/deployment/31_deploy_initinfra_target_node.sh
View File

@ -17,6 +17,7 @@ set -xe
export KUBECONFIG=${KUBECONFIG:-"$HOME/.airship/kubeconfig"}
export TIMEOUT=${TIMEOUT:-60}
NODENAME="node01"
export WAIT_TIMEOUT=${WAIT_TIMEOUT:-"2000s"}
# TODO need to run another config command after use-context to update kubeconfig
echo "Switch context to target cluster and set manifest"
@ -44,7 +45,7 @@ done
kubectl --kubeconfig $KUBECONFIG taint node $NODENAME node-role.kubernetes.io/master-
echo "Deploy infra to cluster"
airshipctl phase apply initinfra --debug --wait-timeout 1000s
airshipctl phase apply initinfra --debug --wait-timeout $WAIT_TIMEOUT
echo "List all pods"
kubectl --kubeconfig $KUBECONFIG get pods --all-namespaces