Merge pull request #61 from arangodb/tls-none

Fixed validation of tls.caSecretName=None
arangodb · Mar 22, 2018 · 19dd015 · 19dd015
2 parents cd44faa + 18197de
commit 19dd015
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/pkg/apis/deployment/v1alpha/tls_spec.go b/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
 }

diff --git a/pkg/apis/deployment/v1alpha/tls_spec_test.go b/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 protected]", "127.0.0.1"}}.Validate())