fix(controller): stacks configuration handling and observability provider readonly mode

charts/controller/crds/deployments.plural.sh_infrastructurestacks.yaml

@@ -191,8 +191,6 @@ spec:
                   version:
                     description: Version the semver of the tool you wish to use
                     type: string
-                required:
-                - version
                 type: object
               cron:
                 description: Configuration for cron generation of stack runs
@@ -8685,7 +8683,6 @@ spec:
                 type: string
             required:
             - clusterRef
-            - configuration
             - git
             - repositoryRef
             - type

charts/controller/crds/deployments.plural.sh_observabilityproviders.yaml

@@ -93,8 +93,6 @@ spec:
                 - NEWRELIC
                 type: string
             required:
-            - credentials
-            - name
             - type
             type: object
           status:

charts/controller/crds/deployments.plural.sh_stackdefinitions.yaml

@@ -85,8 +85,6 @@ spec:
                   version:
                     description: Version the semver of the tool you wish to use
                     type: string
-                required:
-                - version
                 type: object
               description:
                 description: Description can be used to describe this StackDefinition.
@@ -136,8 +134,6 @@ spec:
                   - stage
                   type: object
                 type: array
-            required:
-            - configuration
             type: object
           status:
             properties:

go/controller/api/v1alpha1/infrastructurestack_types.go

