From 683d575e0a6e61be65b6991b53a3294500917070 Mon Sep 17 00:00:00 2001
From: Keny Villela <keny@interlegis.leg.br>
Date: Wed, 26 Apr 2023 14:08:24 -0300
Subject: [PATCH] rc tests

---
 charts/sigi/v0.2.3/templates/deployment.yaml         | 4 ++--
 charts/sigi/v0.2.3/templates/sigi-ldap-secret.yaml   | 6 +++++-
 charts/sigi/v0.2.3/templates/sigi-saberes-token.yaml | 2 +-
 charts/sigi/v0.2.x/Chart.yaml                        | 2 +-
 charts/sigi/v0.2.x/templates/deployment.yaml         | 4 ++--
 charts/sigi/v0.2.x/templates/sigi-ldap-secret.yaml   | 2 +-
 charts/sigi/v0.2.x/templates/sigi-saberes-token.yaml | 2 +-
 7 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/charts/sigi/v0.2.3/templates/deployment.yaml b/charts/sigi/v0.2.3/templates/deployment.yaml
index cedb5a5..de8b129 100644
--- a/charts/sigi/v0.2.3/templates/deployment.yaml
+++ b/charts/sigi/v0.2.3/templates/deployment.yaml
@@ -63,7 +63,7 @@ spec:
               valueFrom:
                 # Secret Key
                 secretKeyRef:
-                  name: {{ include "sigi.fullname" . }}-auth-ldap-key
+                  name: {{ include "sigi.name" . }}-auth-ldap-key
                   key: AUTH_LDAP_BIND_PASSWORD
             - name: AUTH_LDAP_USER_SEARCH_STRING
               value: "{{ .Values.sigi.auth.ldap.userSearchString }}"
@@ -93,7 +93,7 @@ spec:
               valueFrom: 
                 # Secret Key
                 secretKeyRef: 
-                  name: {{ include "sigi.fullname" . }}-saberes-tkn
+                  name: {{ include "sigi.name" . }}-saberes-tkn
                   key: MOODLE_API_TOKEN
           volumeMounts:
 #            - mountPath: /var/interlegis/sigi/data
diff --git a/charts/sigi/v0.2.3/templates/sigi-ldap-secret.yaml b/charts/sigi/v0.2.3/templates/sigi-ldap-secret.yaml
index f7fb30f..d45c979 100644
--- a/charts/sigi/v0.2.3/templates/sigi-ldap-secret.yaml
+++ b/charts/sigi/v0.2.3/templates/sigi-ldap-secret.yaml
@@ -1,9 +1,13 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "sigi.fullname" . }}-auth-ldap-key
+  name: {{ include "sigi.name" . }}-auth-ldap-key
   labels:
     {{- include "sigi.labels" . | nindent 4 }}
 type: Opaque
 data:
+{{- if .Release.IsUpgrade }}
+  AUTH_LDAP_BIND_PASSWORD:  {{ index (lookup "v1" "Secret" .Release.Namespace (printf "%s-auth-ldap-key" (include "sigi.name" .))).data "AUTH_LDAP_BIND_PASSWORD" }}
+{{ else }} # install operation
   AUTH_LDAP_BIND_PASSWORD: {{ .Values.sigi.auth.ldap.bindPwd  | b64enc }}
+{{ end }}
diff --git a/charts/sigi/v0.2.3/templates/sigi-saberes-token.yaml b/charts/sigi/v0.2.3/templates/sigi-saberes-token.yaml
index 009d224..f616438 100644
--- a/charts/sigi/v0.2.3/templates/sigi-saberes-token.yaml
+++ b/charts/sigi/v0.2.3/templates/sigi-saberes-token.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "sigi.fullname" . }}-saberes-tkn
+  name: {{ include "sigi.name" . }}-saberes-tkn
   labels:
     {{- include "sigi.labels" . | nindent 4 }}
 type: Opaque
diff --git a/charts/sigi/v0.2.x/Chart.yaml b/charts/sigi/v0.2.x/Chart.yaml
index b5b2fab..be08b1e 100755
--- a/charts/sigi/v0.2.x/Chart.yaml
+++ b/charts/sigi/v0.2.x/Chart.yaml
@@ -8,7 +8,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.98
+version: 0.2.5-t
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/sigi/v0.2.x/templates/deployment.yaml b/charts/sigi/v0.2.x/templates/deployment.yaml
index cedb5a5..de8b129 100755
--- a/charts/sigi/v0.2.x/templates/deployment.yaml
+++ b/charts/sigi/v0.2.x/templates/deployment.yaml
@@ -63,7 +63,7 @@ spec:
               valueFrom:
                 # Secret Key
                 secretKeyRef:
-                  name: {{ include "sigi.fullname" . }}-auth-ldap-key
+                  name: {{ include "sigi.name" . }}-auth-ldap-key
                   key: AUTH_LDAP_BIND_PASSWORD
             - name: AUTH_LDAP_USER_SEARCH_STRING
               value: "{{ .Values.sigi.auth.ldap.userSearchString }}"
@@ -93,7 +93,7 @@ spec:
               valueFrom: 
                 # Secret Key
                 secretKeyRef: 
-                  name: {{ include "sigi.fullname" . }}-saberes-tkn
+                  name: {{ include "sigi.name" . }}-saberes-tkn
                   key: MOODLE_API_TOKEN
           volumeMounts:
 #            - mountPath: /var/interlegis/sigi/data
diff --git a/charts/sigi/v0.2.x/templates/sigi-ldap-secret.yaml b/charts/sigi/v0.2.x/templates/sigi-ldap-secret.yaml
index 2f88242..4865424 100644
--- a/charts/sigi/v0.2.x/templates/sigi-ldap-secret.yaml
+++ b/charts/sigi/v0.2.x/templates/sigi-ldap-secret.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "sigi.fullname" . }}-auth-ldap-key
+  name: {{ include "sigi.name" . }}-auth-ldap-key
   labels:
     {{- include "sigi.labels" . | nindent 4 }}
 type: Opaque
diff --git a/charts/sigi/v0.2.x/templates/sigi-saberes-token.yaml b/charts/sigi/v0.2.x/templates/sigi-saberes-token.yaml
index 009d224..f616438 100644
--- a/charts/sigi/v0.2.x/templates/sigi-saberes-token.yaml
+++ b/charts/sigi/v0.2.x/templates/sigi-saberes-token.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "sigi.fullname" . }}-saberes-tkn
+  name: {{ include "sigi.name" . }}-saberes-tkn
   labels:
     {{- include "sigi.labels" . | nindent 4 }}
 type: Opaque