Browse Source

Merge "airskiff: Use Minikube for Kubernetes deployment"

Zuul 2 weeks ago
parent
commit
ea1667a8b1

+ 7
- 7
doc/source/airskiff.rst View File

@@ -21,7 +21,7 @@ Airskiff is packaged with a set of deployment scripts modeled after the
21 21
 These scripts:
22 22
 
23 23
 * Download, build, and containerize the Airship components above from source.
24
-* Deploy a Kubernetes cluster using KubeADM.
24
+* Deploy a Kubernetes cluster using Minikube.
25 25
 * Deploy Armada, Deckhand, and Shipyard using the latest `Armada image`_.
26 26
 * Deploy OpenStack using the Airskiff site and charts from the
27 27
   `OpenStack-Helm project`_.
@@ -59,13 +59,13 @@ environment variables:
59 59
 
60 60
   export USE_PROXY=true
61 61
   export PROXY=${http_proxy}
62
-  export no_proxy=${no_proxy},172.17.0.1,.svc.cluster.local
63
-  export NO_PROXY=${NO_PROXY},172.17.0.1,.svc.cluster.local
62
+  export no_proxy=${no_proxy},10.0.2.15,.svc.cluster.local
63
+  export NO_PROXY=${NO_PROXY},10.0.2.15,.svc.cluster.local
64 64
 
65 65
 .. note:: The ``.svc.cluster.local`` address is required to allow the OpenStack
66 66
   client to communicate without being routed through proxy servers. The IP
67
-  address ``172.17.0.1`` is the advertised IP address for the Kubernetes API
68
-  server. Replace the addresses if your configuration does not match the one
67
+  address ``10.0.2.15`` is the advertised IP address of the minikube Kubernetes
68
+  cluster. Replace the addresses if your configuration does not match the one
69 69
   defined above.
70 70
 
71 71
 Deploy Airskiff
@@ -110,8 +110,8 @@ Alternatively, this step can be performed by running the script directly:
110 110
 
111 111
   ./tools/deployment/airskiff/developer/005-clone-dependencies.sh
112 112
 
113
-Deploy Kubernetes with KubeADM
114
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
113
+Deploy Kubernetes with Minikube
114
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
115 115
 
116 116
 .. literalinclude:: ../../tools/deployment/airskiff/developer/010-deploy-k8s.sh
117 117
     :language: shell

+ 0
- 15
tools/deployment/airskiff/common/setup-proxy.sh View File

@@ -28,19 +28,4 @@ sed -i -e "/\s      type:/a\        proxy_server: ${PROXY}" \
28 28
 sed -i -e "/type: git/a\    proxy_server: ${PROXY}" \
29 29
   tools/deployment/airskiff/manifests/airship.yaml
30 30
 
31
-# Configure OpenStack-Helm proxy variables
32
-cd ${INSTALL_PATH}
33
-tee -a openstack-helm-infra/tools/gate/devel/local-vars.yaml << EOF
34
-proxy:
35
-  http: ${PROXY}
36
-  https: ${PROXY}
37
-  noproxy: localhost,127.0.0.1,172.17.0.1,.svc.cluster.local
38
-EOF
39
-
40
-# Add DNS nameservers present in /etc/resolv.conf to OSH playbook vars
41
-sed -ne "s/nameserver //p" /etc/resolv.conf | while read -r ns; do
42
-  sed -i -e "/external_dns_nameservers:/ a\      - ${ns}" \
43
-    openstack-helm-infra/tools/images/kubeadm-aio/assets/opt/playbooks/vars.yaml
44
-done
45
-
46 31
 cd "${CURRENT_DIR}"

+ 1
- 0
tools/deployment/airskiff/developer/000-install-packages.sh View File

@@ -26,6 +26,7 @@ sudo apt-get install --no-install-recommends -y \
26 26
         jq \
27 27
         nmap \
28 28
         curl \
29
+        python-pip \
29 30
         uuid-runtime \
30 31
         apt-transport-https \
31 32
         ca-certificates \

+ 6
- 7
tools/deployment/airskiff/developer/010-deploy-k8s.sh View File

@@ -1,7 +1,6 @@
1 1
 #!/bin/bash
2 2
 
3
-# Copyright 2017 The Openstack-Helm Authors.
4
-# Copyright 2018 AT&T Intellectual Property.  All other rights reserved.
3
+# Copyright 2019, AT&T Intellectual Property
5 4
 #
6 5
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
7 6
 #    not use this file except in compliance with the License. You may obtain
@@ -25,10 +24,10 @@ if [ -n "${PROXY}" ]; then
25 24
   . tools/deployment/airskiff/common/setup-proxy.sh
26 25
 fi
27 26
 
28
-# Deploy a kubeadm-administered cluster.
29
-cd ${OSH_INFRA_PATH}
30
-make dev-deploy setup-host
31
-make dev-deploy k8s
32
-cd "${CURRENT_DIR}"
27
+# Deploy K8s with Minikube
28
+cd "${OSH_INFRA_PATH}"
29
+bash -c "./tools/deployment/common/005-deploy-k8s.sh"
33 30
 
34 31
 kubectl label nodes --all --overwrite ucp-control-plane=enabled
32
+
33
+cd "${CURRENT_DIR}"

+ 1
- 1
tools/gate/playbooks/airskiff-deploy-gate.yaml View File

@@ -21,7 +21,7 @@
21 21
         chdir: "{{ zuul.project.src_dir }}"
22 22
       become: yes
23 23
 
24
-    - name: Deploy Kubernetes with KubeADM
24
+    - name: Deploy Kubernetes with Minikube
25 25
       shell: |
26 26
         ./tools/deployment/airskiff/developer/010-deploy-k8s.sh
27 27
       args:

Loading…
Cancel
Save