aboutsummaryrefslogtreecommitdiffstats
path: root/deployments/helm/v2/emco
diff options
context:
space:
mode:
authorTodd Malsbary <todd.malsbary@intel.com>2020-10-27 14:46:29 -0700
committerTodd Malsbary <todd.malsbary@intel.com>2020-10-30 16:48:04 -0700
commite3c7d3d4153d3a9383d4ebcaa004e54b1b0b64c2 (patch)
treefb3e4e85dc51e7a05dc8756413d490caf638a093 /deployments/helm/v2/emco
parent0c352ef0d74d4b51a0fce5123b34a6753e8ab6a4 (diff)
Upgrade kubespray from 2.12.6 to 2.14.1
- Replace move of ansible.cfg from kubespray distribution to /etc/ansible with ANSIBLE_CONFIG environment variable. Ansible modifies ansible.cfg during installation, and the paths in it are relative. - kubespray 2.14.1 requires a kubernetes version > 1.16. Use the default versions of kubernetes and helm provided by kubespray 2.14.1. - kubespray 2.14.1 replaces helm 2 with helm 3. This removes support for helm init and helm serve. It is no longer necessary to call helm init, and the helm serve repository is replaced with file relative URLs. This also triggered a subsequent update of the kubernetes-helm ansible module to include the newer helm versions. - Add "storageType: hostPath" to etcd/values.yaml. Helm deploy of etcd will fail without this due to nil PersistentVolume.metadata.labels.type. - The mitogen module used by kubespray/ansible requires python2 on the hosts. Use the linear strategy to bypass mitogen and install python2 on the cluster hosts. Issue-ID: MULTICLOUD-1230 Signed-off-by: Todd Malsbary <todd.malsbary@intel.com> Change-Id: I9f50bb4e123fdcacab6b6a97e79cd09fb5c96634
Diffstat (limited to 'deployments/helm/v2/emco')
-rw-r--r--deployments/helm/v2/emco/Makefile11
-rw-r--r--deployments/helm/v2/emco/README.md18
-rw-r--r--deployments/helm/v2/emco/clm/requirements.yaml2
-rw-r--r--deployments/helm/v2/emco/dcm/requirements.yaml2
-rw-r--r--deployments/helm/v2/emco/emco-db/requirements.yaml6
-rw-r--r--deployments/helm/v2/emco/emco-services/requirements.yaml14
-rw-r--r--deployments/helm/v2/emco/emco-tools/requirements.yaml4
-rw-r--r--deployments/helm/v2/emco/emco/requirements.yaml6
-rw-r--r--deployments/helm/v2/emco/etcd/requirements.yaml2
-rw-r--r--deployments/helm/v2/emco/etcd/values.yaml1
-rw-r--r--deployments/helm/v2/emco/mongo/requirements.yaml2
-rw-r--r--deployments/helm/v2/emco/ncm/requirements.yaml2
-rw-r--r--deployments/helm/v2/emco/orchestrator/requirements.yaml2
-rw-r--r--deployments/helm/v2/emco/ovnaction/requirements.yaml2
-rw-r--r--deployments/helm/v2/emco/rsync/requirements.yaml2
15 files changed, 31 insertions, 45 deletions
diff --git a/deployments/helm/v2/emco/Makefile b/deployments/helm/v2/emco/Makefile
index dc88ff86..355fc3f6 100644
--- a/deployments/helm/v2/emco/Makefile
+++ b/deployments/helm/v2/emco/Makefile
@@ -64,16 +64,5 @@ clean:
@rm -rf $(PACKAGE_DIR)/*
@rm -rf $(OUTPUT_DIR)
-# start up a local helm repo to serve up helm chart packages
-repo:
- @mkdir -p $(PACKAGE_DIR)
- @helm serve --repo-path $(PACKAGE_DIR) &
- @helm repo index $(PACKAGE_DIR)
- @helm repo add local http://127.0.0.1:8879
-
-# stop local helm repo
-repo-stop:
- @pkill helm
- @helm repo remove local
%:
@:
diff --git a/deployments/helm/v2/emco/README.md b/deployments/helm/v2/emco/README.md
index 407f4509..70cbfcde 100644
--- a/deployments/helm/v2/emco/README.md
+++ b/deployments/helm/v2/emco/README.md
@@ -6,11 +6,7 @@ EMCO Helm charts include charts for EMCO microservices along with MongoDb, etcd,
### Steps to generate and install packages
-**1. Create a local helm repo from Makefile**
-
-`$ make repo`
-
-**2. Run make file to package all the required chart**
+**1. Run make file to package all the required chart**
`$ make clean`
@@ -26,13 +22,13 @@ Pacakges helm charts in tar.gz format. All packages are in **dist/packages** dir
| **emco-0.1.0.tgz** | Includes all charts including database, all services and tools |
-**3. Deploy EMCO Packages for Databases and Services**
+**2. Deploy EMCO Packages for Databases and Services**
`$ helm install dist/packages/emco-db-0.1.0.tgz --name emco-db --namespace emco`
`$ helm install dist/packages/emco-services-0.1.0.tgz --name emco-services --namespace emco`
-**4. Deploy tools (Optional)**
+**3. Deploy tools (Optional)**
`$ helm install dist/packages/emco-tools-0.1.0.tgz --name emco-tools --namespace emco`
@@ -41,12 +37,12 @@ NOTE: Deploy the Chart emco-0.1.0.tgz to deploy all packages including database,
`$ helm install dist/packages/emco-0.1.0.tgz --name emco --namespace emco`
-**5. To check logs of the different Microservices check fluentd logs**
+**4. To check logs of the different Microservices check fluentd logs**
`kubectl logs emco-tools-fluentd-0 -n emco | grep orchestrator`
-**6. Delete all packages**
+**5. Delete all packages**
`$ helm delete emco-services --purge`
@@ -61,7 +57,7 @@ NOTE: If the Chart emco-0.1.0.tgz was deployed
`$ helm delete emco --purge`
-**7. Delete local helm repo**
+**6. Delete local helm repo**
`make repo-stop`
@@ -74,4 +70,4 @@ After deleting the db package and before installing the package again following
Workarounds:
* remove the finalizers section using `kubectl edit persistentvolumes emco-db-emco-etcd-data-0`
-* or, if appropriate, delete the entire namespace using `kubectl delete namespace emco` \ No newline at end of file
+* or, if appropriate, delete the entire namespace using `kubectl delete namespace emco`
diff --git a/deployments/helm/v2/emco/clm/requirements.yaml b/deployments/helm/v2/emco/clm/requirements.yaml
index c2253cf4..bba5c27d 100644
--- a/deployments/helm/v2/emco/clm/requirements.yaml
+++ b/deployments/helm/v2/emco/clm/requirements.yaml
@@ -15,4 +15,4 @@
dependencies:
- name: common
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../common'
diff --git a/deployments/helm/v2/emco/dcm/requirements.yaml b/deployments/helm/v2/emco/dcm/requirements.yaml
index a3792606..c5c20127 100644
--- a/deployments/helm/v2/emco/dcm/requirements.yaml
+++ b/deployments/helm/v2/emco/dcm/requirements.yaml
@@ -15,4 +15,4 @@
dependencies:
- name: common
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../common'
diff --git a/deployments/helm/v2/emco/emco-db/requirements.yaml b/deployments/helm/v2/emco/emco-db/requirements.yaml
index 52a40b64..62e807b6 100644
--- a/deployments/helm/v2/emco/emco-db/requirements.yaml
+++ b/deployments/helm/v2/emco/emco-db/requirements.yaml
@@ -15,10 +15,10 @@
dependencies:
- name: common
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../common'
- name: mongo
version: ~4.x-0
- repository: '@local'
+ repository: 'file://../mongo'
- name: etcd
version: ~3.x-0
- repository: '@local'
+ repository: 'file://../etcd'
diff --git a/deployments/helm/v2/emco/emco-services/requirements.yaml b/deployments/helm/v2/emco/emco-services/requirements.yaml
index dbb14661..ddb9fb7f 100644
--- a/deployments/helm/v2/emco/emco-services/requirements.yaml
+++ b/deployments/helm/v2/emco/emco-services/requirements.yaml
@@ -15,22 +15,22 @@
dependencies:
- name: common
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../common'
- name: orchestrator
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../orchestrator'
- name: ncm
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../ncm'
- name: rsync
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../rsync'
- name: clm
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../clm'
- name: ovnaction
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../ovnaction'
- name: dcm
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../dcm'
diff --git a/deployments/helm/v2/emco/emco-tools/requirements.yaml b/deployments/helm/v2/emco/emco-tools/requirements.yaml
index ddb91c51..14ad537d 100644
--- a/deployments/helm/v2/emco/emco-tools/requirements.yaml
+++ b/deployments/helm/v2/emco/emco-tools/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: common
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../common'
- name: fluentd
version: ~1.x-0
- repository: '@local'
+ repository: 'file://../fluentd'
diff --git a/deployments/helm/v2/emco/emco/requirements.yaml b/deployments/helm/v2/emco/emco/requirements.yaml
index 21649c38..c704d2f2 100644
--- a/deployments/helm/v2/emco/emco/requirements.yaml
+++ b/deployments/helm/v2/emco/emco/requirements.yaml
@@ -15,11 +15,11 @@
dependencies:
- name: emco-db
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../emco-db'
- name: emco-tools
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../emco-tools'
- name: emco-services
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../emco-services'
diff --git a/deployments/helm/v2/emco/etcd/requirements.yaml b/deployments/helm/v2/emco/etcd/requirements.yaml
index d71b975c..9802dac4 100644
--- a/deployments/helm/v2/emco/etcd/requirements.yaml
+++ b/deployments/helm/v2/emco/etcd/requirements.yaml
@@ -15,4 +15,4 @@
dependencies:
- name: common
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../common'
diff --git a/deployments/helm/v2/emco/etcd/values.yaml b/deployments/helm/v2/emco/etcd/values.yaml
index 226b4594..ef9494b9 100644
--- a/deployments/helm/v2/emco/etcd/values.yaml
+++ b/deployments/helm/v2/emco/etcd/values.yaml
@@ -48,6 +48,7 @@ persistence:
enabled: false
volumeReclaimPolicy: Retain
accessMode: ReadWriteMany
+ storageType: hostPath
storage: 1Gi
mountPath: /dockerdata-nfs
mountSubPath: "etcd/data"
diff --git a/deployments/helm/v2/emco/mongo/requirements.yaml b/deployments/helm/v2/emco/mongo/requirements.yaml
index 38a832b8..b8b139fa 100644
--- a/deployments/helm/v2/emco/mongo/requirements.yaml
+++ b/deployments/helm/v2/emco/mongo/requirements.yaml
@@ -15,4 +15,4 @@
dependencies:
- name: common
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../common'
diff --git a/deployments/helm/v2/emco/ncm/requirements.yaml b/deployments/helm/v2/emco/ncm/requirements.yaml
index c2253cf4..bba5c27d 100644
--- a/deployments/helm/v2/emco/ncm/requirements.yaml
+++ b/deployments/helm/v2/emco/ncm/requirements.yaml
@@ -15,4 +15,4 @@
dependencies:
- name: common
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../common'
diff --git a/deployments/helm/v2/emco/orchestrator/requirements.yaml b/deployments/helm/v2/emco/orchestrator/requirements.yaml
index c2253cf4..bba5c27d 100644
--- a/deployments/helm/v2/emco/orchestrator/requirements.yaml
+++ b/deployments/helm/v2/emco/orchestrator/requirements.yaml
@@ -15,4 +15,4 @@
dependencies:
- name: common
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../common'
diff --git a/deployments/helm/v2/emco/ovnaction/requirements.yaml b/deployments/helm/v2/emco/ovnaction/requirements.yaml
index c2253cf4..bba5c27d 100644
--- a/deployments/helm/v2/emco/ovnaction/requirements.yaml
+++ b/deployments/helm/v2/emco/ovnaction/requirements.yaml
@@ -15,4 +15,4 @@
dependencies:
- name: common
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../common'
diff --git a/deployments/helm/v2/emco/rsync/requirements.yaml b/deployments/helm/v2/emco/rsync/requirements.yaml
index c2253cf4..bba5c27d 100644
--- a/deployments/helm/v2/emco/rsync/requirements.yaml
+++ b/deployments/helm/v2/emco/rsync/requirements.yaml
@@ -15,4 +15,4 @@
dependencies:
- name: common
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../common'