From 8b371a222a7923b473b735016d2771756d1bef09 Mon Sep 17 00:00:00 2001 From: Robbie Blaine Date: Fri, 8 Jun 2018 14:29:09 +0200 Subject: [PATCH 1/2] #313: Custom Service Account --- pkg/apis/vault/v1alpha1/types.go | 3 +++ pkg/util/k8sutil/vault.go | 1 + 2 files changed, 4 insertions(+) diff --git a/pkg/apis/vault/v1alpha1/types.go b/pkg/apis/vault/v1alpha1/types.go index 87128b7..2b817a1 100644 --- a/pkg/apis/vault/v1alpha1/types.go +++ b/pkg/apis/vault/v1alpha1/types.go @@ -73,6 +73,9 @@ type VaultServiceSpec struct { // TLS policy of vault nodes TLS *TLSPolicy `json:"TLS,omitempty"` + + // service account + ServiceAccountName string `json:"serviceAccountName,omitempty"` } // PodPolicy defines the policy for pods owned by vault operator. diff --git a/pkg/util/k8sutil/vault.go b/pkg/util/k8sutil/vault.go index 44c6cb8..bbd17ae 100644 --- a/pkg/util/k8sutil/vault.go +++ b/pkg/util/k8sutil/vault.go @@ -242,6 +242,7 @@ func DeployVault(kubecli kubernetes.Interface, v *api.VaultService) error { Labels: selector, }, Spec: v1.PodSpec{ + ServiceAccountName: v.Spec.ServiceAccountName, Containers: []v1.Container{vaultContainer(v), statsdExporterContainer()}, Volumes: []v1.Volume{{ Name: vaultConfigVolName, From 8485998ec41d7e2f9ffffed3795d0475b3a6f116 Mon Sep 17 00:00:00 2001 From: Robbie Blaine Date: Fri, 8 Jun 2018 14:34:23 +0200 Subject: [PATCH 2/2] #313: Custom Service Account default value --- pkg/apis/vault/v1alpha1/types.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/apis/vault/v1alpha1/types.go b/pkg/apis/vault/v1alpha1/types.go index 2b817a1..1ab0a83 100644 --- a/pkg/apis/vault/v1alpha1/types.go +++ b/pkg/apis/vault/v1alpha1/types.go @@ -74,7 +74,8 @@ type VaultServiceSpec struct { // TLS policy of vault nodes TLS *TLSPolicy `json:"TLS,omitempty"` - // service account + // Service Account + // Default: default ServiceAccountName string `json:"serviceAccountName,omitempty"` } @@ -107,6 +108,10 @@ func (v *VaultService) SetDefaults() bool { }} changed = true } + if len(vs.ServiceAccountName) == 0{ + vs.ServiceAccountName = "default" + changed = true + } return changed }