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/sadis-server/Chart.yaml b/sadis-server/Chart.yaml
index ea3f0e1..985e029 100644
--- a/sadis-server/Chart.yaml
+++ b/sadis-server/Chart.yaml
@@ -13,5 +13,4 @@
# limitations under the License.
name: sadis-server
-version: 1.0.1
-appVersion: latest
+version: 1.0.0-dev
diff --git a/sadis-server/templates/sadis-deployment.yaml b/sadis-server/templates/sadis-deployment.yaml
index 36a14f9..9e2c882 100644
--- a/sadis-server/templates/sadis-deployment.yaml
+++ b/sadis-server/templates/sadis-deployment.yaml
@@ -29,8 +29,8 @@
spec:
containers:
- name: sadis-server
- image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
- imagePullPolicy: {{ .Values.image.pullPolicy }}
+ image: {{ .Values.image }}
+ imagePullPolicy: {{ .Values.imagePullPolicy }}
ports:
- containerPort: 8000
port: 8000
diff --git a/sadis-server/values.yaml b/sadis-server/values.yaml
index 7c3cea9..f65a8bc 100644
--- a/sadis-server/values.yaml
+++ b/sadis-server/values.yaml
@@ -12,14 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
-image:
- repository: 'opencord/sadis-server'
- tag: '{{ .Chart.AppVersion }}'
- pullPolicy: 'Always'
-
-global:
- registry: ''
+image: "opencord/sadis-server:latest"
+imagePullPolicy: Always
xosAdminUser: "admin@opencord.org"
-xosAdminPassword: "letmein"
+xosAdminPassword: "letmein"
\ No newline at end of file