simplify operatorspec to match what we ended up needing

operator/v1/types.go

@@ -1,9 +1,8 @@
 package v1
 
 import (
-	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	runtime "k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime"
 )
 
 // MyOperatorResource is an example operator configuration type
@@ -59,10 +58,6 @@ type OperatorSpec struct {
 	// +optional
 	OperatorLogLevel LogLevel `json:"operatorLogLevel"`
 
-	// operandSpecs provide customization for functional units within the component
-	// +optional
-	OperandSpecs []OperandSpec `json:"operandSpecs,omitempty"`
-
 	// unsupportedConfigOverrides holds a sparse config that will override any previously set options.  It only needs to be the fields to override
 	// it will end up overlaying in the following order:
 	// 1. hardcoded defaults
@@ -96,38 +91,6 @@ var (
 	TraceAll LogLevel = "TraceAll"
 )
 
-// ResourcePatch is a way to represent the patch you would issue to `kubectl patch` in the API
-type ResourcePatch struct {
-	// type is the type of patch to apply: jsonmerge, strategicmerge
-	Type string `json:"type"`
-	// patch the patch itself
-	Patch string `json:"patch"`
-}
-
-// OperandSpec holds information for customization of a particular functional unit - logically maps to a workload
-type OperandSpec struct {
-	// name is the name of this unit.  The operator must be aware of it.
-	Name string `json:"name"`
-
-	// operandContainerSpecs are per-container options
-	// +optional
-	OperandContainerSpecs []OperandContainerSpec `json:"operandContainerSpecs,omitempty"`
-
-	// unsupportedResourcePatches are applied to the workload resource for this unit. This is an unsupported
-	// workaround if anything needs to be modified on the workload that is not otherwise configurable.
-	// TODO Decide: alternatively, we could simply include a RawExtension which is used in place of the "normal" default manifest
-	// +optional
-	UnsupportedResourcePatches []ResourcePatch `json:"unsupportedResourcePatches,omitempty"`
-}
-
-type OperandContainerSpec struct {
-	// name is the name of the container to modify
-	Name string `json:"name"`
-
-	// resources are the requests and limits to place in the container.  Nil means to accept the defaults.
-	Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
-}
-
 type OperatorStatus struct {
 	// observedGeneration is the last generation change you've dealt with
 	// +optional
@@ -200,6 +163,11 @@ const (
 type StaticPodOperatorSpec struct {
 	OperatorSpec `json:",inline"`
 
+	// forceRedeploymentReason can be used to force the redeployment of the operand by providing a unique string.
+	// This provides a mechanism to kick a previously failed deployment and provide a reason why you think it will work
+	// this time instead of failing again on the same config.
+	ForceRedeploymentReason string `json:"forceRedeploymentReason"`
+
 	// failedRevisionLimit is the number of failed static pod installer revisions to keep on disk and in the api
 	// -1 = unlimited, 0 or unset = 5 (default)
 	FailedRevisionLimit int32 `json:"failedRevisionLimit,omitempty"`

operator/v1/types_kubeapiserver.go

@@ -14,18 +14,13 @@ type KubeAPIServer struct {
 	metav1.ObjectMeta `json:"metadata"`
 
 	// +required
-	Spec   KubeAPIServerSpec   `json:"spec"`
+	Spec KubeAPIServerSpec `json:"spec"`
 	// +optional
 	Status KubeAPIServerStatus `json:"status"`
 }
 
 type KubeAPIServerSpec struct {
 	StaticPodOperatorSpec `json:",inline"`
-
-	// forceRedeploymentReason can be used to force the redeployment of the kube-apiserver by providing a unique string.
-	// This provides a mechanism to kick a previously failed deployment and provide a reason why you think it will work
-	// this time instead of failing again on the same config.
-	ForceRedeploymentReason string `json:"forceRedeploymentReason"`
 }
 
 type KubeAPIServerStatus struct {

operator/v1/types_kubecontrollermanager.go

@@ -14,18 +14,13 @@ type KubeControllerManager struct {
 	metav1.ObjectMeta `json:"metadata"`
 
 	// +required
-	Spec   KubeControllerManagerSpec   `json:"spec"`
+	Spec KubeControllerManagerSpec `json:"spec"`
 	// +optional
 	Status KubeControllerManagerStatus `json:"status"`
 }
 
 type KubeControllerManagerSpec struct {
 	StaticPodOperatorSpec `json:",inline"`
-
-	// forceRedeploymentReason can be used to force the redeployment of the kube-controller-manager by providing a unique string.
-	// This provides a mechanism to kick a previously failed deployment and provide a reason why you think it will work
-	// this time instead of failing again on the same config.
-	ForceRedeploymentReason string `json:"forceRedeploymentReason"`
 }
 
 type KubeControllerManagerStatus struct {

operator/v1/types_scheduler.go

@@ -14,18 +14,13 @@ type KubeScheduler struct {
 	metav1.ObjectMeta `json:"metadata"`
 
 	// +required
-	Spec   KubeSchedulerSpec   `json:"spec"`
+	Spec KubeSchedulerSpec `json:"spec"`
 	// +optional
 	Status KubeSchedulerStatus `json:"status"`
 }
 
 type KubeSchedulerSpec struct {
 	StaticPodOperatorSpec `json:",inline"`
-
-	// forceRedeploymentReason can be used to force the redeployment of the kube-scheduler by providing a unique string.
-	// This provides a mechanism to kick a previously failed deployment and provide a reason why you think it will work
-	// this time instead of failing again on the same config.
-	ForceRedeploymentReason string `json:"forceRedeploymentReason"`
 }
 
 type KubeSchedulerStatus struct {