Merge branch 'master' of https://github.com/arangodb/k8s-operator into feature/test-individual-pod-deletion

Author: kvahed

pkg/apis/deployment/v1alpha/tls_spec.go

@@ -71,11 +71,13 @@ func (s TLSSpec) GetAltNames() (dnsNames, ipAddresses, emailAddresses []string,
 
 // Validate the given spec
 func (s TLSSpec) Validate() error {
-	if err := k8sutil.ValidateOptionalResourceName(s.CASecretName); err != nil {
-		return maskAny(err)
-	}
-	if _, _, _, err := s.GetAltNames(); err != nil {
-		return maskAny(err)
+	if s.IsSecure() {
+		if err := k8sutil.ValidateOptionalResourceName(s.CASecretName); err != nil {
+			return maskAny(err)
+		}
+		if _, _, _, err := s.GetAltNames(); err != nil {
+			return maskAny(err)
+		}
 	}
 	return nil
 }

pkg/apis/deployment/v1alpha/tls_spec_test.go

@@ -33,6 +33,7 @@ func TestTLSSpecValidate(t *testing.T) {
 	// Valid
 	assert.Nil(t, TLSSpec{CASecretName: ""}.Validate())
 	assert.Nil(t, TLSSpec{CASecretName: "foo"}.Validate())
+	assert.Nil(t, TLSSpec{CASecretName: "None"}.Validate())
 	assert.Nil(t, TLSSpec{AltNames: []string{}}.Validate())
 	assert.Nil(t, TLSSpec{AltNames: []string{"foo"}}.Validate())
 	assert.Nil(t, TLSSpec{AltNames: []string{"email@example.com", "127.0.0.1"}}.Validate())

tests/scale_test.go

@@ -83,14 +83,14 @@ func TestScaleClusterNonTLS(t *testing.T) {
 	removeDeployment(c, depl.GetName(), ns)
 }
 
-func TestScaleClusterTLS(t *testing.T) {
+func TestScaleCluster(t *testing.T) {
 	longOrSkip(t)
 	c := client.MustNewInCluster()
 	kubecli := mustNewKubeClient(t)
 	ns := getNamespace(t)
 
 	// Prepare deployment config
-	depl := newDeployment("test-scale-tls" + uniuri.NewLen(4))
+	depl := newDeployment("test-scale" + uniuri.NewLen(4))
 	depl.Spec.Mode = api.DeploymentModeCluster
 	depl.Spec.TLS = api.TLSSpec{}         // should auto-generate cert
 	depl.Spec.SetDefaults(depl.GetName()) // this must be last