commit 25c7bf59e69679167e4f6e5622f3e2a4dbc7362b
author Sean Condon <sean@opennetworking.org> Sat Nov 06 11:53:59 2021 +0000
committer Sean Condon <sean@opennetworking.org> Sun Nov 07 20:46:38 2021 +0000
tree 3b928c13d4cad6c4da2d4ed5040b36ffa326e3d6
parent 98fde36bffa18e9c9a3b93810d19dadc4add919c

AETHER-2625 move sdcore-exporter to demo-exporter

Change-Id: I422f0f9a0436fca145b6922b3c09a51994118928

sdcore-adapter-v4/Chart.yaml

diff --git a/sdcore-adapter-v4/Chart.yaml b/sdcore-adapter-v4/Chart.yaml
index 9b49d83..2708eed 100644
--- a/sdcore-adapter-v4/Chart.yaml
+++ b/sdcore-adapter-v4/Chart.yaml
@@ -6,13 +6,14 @@
 name: sdcore-adapter-v4
 kubeVersion: ">=1.17.0"
 type: application
-version: 4.0.11
+version: 4.0.12
 appVersion: v4.0.0
-description: ONOS SD-Core Adapter
+description: Aether SD-Core Adapter
 keywords:
-  - onos
-  - sdn
-home: https://onosproject.org
+  - aether
+  - sdcore
+  - adapter
+home: https://www.opennetworking.org/aether/
 maintainers:
-  - name: ONOS Support
+  - name: Aether Ops team
     email: support@opennetworking.org

sdcore-adapter-v4/templates/deployment.yaml

diff --git a/sdcore-adapter-v4/templates/deployment.yaml b/sdcore-adapter-v4/templates/deployment.yaml
index e381db6..a6a5ba8 100644
--- a/sdcore-adapter-v4/templates/deployment.yaml
+++ b/sdcore-adapter-v4/templates/deployment.yaml
@@ -86,39 +86,6 @@
             - name: logconfig
               mountPath: /etc/onos/config
               readOnly: true
-        - name: {{ .Chart.Name }}-exporter
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          env:
-            - name: POD_NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-            - name: POD_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.name
-            - name: NODE_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
-          args:
-            - "/usr/local/bin/sdcore-exporter"
-          ports:
-            - name: metrics
-              containerPort: 2112
-          readinessProbe:
-            httpGet:
-              path: /metrics
-              port: 2112
-            initialDelaySeconds: 5
-            periodSeconds: 10
-          livenessProbe:
-            httpGet:
-              path: /metrics
-              port: 2112
-            initialDelaySeconds: 15
-            periodSeconds: 20
       volumes:
         - name: logconfig
           configMap:

sdcore-adapter-v4/templates/service.yaml

diff --git a/sdcore-adapter-v4/templates/service.yaml b/sdcore-adapter-v4/templates/service.yaml
index a266be4..42aa78a 100644
--- a/sdcore-adapter-v4/templates/service.yaml
+++ b/sdcore-adapter-v4/templates/service.yaml
@@ -25,23 +25,3 @@
       port: {{ .Values.ports.prometheus }}
     - name: diag-api
       port: {{ .Values.ports.diagApi }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "sdcore-adapter.fullname" . }}-exporter
-  labels:
-    app: {{ template "sdcore-adapter.fullname" . }}-exporter
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-    {{- include "sdcore-adapter.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  selector:
-    name: {{ template "sdcore-adapter.fullname" . }}
-  ports:
-  - name: metrics
-    port: 2112
-  - name: exporterui
-    port: 8081