From 0ba2d82c40043b6f31afb7b9584d7568071673a6 Mon Sep 17 00:00:00 2001 From: Tomáš Levora Date: Mon, 22 Jul 2019 12:40:08 +0200 Subject: Remove patching from offline-installer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patching of OOM should not be necessary to bypass offline state, therefore this custom patching can be removed in offline-installer Issue-ID: OOM-2014 Change-Id: I61b4cd48cfada613a7914ef5001bb64f7584815a Signed-off-by: Tomáš Levora --- patches/onap.patch | 50 -------------------------------------------------- 1 file changed, 50 deletions(-) delete mode 100644 patches/onap.patch (limited to 'patches/onap.patch') diff --git a/patches/onap.patch b/patches/onap.patch deleted file mode 100644 index a135ad38..00000000 --- a/patches/onap.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/resources/config/msosimulator.sh b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/resources/config/msosimulator.sh -index c87a26b..4212c96 100644 ---- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/resources/config/msosimulator.sh -+++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/resources/config/msosimulator.sh -@@ -1,4 +1,4 @@ - #!/bin/sh --pip install flask --pip install requests -+pip install -i https://nexus3.onap.org/repository/pypi-private/simple/ --trusted-host nexus3.onap.org flask -+pip install -i https://nexus3.onap.org/repository/pypi-private/simple/ --trusted-host nexus3.onap.org requests - python /share/etc/config/mock.py -diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml -index b26f6dd..2d31aad 100644 ---- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml -+++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml -@@ -30,6 +30,10 @@ spec: - app: {{ include "common.name" . }} - release: {{ .Release.Name }} - spec: -+ hostAliases: -+ - ip: INFRA_CLUSTER_IP -+ hostnames: -+ - nexus3.onap.org - initContainers: - - command: - - /root/ready.py --- - -diff --git a/kubernetes/common/dgbuilder/templates/deployment.yaml b/kubernetes/common/dgbuilder/templates/deployment.yaml -index 353c231..cf38409 100644 ---- a/kubernetes/common/dgbuilder/templates/deployment.yaml -+++ b/kubernetes/common/dgbuilder/templates/deployment.yaml -@@ -49,8 +49,12 @@ spec: - - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} -- command: ["/bin/bash"] -- args: ["-c", "cd /opt/onap/ccsdk/dgbuilder/ && ./start.sh sdnc1.0 && wait"] -+ command: -+ - /bin/bash -+ - -c -+ - > -+ NPM_REGISTRY_RECORD; -+ cd /opt/onap/ccsdk/dgbuilder/ && ./start.sh sdnc1.0 && wait - ports: - - containerPort: {{ .Values.service.internalPort }} - readinessProbe: --- -1.8.3.1 - -- cgit 1.2.3-korg