VOL-3183 - chart best practice updates
- separated each resource into its own template
- added security context for runas
- added namespace to metadata
- added release name as part of selector
Change-Id: I2a63d099f6bbc4b0615addceccfbd04cff09ef4f
diff --git a/voltha-adapter-openolt/Chart.yaml b/voltha-adapter-openolt/Chart.yaml
index c44c179..f338094 100644
--- a/voltha-adapter-openolt/Chart.yaml
+++ b/voltha-adapter-openolt/Chart.yaml
@@ -1,4 +1,3 @@
----
# Copyright 2019-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +11,26 @@
# 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"
+name: "voltha-adapter-openolt"
+version: 2.4.4
+description: "A Helm chart for Voltha OpenOLT Adapter"
+keywords:
+ - "onf"
+ - "voltha"
+ - "adapter"
+ - "olt"
+ - "open"
+home: "https://www.opennetworking.org/voltha"
+icon: "https://guide.opencord.org/logos/voltha.svg"
+sources:
+ - "https://github.com/opencord/voltha-openolt-adapter"
+maintainers:
+ - name: "Open Networking Foundation"
+ email: "info@opennetworking.org"
+ url: "https://www.opennetworking.org"
-name: voltha-adapter-openolt
-description: A Helm chart for Voltha OpenOLT Adapter
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 2.4.3
+# appVersion refers to multiple components with potentially different
+# container image versions.
appVersion: 2.4.1
diff --git a/voltha-adapter-openolt/templates/adapters-openolt.yaml b/voltha-adapter-openolt/templates/openolt-deploy.yaml
similarity index 90%
rename from voltha-adapter-openolt/templates/adapters-openolt.yaml
rename to voltha-adapter-openolt/templates/openolt-deploy.yaml
index aa3d6b8..9173980 100644
--- a/voltha-adapter-openolt/templates/adapters-openolt.yaml
+++ b/voltha-adapter-openolt/templates/openolt-deploy.yaml
@@ -12,24 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- $log_level := tpl .Values.adapter_open_olt.log_level . | upper }}
-
-{{- if .Values.profiler.enabled }}
-apiVersion: v1
-kind: Service
-metadata:
- name: adapter-open-olt-profiler
- serviceAccountName: {{ .Values.serviceaccount }}
-spec:
- serviceAccountName: {{ .Values.serviceaccount }}
- clusterIP: None
- ports:
- - name: profiler
- port: 6060
- targetPort: 6060
- selector:
- app: adapter-open-olt
---
-{{- end }}
apiVersion: apps/v1
kind: Deployment
metadata:
@@ -52,10 +35,13 @@
selector:
matchLabels:
app: adapter-open-olt
+ release: {{ .Release.Name }}
template:
metadata:
+ namespace: {{ .Release.Namespace }}
labels:
app: adapter-open-olt
+ release: {{ .Release.Name }}
app.kubernetes.io/name: "adapter-open-olt"
app.kubernetes.io/version: {{ quote .Chart.AppVersion }}
app.kubernetes.io/component: "adapter"
@@ -72,14 +58,18 @@
{{ $key }}: {{ $val | quote }}
{{- end }}
{{- end }}
- annotations:
- cni: "calico"
spec:
+ {{- if .Values.securityContext.enabled }}
+ securityContext:
+ runAsUser: {{ .Values.securityContext.runAsUser }}
+ runAsGroup: {{ .Values.securityContext.runAsGroup }}
+ fsGroup: {{ .Values.securityContext.fsGroup }}
+ {{- end }}
containers:
- name: adapter-open-olt
image: '{{ tpl .Values.images.adapter_open_olt.registry . }}{{ tpl .Values.images.adapter_open_olt.repository . }}:{{ tpl ( tpl .Values.images.adapter_open_olt.tag . ) . }}'
imagePullPolicy: {{ tpl .Values.images.adapter_open_olt.pullPolicy . }}
- env:
+ env:
- name: COMPONENT_NAME
valueFrom:
fieldRef:
diff --git a/voltha-adapter-openolt/templates/openolt-profile-svc.yaml b/voltha-adapter-openolt/templates/openolt-profile-svc.yaml
new file mode 100644
index 0000000..f04e9fb
--- /dev/null
+++ b/voltha-adapter-openolt/templates/openolt-profile-svc.yaml
@@ -0,0 +1,31 @@
+# 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 .Values.profiler.enabled }}
+{{- $log_level := tpl .Values.adapter_open_olt.log_level . | upper }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: adapter-open-olt-profiler
+ namespace: {{ .Release.Namespace }}
+spec:
+ clusterIP: None
+ ports:
+ - name: profiler
+ port: 6060
+ targetPort: 6060
+ selector:
+ app: adapter-open-olt
+ release: {{ .Release.Name }}
+{{- end }}
diff --git a/voltha-adapter-openolt/values.yaml b/voltha-adapter-openolt/values.yaml
index 4090902..3f609f1 100644
--- a/voltha-adapter-openolt/values.yaml
+++ b/voltha-adapter-openolt/values.yaml
@@ -1,4 +1,3 @@
----
# Copyright 2019-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,6 +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.
+---
# Default overrides
defaults:
@@ -23,25 +23,32 @@
topics:
core_topic: "rwcore"
adapter_open_olt_topic: "openolt"
-
+
# Define prefix path for etcd
- # If you're running multiple voltha stacks the this value
+ # If you're running multiple voltha stacks the this value
# should be unique across the stacks.
kv_store_data_prefix: "service/voltha"
+# Default security context under which the containers run
+securityContext:
+ enabled: true
+ fsGroup: 1001
+ runAsUser: 1001
+ runAsGroup: 1001
+
# Define connectivity to required services
services:
kafka:
adapter:
- service: voltha-kafka.voltha.svc.cluster.local
+ service: kafka
port: 9092
cluster:
- service: voltha-kafka.voltha.svc.cluster.local
+ service: kafka
port: 9092
# Define connectivity to etcd
etcd:
- service: voltha-etcd-cluster-client.voltha.svc.cluster.local
+ service: etcd
port: 2379
# Expose the golang pprof webserver, if enabled