From 86c1e0f834f13eadd5a7fc652ae5cfdef77af610 Mon Sep 17 00:00:00 2001
From: Thomas Vachuska <tom.vachuska@intel.com>
Date: Wed, 11 Jan 2023 10:00:30 -0800
Subject: [PATCH] Fixed topo-discovery chart (#707)

---
 topo-discovery/Chart.yaml                 |  2 +-
 topo-discovery/templates/role.yaml        | 19 -------------------
 topo-discovery/templates/rolebinding.yaml | 16 ----------------
 topo-discovery/templates/service.yaml     |  2 +-
 4 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 topo-discovery/templates/role.yaml
 delete mode 100644 topo-discovery/templates/rolebinding.yaml

diff --git a/topo-discovery/Chart.yaml b/topo-discovery/Chart.yaml
index 38329dc9..8eee77cc 100644
--- a/topo-discovery/Chart.yaml
+++ b/topo-discovery/Chart.yaml
@@ -6,7 +6,7 @@ apiVersion: v2
 name: topo-discovery
 description: ONOS Topology Discovery service
 type: application
-version: 0.2.1
+version: 0.2.2
 appVersion: v0.2.0
 keywords:
   - onos
diff --git a/topo-discovery/templates/role.yaml b/topo-discovery/templates/role.yaml
deleted file mode 100644
index c18e8c26..00000000
--- a/topo-discovery/templates/role.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-# SPDX-FileCopyrightText: 2023-present Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  creationTimestamp: null
-  name: {{ template "topo-discovery.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-rules:
-- apiGroups:
-  - primitives.atomix.io
-  resources:
-  - '*'
-  resourceNames:
-  - {{ template "topo-discovery.fullname" . }}-objects
-  verbs:
-  - '*'
\ No newline at end of file
diff --git a/topo-discovery/templates/rolebinding.yaml b/topo-discovery/templates/rolebinding.yaml
deleted file mode 100644
index 31bd6e2e..00000000
--- a/topo-discovery/templates/rolebinding.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-# SPDX-FileCopyrightText: 2023-present Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: {{ template "topo-discovery.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-subjects:
-- kind: ServiceAccount
-  name: {{ template "topo-discovery.fullname" . }}
-roleRef:
-  kind: Role
-  name: {{ template "topo-discovery.fullname" . }}
-  apiGroup: rbac.authorization.k8s.io
\ No newline at end of file
diff --git a/topo-discovery/templates/service.yaml b/topo-discovery/templates/service.yaml
index e5d29b1b..455b1880 100644
--- a/topo-discovery/templates/service.yaml
+++ b/topo-discovery/templates/service.yaml
@@ -17,7 +17,7 @@ spec:
   selector:
     name: {{ template "topo-discovery.fullname" . }}
     app: onos
-    type: topo-discovery
+    type: discovery
     resource: {{ template "topo-discovery.fullname" . }}
       {{- include "topo-discovery.selectorLabels" . | nindent 4 }}
   ports: