VOL-3159 - Remove python ofagent resources
Change-Id: Ic932af9c7b72f5fb274e322d91817e253e8c27cd
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index 31481dd..d721cf0 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -14,7 +14,7 @@
# limitations under the License.
apiVersion: "v1"
name: "voltha"
-version: "2.4.7"
+version: "2.4.8"
description: "A Helm chart for Voltha based on K8S resources in Voltha project"
keywords:
- "onf"
@@ -24,7 +24,6 @@
sources:
- "https://github.com/opencord/voltha-go"
- "https://github.com/opencord/ofagent-go"
- - "https://gerrit.opencord.org/#/admin/projects/ofagent-py"
maintainers:
- name: "Open Networking Foundation"
email: "info@opennetworking.org"
diff --git a/voltha/templates/ofagent-go-deploy.yaml b/voltha/templates/ofagent-deploy.yaml
similarity index 92%
rename from voltha/templates/ofagent-go-deploy.yaml
rename to voltha/templates/ofagent-deploy.yaml
index a32e19a..e45e957 100644
--- a/voltha/templates/ofagent-go-deploy.yaml
+++ b/voltha/templates/ofagent-deploy.yaml
@@ -11,7 +11,6 @@
# 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.
-{{- if .Values.use_ofagent_go }}
{{- $log_level := tpl .Values.ofagent.log_level . | upper }}
---
apiVersion: apps/v1beta1
@@ -63,8 +62,8 @@
{{- end }}
containers:
- name: ofagent
- image: '{{ tpl .Values.images.ofagent_go.registry . }}{{ tpl .Values.images.ofagent_go.repository . }}:{{ tpl .Values.images.ofagent_go.tag . }}'
- imagePullPolicy: {{ tpl .Values.images.ofagent_go.pullPolicy . }}
+ image: '{{ tpl .Values.images.ofagent.registry . }}{{ tpl .Values.images.ofagent.repository . }}:{{ tpl .Values.images.ofagent.tag . }}'
+ imagePullPolicy: {{ tpl .Values.images.ofagent.pullPolicy . }}
env:
- name: COMPONENT_NAME
valueFrom:
@@ -98,4 +97,3 @@
port: 8080
initialDelaySeconds: 10
periodSeconds: 5
-{{- end }}
diff --git a/voltha/templates/ofagent-go-profile-svc.yaml b/voltha/templates/ofagent-profile-svc.yaml
similarity index 92%
rename from voltha/templates/ofagent-go-profile-svc.yaml
rename to voltha/templates/ofagent-profile-svc.yaml
index 0bcbb93..6a18864 100644
--- a/voltha/templates/ofagent-go-profile-svc.yaml
+++ b/voltha/templates/ofagent-profile-svc.yaml
@@ -11,7 +11,7 @@
# 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.
-{{- if and .Values.use_ofagent_go .Values.profiler.enabled }}
+{{- if .Values.profiler.enabled }}
---
apiVersion: v1
kind: Service
diff --git a/voltha/templates/ofagent-py-deploy.yaml b/voltha/templates/ofagent-py-deploy.yaml
deleted file mode 100644
index 1372c18..0000000
--- a/voltha/templates/ofagent-py-deploy.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2019-present Open Networking Foundation
-#
-# 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.
-{{- if not .Values.use_ofagent_go }}
----
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
- name: voltha-ofagent
- {{- if or (hasKey .Values "extra_deployment_labels") (hasKey .Values "ofagent_deployment_labels") }}
- labels:
- {{- if hasKey .Values "extra_deployment_labels" }}
- {{- range $key, $val := .Values.extra_deployment_labels }}
- {{ $key }}: {{ $val | quote }}
- {{- end }}
- {{- end }}
- {{- if hasKey .Values "ofagent_deployment_labels" }}
- {{- range $key, $val := .Values.ofagent_deployment_labels }}
- {{ $key }}: {{ $val | quote }}
- {{- end }}
- {{- end }}
- {{- end }}
-spec:
- replicas: {{ .Values.replicas.ofagent }}
- template:
- metadata:
- labels:
- app: ofagent
- app.kubernetes.io/name: "open-flow-agent"
- app.kubernetes.io/version: {{ quote .Chart.AppVersion }}
- app.kubernetes.io/component: "integration"
- app.kubernetes.io/part-of: "voltha"
- app.kubernetes.io/managed-by: {{ quote .Release.Service }}
- helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
- {{- if hasKey .Values "extra_pod_labels" }}
- {{- range $key, $val := .Values.extra_pod_labels }}
- {{ $key }}: {{ $val | quote }}
- {{- end }}
- {{- end }}
- {{- if hasKey .Values "ofagent_pod_labels" }}
- {{- range $key, $val := .Values.ofagent_pod_labels }}
- {{ $key }}: {{ $val | quote }}
- {{- end }}
- {{- end }}
- spec:
- {{- if .Values.securityContext.enabled }}
- securityContext:
- runAsUser: {{ .Values.securityContext.runAsUser }}
- runAsGroup: {{ .Values.securityContext.runAsGroup }}
- fsGroup: {{ .Values.securityContext.fsGroup }}
- {{- end }}
- terminationGracePeriodSeconds: 10
- containers:
- - name: ofagent
- image: '{{ tpl .Values.images.ofagent_py.registry . }}{{ tpl .Values.images.ofagent_py.repository . }}:{{ tpl .Values.images.ofagent_py.tag . }}'
- imagePullPolicy: {{ tpl .Values.images.ofagent_py.pullPolicy . }}
- args:
- - "/ofagent/ofagent/main.py"
- - "-v"
- - "--controller"
- {{- range .Values.services.controller }}
- - "{{ .service }}:{{ .port }}"
- {{- end }}
- - "--grpc-endpoint=voltha-api.{{ .Release.Namespace }}.svc.cluster.local:55555"
- - "--probe=:8080"
- {{- if .Values.securityContext.enabled }}
- securityContext:
- allowPrivilegeEscalation: false
- {{- end }}
- livenessProbe:
- httpGet:
- path: /healthz
- port: 8080
- initialDelaySeconds: 10
- periodSeconds: 5
- readinessProbe:
- httpGet:
- path: /readz
- port: 8080
- initialDelaySeconds: 10
- periodSeconds: 5
-{{- end }}
diff --git a/voltha/values.yaml b/voltha/values.yaml
index ed99cbf..52b72a7 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -13,8 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-use_ofagent_go: true
-
# Default Values
# The following are the default values used for every container in the
# template.
@@ -75,21 +73,14 @@
ofagent:
log_level: '{{ .Values.defaults.log_level }}'
-
# Define Docker images to be used
images:
- ofagent_go:
+ ofagent:
registry: '{{ .Values.defaults.image_registry }}'
repository: '{{ .Values.defaults.image_org }}voltha-ofagent-go'
tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}1.2.0{{- end }}{{- else }}1.2.0{{- end }}'
pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
- ofagent_py:
- registry: '{{ .Values.defaults.image_registry }}'
- repository: '{{ .Values.defaults.image_org }}voltha-ofagent-py'
- tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}2.2.7{{- end }}{{- else }}2.2.7{{- end }}'
- pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
-
rw_core:
registry: '{{ .Values.defaults.image_registry }}'
repository: '{{ .Values.defaults.image_org }}voltha-rw-core'