[Bugfix] Accept Initial Spec (#1125)

Author: ajanikow

CHANGELOG.md

@@ -4,6 +4,7 @@
 - (Feature) Define Actions PlaceHolder
 - (Feature) Add Member Update helpers
 - (Feature) Active Member condition
+- (Bugfix) Accept Initial Spec
 
 ## [1.2.17](https://github.com/arangodb/kube-arangodb/tree/1.2.17) (2022-09-22)
 - (Feature) Add new field to DeploymentReplicationStatus with details on DC2DC sync status=

pkg/deployment/deployment.go

@@ -445,7 +445,7 @@ func (d *Deployment) acceptNewSpec(ctx context.Context, depl *api.ArangoDeployme
 			return false, false, err
 		}
 
-		if acceptedChecksum == checksum {
+		if v := depl.Status.AcceptedSpecVersion; acceptedChecksum == checksum && (v != nil && *v == acceptedChecksum) {
 			return true, false, nil
 		}
 

pkg/deployment/deployment_spec_test.go

@@ -0,0 +1,65 @@
+//
+// DISCLAIMER
+//
+// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Copyright holder is ArangoDB GmbH, Cologne, Germany
+//
+
+package deployment
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	api "github.com/arangodb/kube-arangodb/pkg/apis/deployment/v1"
+)
+
+func Test_SpecAccept_Initial(t *testing.T) {
+	spec := api.DeploymentSpec{}
+
+	spec.SetDefaults(testDeploymentName)
+
+	depl := &api.ArangoDeployment{
+		ObjectMeta: meta.ObjectMeta{
+			Name: testDeploymentName,
+		},
+		Spec: spec,
+		Status: api.DeploymentStatus{
+			AcceptedSpec: spec.DeepCopy(),
+		},
+	}
+
+	d, _ := createTestDeployment(t, Config{}, depl)
+
+	if _, err := d.deps.Client.Arango().DatabaseV1().ArangoDeployments(testNamespace).Create(context.Background(), depl, meta.CreateOptions{}); err != nil {
+		require.NoError(t, err)
+	}
+
+	_, _, err := d.acceptNewSpec(context.Background(), depl)
+	require.NoError(t, err)
+
+	depl, err = d.deps.Client.Arango().DatabaseV1().ArangoDeployments(testNamespace).Get(context.Background(), testDeploymentName, meta.GetOptions{})
+	require.NoError(t, err)
+
+	checksum, err := spec.Checksum()
+	require.NoError(t, err)
+
+	require.NotNil(t, depl.Status.AcceptedSpecVersion)
+	require.Equal(t, checksum, *depl.Status.AcceptedSpecVersion)
+}