starlingx
/
oidc-auth-armada-app
Code Issues Proposed changes

Automatically roll deployments when config is changed 

Automatically roll deployments when config is changed. Otherwise, the
new config is pushed but the behavior is not. We cannot do the exact
thing upstream did because of an armada bug. We are doing what
monitor-armada-app does when it runs into the same issue.

Closes-Bug: 1864504

Change-Id: Ib714694c93b57a28d37da595ba2efd6885bf9307
Signed-off-by: Jerry Sun <jerry.sun@windriver.com>
This commit is contained in:
Jerry Sun 2020-05-15 15:03:51 -04:00
parent 69c3fe858c
commit 663765f109
3 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dex-helm/centos/build_srpm.data
View File

@ -4,4 +4,4 @@ VERSION=1.0.0
TAR="$TAR_NAME-$SHA.tar.gz"
COPY_LIST="${CGCS_BASE}/downloads/$TAR $PKG_BASE/files/* "
TIS_PATCH_VER=0
TIS_PATCH_VER=1

2
dex-helm/centos/dex-helm.spec
View File

@ -27,6 +27,7 @@ Source3: Makefile
Patch01: 0001-Update-Dex-chart-for-Kubernetes-API-1.16.patch
Patch02: 0002-add-image-pull-secrets.patch
Patch03: 0003-Add-affinity-support.patch
Patch04: 0004-Automatically-roll-deployments.patch
BuildArch: noarch
@ -41,6 +42,7 @@ StarlingX OIDC auth Helm charts
%patch01 -p1
%patch02 -p1
%patch03 -p1
%patch04 -p1
%build
# initialize helm

33
dex-helm/files/0004-Automatically-roll-deployments.patch Normal file
View File

@ -0,0 +1,33 @@
From 7b1b709abdb995ee5a6f3c56000c01a7eec96fff Mon Sep 17 00:00:00 2001
From: Jerry Sun <jerry.sun@windriver.com>
Date: Wed, 13 May 2020 11:00:20 -0400
Subject: [PATCH 1/1] Automatically roll deployments
Automatically roll deployments when config is changed.
Otherwise, the new config is pushed but the behavior
is not. We cannot do the exact thing upstream did
because of an armada bug. We are doing what monitor
does when it runs into the same issue.
Reference upstream commit:
https://github.com/helm/charts/commit/af19146e72a1eae813e7bc6ce21b0aea9cea4341
Signed-off-by: Jerry Sun <jerry.sun@windriver.com>
---
stable/dex/templates/deployment.yaml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/stable/dex/templates/deployment.yaml b/stable/dex/templates/deployment.yaml
index 5e714e9..1df25b4 100644
--- a/stable/dex/templates/deployment.yaml
+++ b/stable/dex/templates/deployment.yaml
@@ -31,6 +31,8 @@ spec:
labels:
app: {{ template "dex.name" . }}
release: "{{ .Release.Name }}"
+ annotations:
+ configchecksum: {{ toYaml .Values.config | sha256sum | trunc 63 }}
spec:
serviceAccountName: {{ template "dex.serviceAccountName" . }}
nodeSelector:
--
2.7.4