@@ -89,8 +89,8 @@ type InfrastructureStackSpec struct {
 	JobSpec *JobSpec `json:"jobSpec,omitempty"`
 
 	// Configuration version/image config for the tool you're using
-	// +kubebuilder:validation:Required
-	Configuration StackConfiguration `json:"configuration"`
+	// +kubebuilder:validation:Optional
+	Configuration *StackConfiguration `json:"configuration,omitempty"`
 
 	// Configuration for cron generation of stack runs
 	// +kubebuilder:validation:Optional
@@ -143,15 +143,15 @@ type StackConfiguration struct {
 	// +kubebuilder:validation:Optional
 	Image *string `json:"image,omitempty"`
 	// Version the semver of the tool you wish to use
-	// +kubebuilder:validation:Required
-	Version string `json:"version"`
-	// Hooks to run at various stages of the stack run
 	// +kubebuilder:validation:Optional
-	Hooks []*StackHook `json:"hooks,omitempty"`
+	Version *string `json:"version,omitempty"`
 	// Tag is the docker image tag you wish to use
 	// if you're customizing the version
 	// +kubebuilder:validation:Optional
 	Tag *string `json:"tag,omitempty"`
+	// Hooks to run at various stages of the stack run
+	// +kubebuilder:validation:Optional
+	Hooks []*StackHook `json:"hooks,omitempty"`
 }
 
 type StackCron struct {

go/controller/api/v1alpha1/observabilityprovider_types.go

@@ -39,6 +39,14 @@ type ObservabilityProvider struct {
 	Status Status `json:"status,omitempty"`
 }
 
+func (in *ObservabilityProvider) ConsoleName() string {
+	if in.Spec.Name != nil && len(*in.Spec.Name) > 0 {
+		return *in.Spec.Name
+	}
+
+	return in.Name
+}
+
 func (in *ObservabilityProvider) SetCondition(condition metav1.Condition) {
 	meta.SetStatusCondition(&in.Status.Conditions, condition)
 }
@@ -54,25 +62,25 @@ func (in *ObservabilityProvider) Diff(hasher Hasher) (changed bool, sha string,
 
 func (in *ObservabilityProvider) Attributes(credentials client.ObservabilityProviderCredentialsAttributes) client.ObservabilityProviderAttributes {
 	return client.ObservabilityProviderAttributes{
-		Name:        in.Spec.Name,
+		Name:        in.ConsoleName(),
 		Type:        in.Spec.Type,
 		Credentials: credentials,
 	}
 }
 
 type ObservabilityProviderSpec struct {
 	// Name of the ObservabilityProvider in the Console API.
-	// +kubebuilder:validation:Required
-	Name string `json:"name"`
+	// +kubebuilder:validation:Optional
+	Name *string `json:"name,omitempty"`
 
 	// Type of the ObservabilityProvider.
 	// +kubebuilder:validation:Required
 	// +kubebuilder:validation:Enum=DATADOG;NEWRELIC
 	Type client.ObservabilityProviderType `json:"type"`
 
 	// Credentials to access the configured provider Type.
-	// +kubebuilder:validation:Required
-	Credentials ObservabilityProviderCredentials `json:"credentials"`
+	// +kubebuilder:validation:Optional
+	Credentials *ObservabilityProviderCredentials `json:"credentials,omitempty"`
 }
 
 type ObservabilityProviderCredentials struct {

go/controller/api/v1alpha1/stackdefinition_types.go

@@ -1,11 +1,12 @@
 package v1alpha1
 
 import (
-	console "github.com/pluralsh/console/go/client"
 	"github.com/pluralsh/polly/algorithms"
 	"github.com/samber/lo"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	console "github.com/pluralsh/console/go/client"
 )
 
 func init() {
@@ -55,12 +56,23 @@ func (in *StackDefinition) Diff(hasher Hasher) (changed bool, sha string, err er
 }
 
 func (in *StackDefinition) Attributes() console.StackDefinitionAttributes {
-	return console.StackDefinitionAttributes{
+	result := console.StackDefinitionAttributes{
 		Name:        in.StackName(),
 		Description: in.Spec.Description,
-		Configuration: &console.StackConfigurationAttributes{
+		Steps: algorithms.Map(in.Spec.Steps, func(s CustomRunStep) *console.CustomStepAttributes {
+			return &console.CustomStepAttributes{
+				Stage:           &s.Stage,
+				Cmd:             s.Cmd,
+				Args:            lo.ToSlicePtr(s.Args),
+				RequireApproval: s.RequireApproval,
+			}
+		}),
+	}
+
+	if in.Spec.Configuration != nil {
+		result.Configuration = &console.StackConfigurationAttributes{
 			Image:   in.Spec.Configuration.Image,
-			Version: &in.Spec.Configuration.Version,
+			Version: in.Spec.Configuration.Version,
 			Tag:     in.Spec.Configuration.Tag,
 			Hooks: algorithms.Map(in.Spec.Configuration.Hooks, func(h *StackHook) *console.StackHookAttributes {
 				return &console.StackHookAttributes{
@@ -69,16 +81,10 @@ func (in *StackDefinition) Attributes() console.StackDefinitionAttributes {
 					AfterStage: h.AfterStage,
 				}
 			}),
-		},
-		Steps: algorithms.Map(in.Spec.Steps, func(s CustomRunStep) *console.CustomStepAttributes {
-			return &console.CustomStepAttributes{
-				Stage:           &s.Stage,
-				Cmd:             s.Cmd,
-				Args:            lo.ToSlicePtr(s.Args),
-				RequireApproval: s.RequireApproval,
-			}
-		}),
+		}
 	}
+
+	return result
 }
 
 // StackDefinitionSpec defines the desired state of StackDefinition
@@ -99,8 +105,8 @@ type StackDefinitionSpec struct {
 
 	// Configuration allows modifying the StackDefinition environment
 	// and execution.
-	// +kubebuilder:validation:Required
-	Configuration StackConfiguration `json:"configuration"`
+	// +kubebuilder:validation:Optional
+	Configuration *StackConfiguration `json:"configuration,omitempty"`
 }
 
 type CustomRunStep struct {

go/controller/config/crd/bases/deployments.plural.sh_infrastructurestacks.yaml

@@ -191,8 +191,6 @@ spec:
                   version:
                     description: Version the semver of the tool you wish to use
                     type: string
-                required:
-                - version
                 type: object
               cron:
                 description: Configuration for cron generation of stack runs
@@ -8685,7 +8683,6 @@ spec:
                 type: string
             required:
             - clusterRef
-            - configuration
             - git
             - repositoryRef
             - type

go/controller/config/crd/bases/deployments.plural.sh_observabilityproviders.yaml

@@ -93,8 +93,6 @@ spec:
                 - NEWRELIC
                 type: string
             required:
-            - credentials
-            - name
             - type
             type: object
           status:

go/controller/config/crd/bases/deployments.plural.sh_stackdefinitions.yaml

@@ -85,8 +85,6 @@ spec:
                   version:
                     description: Version the semver of the tool you wish to use
                     type: string
-                required:
-                - version
                 type: object
               description:
                 description: Description can be used to describe this StackDefinition.
@@ -136,8 +134,6 @@ spec:
                   - stage
                   type: object
                 type: array
-            required:
-            - configuration
             type: object
           status:
             properties: