fix: refactor service_account logic (#430)

getoutreach · Feb 8, 2024 · 9b06c43 · 9b06c43
1 parent 0b35b68
commit 9b06c43
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 2 deletions.
diff --git a/...tJsonnet-deployments-appname-app.jsonnet.tpl-deployments-testing-testing.jsonnet.snapshot b/...tJsonnet-deployments-appname-app.jsonnet.tpl-deployments-testing-testing.jsonnet.snapshot
@@ -155,6 +155,7 @@ local all = {
 					},
 				},
 				spec+: {
+					serviceAccountName: $.svc_acct.metadata.name,
 					priorityClassName: 'high-priority',
 					containers_:: {
 						default: ok.Container(app.name) {

diff --git a/...tWithHPA-deployments-appname-app.jsonnet.tpl-deployments-testing-testing.jsonnet.snapshot b/...tWithHPA-deployments-appname-app.jsonnet.tpl-deployments-testing-testing.jsonnet.snapshot
@@ -154,6 +154,7 @@ local all = {
 					},
 				},
 				spec+: {
+					serviceAccountName: $.svc_acct.metadata.name,
 					priorityClassName: 'high-priority',
 					containers_:: {
 						default: ok.Container(app.name) {

diff --git a/...t_Canary-deployments-appname-app.jsonnet.tpl-deployments-testing-testing.jsonnet.snapshot b/...t_Canary-deployments-appname-app.jsonnet.tpl-deployments-testing-testing.jsonnet.snapshot
@@ -193,6 +193,7 @@ local all = {
 					},
 				},
 				spec+: {
+					serviceAccountName: $.svc_acct.metadata.name,
 					priorityClassName: 'high-priority',
 					containers_:: {
 						default: ok.Container(app.name) {

diff --git a/...tivities-deployments-appname-app.jsonnet.tpl-deployments-testing-testing.jsonnet.snapshot b/...tivities-deployments-appname-app.jsonnet.tpl-deployments-testing-testing.jsonnet.snapshot
@@ -162,6 +162,7 @@ local all = {
 					},
 				},
 				spec+: {
+					serviceAccountName: $.svc_acct.metadata.name,
 					priorityClassName: 'high-priority',
 					containers_:: {
 						default: ok.Container(app.name) {

diff --git a/...IAMFalse-deployments-appname-app.jsonnet.tpl-deployments-testing-testing.jsonnet.snapshot b/...IAMFalse-deployments-appname-app.jsonnet.tpl-deployments-testing-testing.jsonnet.snapshot
@@ -26,7 +26,7 @@ local all = {
 			labels+: sharedLabels,
 		},
 	},
-	svc_acct: ok.ServiceAccount('%s-svc' % app.name, app.namespace) {
+	svc_acct+: ok.ServiceAccount('%s-svc' % app.name, app.namespace) {
 		metadata+: {
 			labels+: sharedLabels,
 			annotations+: {
@@ -161,6 +161,7 @@ local all = {
 					},
 				},
 				spec+: {
+					serviceAccountName: $.svc_acct.metadata.name,
 					priorityClassName: 'high-priority',
 					containers_:: {
 						default: ok.Container(app.name) {

diff --git a/templates/deployments/appname/app.jsonnet.tpl b/templates/deployments/appname/app.jsonnet.tpl
@@ -70,7 +70,7 @@ local all = {
 		},
 	},
 	{{- if not (stencil.Arg "aws.useKIAM") }}
-	svc_acct: ok.ServiceAccount('%s-svc' % app.name, app.namespace) {
+	svc_acct+: ok.ServiceAccount('%s-svc' % app.name, app.namespace) {
 		metadata+: {
 			labels+: sharedLabels,
 			annotations+: {
@@ -269,6 +269,7 @@ local all = {
 					},
 				},
 				spec+: {
+					serviceAccountName: $.svc_acct.metadata.name,
 					priorityClassName: 'high-priority',
 					containers_:: {
 						default: ok.Container(app.name) {