SEBA-457 cleanse helm-charts of deployment and siterole objects
Change-Id: I8a4a4f5a641556dcb2522482580ff9d35369d8c8
diff --git a/xos-profiles/base-kubernetes/Chart.yaml b/xos-profiles/base-kubernetes/Chart.yaml
index 1b632a3..d7f2c0b 100644
--- a/xos-profiles/base-kubernetes/Chart.yaml
+++ b/xos-profiles/base-kubernetes/Chart.yaml
@@ -16,7 +16,7 @@
name: base-kubernetes
description: A Helm chart for XOS's "base-kubernetes" profile
icon: https://guide.opencord.org/logos/cord.svg
-version: 1.0.3
+version: 1.0.4
# xosproject/tosca-loader version
appVersion: 1.1.7
diff --git a/xos-profiles/base-kubernetes/templates/tosca-configmap.yaml b/xos-profiles/base-kubernetes/templates/tosca-configmap.yaml
index 607a676..5da5d15 100644
--- a/xos-profiles/base-kubernetes/templates/tosca-configmap.yaml
+++ b/xos-profiles/base-kubernetes/templates/tosca-configmap.yaml
@@ -21,8 +21,6 @@
data:
010-fixtures.yaml: |
{{ toYaml .Values.toscaRecipes.fixtures | indent 4 }}
- 020-deployment.yaml: |
-{{ toYaml .Values.toscaRecipes.deployment | indent 4 }}
040-cord-services.yaml: |
{{ toYaml .Values.toscaRecipes.cordServices | indent 4 }}
050-service-graph-constraints.yaml: |
diff --git a/xos-profiles/base-kubernetes/values.yaml b/xos-profiles/base-kubernetes/values.yaml
index 77c45c1..68d2753 100644
--- a/xos-profiles/base-kubernetes/values.yaml
+++ b/xos-profiles/base-kubernetes/values.yaml
@@ -41,7 +41,6 @@
tosca_definitions_version: tosca_simple_yaml_1_0
description: Some basic fixtures
imports:
- - custom_types/siterole.yaml
- custom_types/networkparametertype.yaml
- custom_types/networktemplate.yaml
topology_template:
@@ -73,21 +72,7 @@
type: tosca.nodes.NetworkParameterType
properties:
name: neutron_port_name
- # ----------------------------------------------------------------------------
- # Roles
- # ----------------------------------------------------------------------------
- siterole#admin:
- type: tosca.nodes.SiteRole
- properties:
- role: admin
- siterole#pi:
- type: tosca.nodes.SiteRole
- properties:
- role: pi
- siterole#tech:
- type: tosca.nodes.SiteRole
- properties:
- role: tech
+
# -----------------------------------------------------------------------------
# Network Templates
# -----------------------------------------------------------------------------
@@ -112,18 +97,6 @@
translation: none
shared_network_name: ext-net
- deployment:
- tosca_definitions_version: tosca_simple_yaml_1_0
- imports:
- - custom_types/deployment.yaml
- description: deployment config, generated by platform-install
- topology_template:
- node_templates:
- MyDeployment:
- type: tosca.nodes.Deployment
- properties:
- name: MyDeployment
-
cordServices:
tosca_definitions_version: tosca_simple_yaml_1_0
description: Set up Kubernetes Service