Skip to content
This repository was archived by the owner on Dec 16, 2020. It is now read-only.

Commit 562f713

Browse files
committed
Don't explicitly use default namespace
1 parent 95c5062 commit 562f713

3 files changed

+7
-7
lines changed

test/k8s_namespace_with_service_account_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -135,15 +135,15 @@ func TestK8SNamespaceWithServiceAccount(t *testing.T) {
135135
// validateNamespace verifies that the namespace was created and is active.
136136
func validateNamespace(t *testing.T, k8sNamespaceTerratestOptions *terraform.Options) {
137137
namespace := terraform.Output(t, k8sNamespaceTerratestOptions, "name")
138-
kubectlOptions := k8s.NewKubectlOptions("", "", "default")
138+
kubectlOptions := k8s.NewKubectlOptions("", "", "")
139139
k8sNamespace := k8s.GetNamespace(t, kubectlOptions, namespace)
140140
assert.Equal(t, k8sNamespace.Name, namespace)
141141
assert.Equal(t, k8sNamespace.Status.Phase, corev1.NamespaceActive)
142142
}
143143

144144
// validateRbacAccessAll verifies that the access all RBAC role has read and write privileges to the namespace
145145
func validateRbacAccessAll(t *testing.T, k8sNamespaceTerratestOptions *terraform.Options) {
146-
kubectlOptions := k8s.NewKubectlOptions("", "", "default")
146+
kubectlOptions := k8s.NewKubectlOptions("", "", "")
147147
namespace := terraform.Output(t, k8sNamespaceTerratestOptions, "name")
148148
serviceAccountName := terraform.Output(t, k8sNamespaceTerratestOptions, "service_account_access_all")
149149
templateArgs := TemplateArgs{
@@ -175,7 +175,7 @@ func validateRbacAccessAll(t *testing.T, k8sNamespaceTerratestOptions *terraform
175175

176176
// validateRbacAccessReadOnly verifies that the access read only RBAC role has read only privileges to the namespace
177177
func validateRbacAccessReadOnly(t *testing.T, k8sNamespaceTerratestOptions *terraform.Options) {
178-
kubectlOptions := k8s.NewKubectlOptions("", "", "default")
178+
kubectlOptions := k8s.NewKubectlOptions("", "", "")
179179
namespace := terraform.Output(t, k8sNamespaceTerratestOptions, "name")
180180
serviceAccountName := terraform.Output(t, k8sNamespaceTerratestOptions, "service_account_access_read_only")
181181
templateArgs := TemplateArgs{

test/k8s_tiller_kubergrunt_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func TestK8STillerKubergrunt(t *testing.T) {
4848
testServiceAccountName := fmt.Sprintf("%s-test-account", strings.ToLower(uniqueID))
4949
testServiceAccountNamespace := fmt.Sprintf("%s-test-account-namespace", strings.ToLower(uniqueID))
5050
tmpConfigPath := k8s.CopyHomeKubeConfigToTemp(t)
51-
kubectlOptions := k8s.NewKubectlOptions("", tmpConfigPath, "default")
51+
kubectlOptions := k8s.NewKubectlOptions("", tmpConfigPath, "")
5252

5353
k8s.CreateNamespace(t, kubectlOptions, testServiceAccountNamespace)
5454
kubectlOptions.Namespace = testServiceAccountNamespace
@@ -84,7 +84,7 @@ func TestK8STillerKubergrunt(t *testing.T) {
8484
terraform.Destroy(t, k8sTillerTerratestOptions)
8585

8686
testServiceAccountNamespace := test_structure.LoadString(t, workingDir, "testServiceAccountNamespace")
87-
kubectlOptions := k8s.NewKubectlOptions("", "", "default")
87+
kubectlOptions := k8s.NewKubectlOptions("", "", "")
8888
k8s.DeleteNamespace(t, kubectlOptions, testServiceAccountNamespace)
8989
})
9090

@@ -115,7 +115,7 @@ func TestK8STillerKubergrunt(t *testing.T) {
115115
// Make sure the upgrade command mentioned in the docs actually works
116116
helmHome := test_structure.LoadString(t, workingDir, "helmHome")
117117
tmpConfigPath := test_structure.LoadString(t, workingDir, "tmpKubectlConfigPath")
118-
kubectlOptions := k8s.NewKubectlOptions("", tmpConfigPath, "default")
118+
kubectlOptions := k8s.NewKubectlOptions("", tmpConfigPath, "")
119119

120120
runHelm(
121121
t,

test/k8s_tiller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func TestK8STiller(t *testing.T) {
115115

116116
test_structure.RunTestStage(t, "setup_helm_client", func() {
117117
helmHome := test_structure.LoadString(t, workingDir, "helmHome")
118-
kubectlOptions := k8s.NewKubectlOptions("", "", "default")
118+
kubectlOptions := k8s.NewKubectlOptions("", "", "")
119119
k8sTillerTerratestOptions := test_structure.LoadTerraformOptions(t, workingDir)
120120
tillerNamespace := terraform.OutputRequired(t, k8sTillerTerratestOptions, "tiller_namespace")
121121
resourceNamespace := terraform.OutputRequired(t, k8sTillerTerratestOptions, "resource_namespace")

0 commit comments

Comments
 (0)