Revert "XOS/NEM charts, use a global registry var, split docker image name/tag/pullPolicy"
This reverts commit 1f58c2afbd680c8c618bff6f66e9982515dd1caf.
Change-Id: I0d7ef37a420168276472675b005482d6d11daabd
diff --git a/xos-services/internetemulator/Chart.yaml b/xos-services/internetemulator/Chart.yaml
index 95edca9..188d767 100644
--- a/xos-services/internetemulator/Chart.yaml
+++ b/xos-services/internetemulator/Chart.yaml
@@ -15,8 +15,4 @@
name: internetemulator
description: A Helm chart for XOS's "internetemulator" service
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 1.0.1
-appVersion: 1.0.1
-
+version: 1.0.0
diff --git a/xos-services/internetemulator/templates/_helpers.tpl b/xos-services/internetemulator/templates/_helpers.tpl
index 13a5e2c..04a008e 100644
--- a/xos-services/internetemulator/templates/_helpers.tpl
+++ b/xos-services/internetemulator/templates/_helpers.tpl
@@ -62,17 +62,11 @@
filename: /var/log/xos.log
maxBytes: 10485760
backupCount: 5
- kafka:
- class: kafkaloghandler.kafkaloghandler.KafkaLogHandler
- bootstrap_servers:
- - "cord-kafka:9092"
- topic: xos.log.internetemulator
loggers:
'multistructlog':
handlers:
- console
- file
- - kafka
level: DEBUG
proxy_ssh:
enabled: {{ .Values.global.proxySshEnabled }}
diff --git a/xos-services/internetemulator/templates/deployment.yaml b/xos-services/internetemulator/templates/deployment.yaml
index 2e57bbe..33e24ce 100644
--- a/xos-services/internetemulator/templates/deployment.yaml
+++ b/xos-services/internetemulator/templates/deployment.yaml
@@ -38,8 +38,8 @@
spec:
containers:
- name: {{ .Chart.Name }}
- image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
- imagePullPolicy: {{ .Values.image.pullPolicy }}
+ image: {{ tpl .Values.synchronizerImage . | quote }}
+ imagePullPolicy: {{ .Values.imagePullPolicy }}
resources:
{{ toYaml .Values.resources | indent 12 }}
volumeMounts:
diff --git a/xos-services/internetemulator/values.yaml b/xos-services/internetemulator/values.yaml
index 48d8ae7..4a21056 100644
--- a/xos-services/internetemulator/values.yaml
+++ b/xos-services/internetemulator/values.yaml
@@ -22,10 +22,9 @@
nameOverride: ""
fullnameOverride: ""
-image:
- repository: 'xosproject/internetemulator-synchronizer'
- tag: '{{ .Chart.AppVersion }}'
- pullPolicy: 'Always'
+imagePullPolicy: 'Always'
+
+synchronizerImage: "xosproject/internetemulator-synchronizer:{{ .Chart.Version }}"
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"
@@ -40,7 +39,6 @@
global:
proxySshEnabled: true
proxySshUser: "root"
- registry: ''
resources: {}