MM-31627 - Support Operator Beta spec Custom Resource in Provisioner (#…

…392)
mattermost · Jan 19, 2021 · 00e2317 · 00e2317
1 parent bca3e68
commit 00e2317
Show file tree

Hide file tree

Showing 26 changed files with 812 additions and 307 deletions.
diff --git a/internal/api/installation.go b/internal/api/installation.go
@@ -175,6 +175,7 @@ func handleCreateInstallation(c *Context, w http.ResponseWriter, r *http.Request
 		APISecurityLock:            createInstallationRequest.APISecurityLock,
 		MattermostEnv:              createInstallationRequest.MattermostEnv,
 		SingleTenantDatabaseConfig: createInstallationRequest.SingleTenantDatabaseConfig.ToDBConfig(createInstallationRequest.Database),
+		CRVersion:                  model.DefaultCRVersion,
 		State:                      model.InstallationStateCreationRequested,
 	}
 

diff --git a/internal/api/installation_test.go b/internal/api/installation_test.go
@@ -415,6 +415,7 @@ func TestCreateInstallation(t *testing.T) {
 		require.Equal(t, "dns.example.com", installation.DNS)
 		require.Equal(t, model.InstallationAffinityIsolated, installation.Affinity)
 		require.Equal(t, model.InstallationStateCreationRequested, installation.State)
+		require.Equal(t, model.DefaultCRVersion, installation.CRVersion)
 		require.Empty(t, installation.LockAcquiredBy)
 		require.EqualValues(t, 0, installation.LockAcquiredAt)
 		require.NotEqual(t, 0, installation.CreateAt)
@@ -437,6 +438,7 @@ func TestCreateInstallation(t *testing.T) {
 		require.Equal(t, "dns1.example.com", installation.DNS)
 		require.Equal(t, model.InstallationAffinityIsolated, installation.Affinity)
 		require.Equal(t, model.InstallationStateCreationRequested, installation.State)
+		require.Equal(t, model.DefaultCRVersion, installation.CRVersion)
 		require.Empty(t, installation.LockAcquiredBy)
 		require.EqualValues(t, 0, installation.LockAcquiredAt)
 		require.NotEqual(t, 0, installation.CreateAt)

diff --git a/internal/mocks/model/installation_database.go b/internal/mocks/model/installation_database.go
diff --git a/internal/provisioner/kops_provisioner_cluster_installation.go b/internal/provisioner/kops_provisioner_cluster_installation.go