Merge branch 'master' into feature/pod-finalizers

Author: ewoutp

pkg/apis/deployment/v1alpha/sync_spec_test.go

@@ -32,7 +32,7 @@ import (
 
 func TestSyncSpecValidate(t *testing.T) {
 	// Valid
-	auth := AuthenticationSpec{JWTSecretName: util.NewString("foo")}
+	auth := SyncAuthenticationSpec{JWTSecretName: util.NewString("foo"), ClientCASecretName: util.NewString("foo-client")}
 	tls := TLSSpec{CASecretName: util.NewString("None")}
 	assert.Nil(t, SyncSpec{Image: util.NewString("foo"), Authentication: auth}.Validate(DeploymentModeSingle))
 	assert.Nil(t, SyncSpec{Image: util.NewString("foo"), Authentication: auth}.Validate(DeploymentModeActiveFailover))
@@ -49,7 +49,7 @@ func TestSyncSpecValidate(t *testing.T) {
 
 func TestSyncSpecSetDefaults(t *testing.T) {
 	def := func(spec SyncSpec) SyncSpec {
-		spec.SetDefaults("test-image", v1.PullAlways, "test-jwt", "test-ca")
+		spec.SetDefaults("test-image", v1.PullAlways, "test-jwt", "test-client-auth-ca", "test-tls-ca")
 		return spec
 	}
 
@@ -61,7 +61,7 @@ func TestSyncSpecSetDefaults(t *testing.T) {
 	assert.Equal(t, v1.PullAlways, def(SyncSpec{}).GetImagePullPolicy())
 	assert.Equal(t, v1.PullNever, def(SyncSpec{ImagePullPolicy: util.NewPullPolicy(v1.PullNever)}).GetImagePullPolicy())
 	assert.Equal(t, "test-jwt", def(SyncSpec{}).Authentication.GetJWTSecretName())
-	assert.Equal(t, "foo", def(SyncSpec{Authentication: AuthenticationSpec{JWTSecretName: util.NewString("foo")}}).Authentication.GetJWTSecretName())
+	assert.Equal(t, "foo", def(SyncSpec{Authentication: SyncAuthenticationSpec{JWTSecretName: util.NewString("foo")}}).Authentication.GetJWTSecretName())
 }
 
 func TestSyncSpecResetImmutableFields(t *testing.T) {
@@ -97,37 +97,23 @@ func TestSyncSpecResetImmutableFields(t *testing.T) {
 			nil,
 		},
 		{
-			SyncSpec{Authentication: AuthenticationSpec{JWTSecretName: util.NewString("None")}},
-			SyncSpec{Authentication: AuthenticationSpec{JWTSecretName: util.NewString("None")}},
-			SyncSpec{Authentication: AuthenticationSpec{JWTSecretName: util.NewString("None")}},
+			SyncSpec{Authentication: SyncAuthenticationSpec{JWTSecretName: util.NewString("None"), ClientCASecretName: util.NewString("some")}},
+			SyncSpec{Authentication: SyncAuthenticationSpec{JWTSecretName: util.NewString("None"), ClientCASecretName: util.NewString("some")}},
+			SyncSpec{Authentication: SyncAuthenticationSpec{JWTSecretName: util.NewString("None"), ClientCASecretName: util.NewString("some")}},
 			nil,
 		},
 		{
-			SyncSpec{Authentication: AuthenticationSpec{JWTSecretName: util.NewString("foo")}},
-			SyncSpec{Authentication: AuthenticationSpec{JWTSecretName: util.NewString("foo")}},
-			SyncSpec{Authentication: AuthenticationSpec{JWTSecretName: util.NewString("foo")}},
+			SyncSpec{Authentication: SyncAuthenticationSpec{JWTSecretName: util.NewString("foo"), ClientCASecretName: util.NewString("some")}},
+			SyncSpec{Authentication: SyncAuthenticationSpec{JWTSecretName: util.NewString("foo"), ClientCASecretName: util.NewString("some")}},
+			SyncSpec{Authentication: SyncAuthenticationSpec{JWTSecretName: util.NewString("foo"), ClientCASecretName: util.NewString("some")}},
 			nil,
 		},
 		{
-			SyncSpec{Authentication: AuthenticationSpec{JWTSecretName: util.NewString("foo")}},
-			SyncSpec{Authentication: AuthenticationSpec{JWTSecretName: util.NewString("foo2")}},
-			SyncSpec{Authentication: AuthenticationSpec{JWTSecretName: util.NewString("foo2")}},
+			SyncSpec{Authentication: SyncAuthenticationSpec{JWTSecretName: util.NewString("foo"), ClientCASecretName: util.NewString("some")}},
+			SyncSpec{Authentication: SyncAuthenticationSpec{JWTSecretName: util.NewString("foo2"), ClientCASecretName: util.NewString("some")}},
+			SyncSpec{Authentication: SyncAuthenticationSpec{JWTSecretName: util.NewString("foo2"), ClientCASecretName: util.NewString("some")}},
 			nil,
 		},
-
-		// Invalid changes
-		{
-			SyncSpec{Authentication: AuthenticationSpec{JWTSecretName: util.NewString("foo")}},
-			SyncSpec{Authentication: AuthenticationSpec{JWTSecretName: util.NewString("None")}},
-			SyncSpec{Authentication: AuthenticationSpec{JWTSecretName: util.NewString("foo")}},
-			[]string{"test.auth.jwtSecretName"},
-		},
-		{
-			SyncSpec{Authentication: AuthenticationSpec{JWTSecretName: util.NewString("None")}},
-			SyncSpec{Authentication: AuthenticationSpec{JWTSecretName: util.NewString("foo")}},
-			SyncSpec{Authentication: AuthenticationSpec{JWTSecretName: util.NewString("None")}},
-			[]string{"test.auth.jwtSecretName"},
-		},
 	}
 
 	for _, test := range tests {

pkg/util/k8sutil/probes_test.go

@@ -34,7 +34,7 @@ func TestCreate(t *testing.T) {
 	secret := "the secret"
 
 	// http
-	config := HTTPProbeConfig{path, false, secret}
+	config := HTTPProbeConfig{path, false, secret, 0}
 	probe := config.Create()
 
 	assert.Equal(t, probe.InitialDelaySeconds, int32(30))
@@ -50,7 +50,7 @@ func TestCreate(t *testing.T) {
 	assert.Equal(t, probe.Handler.HTTPGet.Scheme, v1.URISchemeHTTP)
 
 	// https
-	config = HTTPProbeConfig{path, true, secret}
+	config = HTTPProbeConfig{path, true, secret, 0}
 	probe = config.Create()
 
 	assert.Equal(t, probe.Handler.HTTPGet.Scheme, v1.URISchemeHTTPS)