diff options
| author |   Ritu Sood <ritu.sood@intel.com> | 2020-11-19 18:12:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-11-19 18:12:18 +0000 |
| commit | 0206e988b2c05df33e454f8ea3975152b6ecc338 (patch) | |
| tree | 9b0699ce9d2f9cd101fc48759670dd931a4d1e03 /deployments/helm/onap4k8s | |
| parent | d2ca7962b498529868eb009352b05ba9932f8724 (diff) | |
| parent | e3c7d3d4153d3a9383d4ebcaa004e54b1b0b64c2 (diff) | |
Merge "Upgrade kubespray from 2.12.6 to 2.14.1"
Diffstat (limited to 'deployments/helm/onap4k8s')
6 files changed, 6 insertions, 19 deletions
diff --git a/deployments/helm/onap4k8s/Makefile b/deployments/helm/onap4k8s/Makefile index 20470878..f078765d 100644 --- a/deployments/helm/onap4k8s/Makefile +++ b/deployments/helm/onap4k8s/Makefile @@ -54,16 +54,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 onap4k8s http://127.0.0.1:8879 - -# stop local helm repo -repo-stop: - @pkill helm - @helm repo remove onap4k8s %: @: diff --git a/deployments/helm/onap4k8s/README.txt b/deployments/helm/onap4k8s/README.txt index 857b0a0b..1528c740 100644 --- a/deployments/helm/onap4k8s/README.txt +++ b/deployments/helm/onap4k8s/README.txt @@ -16,9 +16,6 @@ # Installation of ONAP4K8S helm chart ################################################################# -1. Create a helm repo (onap4k8s) from Makefile -$ make repo - 1. Run "Makefile" in ONAP4K8S repo $ make all diff --git a/deployments/helm/onap4k8s/charts/etcd/requirements.yaml b/deployments/helm/onap4k8s/charts/etcd/requirements.yaml index ff2221f6..8c46d632 100644 --- a/deployments/helm/onap4k8s/charts/etcd/requirements.yaml +++ b/deployments/helm/onap4k8s/charts/etcd/requirements.yaml @@ -15,4 +15,4 @@ dependencies: - name: common version: ~5.x-0 - repository: '@onap4k8s' + repository: 'file://../common' diff --git a/deployments/helm/onap4k8s/charts/etcd/values.yaml b/deployments/helm/onap4k8s/charts/etcd/values.yaml index d9874881..fd459f0a 100644 --- a/deployments/helm/onap4k8s/charts/etcd/values.yaml +++ b/deployments/helm/onap4k8s/charts/etcd/values.yaml @@ -55,6 +55,7 @@ persistence: ## #storageClass: "-" accessMode: "ReadWriteOnce" + storageType: hostPath storage: "1Gi" mountPath: /dockerdata-nfs mountSubPath: k8s-etcd diff --git a/deployments/helm/onap4k8s/charts/mongo/requirements.yaml b/deployments/helm/onap4k8s/charts/mongo/requirements.yaml index 0693dd3f..ed887924 100644 --- a/deployments/helm/onap4k8s/charts/mongo/requirements.yaml +++ b/deployments/helm/onap4k8s/charts/mongo/requirements.yaml @@ -15,4 +15,4 @@ dependencies: - name: common version: ~5.x-0 - repository: '@onap4k8s' + repository: 'file://../common' diff --git a/deployments/helm/onap4k8s/charts/multicloud-k8s/requirements.yaml b/deployments/helm/onap4k8s/charts/multicloud-k8s/requirements.yaml index c5102e49..b114c96e 100644 --- a/deployments/helm/onap4k8s/charts/multicloud-k8s/requirements.yaml +++ b/deployments/helm/onap4k8s/charts/multicloud-k8s/requirements.yaml @@ -18,10 +18,10 @@ dependencies: # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) - repository: '@onap4k8s' + repository: 'file://../common' - name: mongo version: ~5.x-0 - repository: '@onap4k8s' + repository: 'file://../mongo' - name: etcd version: ~5.x-0 - repository: '@onap4k8s' + repository: 'file://../etcd' |