aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMandeep Khinda <Mandeep.Khinda@amdocs.com>2018-03-22 17:08:13 +0000
committerGerrit Code Review <gerrit@onap.org>2018-03-22 17:08:13 +0000
commitd2b495234d54612e1cddcd709ffcf3620275fddf (patch)
tree3ac57793a52721f0d8d6395b410bb323b25ae3be
parent2670b0ef2262f25176ed2f0e08867c3807ffdfa6 (diff)
parent98dde550955c6f4c24d5c5ebab82cac082769bba (diff)
Merge "Move deployment-specific templates to parent chart"
-rw-r--r--kubernetes/onap/requirements.yaml3
-rw-r--r--kubernetes/onap/templates/clusterrolebinding.yaml (renamed from kubernetes/setup/templates/clusterrolebinding.yaml)0
-rw-r--r--kubernetes/onap/templates/secrets.yaml (renamed from kubernetes/setup/templates/secrets.yaml)0
-rw-r--r--kubernetes/setup/.helmignore21
-rw-r--r--kubernetes/setup/Chart.yaml18
-rw-r--r--kubernetes/setup/requirements.yaml21
-rw-r--r--kubernetes/setup/values.yaml18
7 files changed, 0 insertions, 81 deletions
diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml
index 1b5ca64b13..7b5e56b070 100644
--- a/kubernetes/onap/requirements.yaml
+++ b/kubernetes/onap/requirements.yaml
@@ -92,9 +92,6 @@ dependencies:
version: ~0.1.0
repository: '@local'
condition: sdnc.enabled
- - name: setup
- version: ~2.0.0
- repository: '@local'
- name: so
version: ~2.0.0
repository: '@local'
diff --git a/kubernetes/setup/templates/clusterrolebinding.yaml b/kubernetes/onap/templates/clusterrolebinding.yaml
index fbe9a5b0a7..fbe9a5b0a7 100644
--- a/kubernetes/setup/templates/clusterrolebinding.yaml
+++ b/kubernetes/onap/templates/clusterrolebinding.yaml
diff --git a/kubernetes/setup/templates/secrets.yaml b/kubernetes/onap/templates/secrets.yaml
index 2345be1972..2345be1972 100644
--- a/kubernetes/setup/templates/secrets.yaml
+++ b/kubernetes/onap/templates/secrets.yaml
diff --git a/kubernetes/setup/.helmignore b/kubernetes/setup/.helmignore
deleted file mode 100644
index f0c1319444..0000000000
--- a/kubernetes/setup/.helmignore
+++ /dev/null
@@ -1,21 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
diff --git a/kubernetes/setup/Chart.yaml b/kubernetes/setup/Chart.yaml
deleted file mode 100644
index d8c48f88f6..0000000000
--- a/kubernetes/setup/Chart.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-description: An ONAP environment setup chart
-name: setup
-version: 2.0.0
diff --git a/kubernetes/setup/requirements.yaml b/kubernetes/setup/requirements.yaml
deleted file mode 100644
index 9b24f824d5..0000000000
--- a/kubernetes/setup/requirements.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
- - name: common
- version: ~2.0.0
- # 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: '@local' \ No newline at end of file
diff --git a/kubernetes/setup/values.yaml b/kubernetes/setup/values.yaml
deleted file mode 100644
index fb4de8a8a6..0000000000
--- a/kubernetes/setup/values.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-global:
- # image repositories
- repository: nexus3.onap.org:10001
- repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==