Static pod revision pruning

cmd/cluster-kube-controller-manager-operator/main.go

@@ -16,6 +16,7 @@ import (
 	"github.com/openshift/cluster-kube-controller-manager-operator/pkg/cmd/operator"
 	"github.com/openshift/cluster-kube-controller-manager-operator/pkg/cmd/render"
 	"github.com/openshift/library-go/pkg/operator/staticpod/installerpod"
+	"github.com/openshift/library-go/pkg/operator/staticpod/prune"
 )
 
 func main() {
@@ -47,6 +48,7 @@ func NewSSCSCommand() *cobra.Command {
 	cmd.AddCommand(operator.NewOperator())
 	cmd.AddCommand(render.NewRenderCommand(os.Stderr))
 	cmd.AddCommand(installerpod.NewInstaller())
+	cmd.AddCommand(prune.NewPrune())
 
 	return cmd
 }

pkg/apis/kubecontrollermanager/v1alpha1/types.go

@@ -26,7 +26,7 @@ type KubeControllerManagerOperatorConfig struct {
 }
 
 type KubeControllerManagerOperatorConfigSpec struct {
-	operatorsv1.OperatorSpec `json:",inline"`
+	operatorsv1.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

pkg/operator/operatorclient/operatorclient.go

@@ -17,13 +17,13 @@ func (c *OperatorClient) Informer() cache.SharedIndexInformer {
 	return c.Informers.Kubecontrollermanager().V1alpha1().KubeControllerManagerOperatorConfigs().Informer()
 }
 
-func (c *OperatorClient) GetStaticPodOperatorState() (*operatorv1.OperatorSpec, *operatorv1.StaticPodOperatorStatus, string, error) {
+func (c *OperatorClient) GetStaticPodOperatorState() (*operatorv1.StaticPodOperatorSpec, *operatorv1.StaticPodOperatorStatus, string, error) {
 	instance, err := c.Informers.Kubecontrollermanager().V1alpha1().KubeControllerManagerOperatorConfigs().Lister().Get("cluster")
 	if err != nil {
 		return nil, nil, "", err
 	}
 
-	return &instance.Spec.OperatorSpec, &instance.Status.StaticPodOperatorStatus, instance.ResourceVersion, nil
+	return &instance.Spec.StaticPodOperatorSpec, &instance.Status.StaticPodOperatorStatus, instance.ResourceVersion, nil
 }
 
 func (c *OperatorClient) UpdateStaticPodOperatorStatus(resourceVersion string, status *operatorv1.StaticPodOperatorStatus) (*operatorv1.StaticPodOperatorStatus, error) {

pkg/operator/starter.go

@@ -5,8 +5,6 @@ import (
 	"os"
 	"time"
 
-	"github.com/openshift/library-go/pkg/operator/staticpod/controller/revision"
-
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
@@ -26,6 +24,7 @@ import (
 	"github.com/openshift/cluster-kube-controller-manager-operator/pkg/operator/resourcesynccontroller"
 	"github.com/openshift/cluster-kube-controller-manager-operator/pkg/operator/targetconfigcontroller"
 	"github.com/openshift/cluster-kube-controller-manager-operator/pkg/operator/v311_00_assets"
+	"github.com/openshift/library-go/pkg/operator/staticpod/controller/revision"
 )
 
 func RunOperator(ctx *controllercmd.ControllerContext) error {
@@ -97,12 +96,15 @@ func RunOperator(ctx *controllercmd.ControllerContext) error {
 	staticPodControllers := staticpod.NewControllers(
 		operatorclient.TargetNamespace,
 		"openshift-kube-controller-manager",
+		"kube-controller-manager-pod",
 		[]string{"cluster-kube-controller-manager-operator", "installer"},
+		[]string{"cluster-kube-controller-manager-operator", "prune"},
 		deploymentConfigMaps,
 		deploymentSecrets,
 		operatorClient,
 		v1helpers.CachedConfigMapGetter(kubeClient, kubeInformersForNamespaces),
 		v1helpers.CachedSecretGetter(kubeClient, kubeInformersForNamespaces),
+		kubeClient.CoreV1(),
 		kubeClient,
 		dynamicClient,
 		kubeInformersForNamespaces.InformersFor(operatorclient.TargetNamespace),