Delete operator 1

cmd/authentication-operator/main.go

@@ -13,7 +13,6 @@ import (
 	utilflag "k8s.io/apiserver/pkg/util/flag"
 	"k8s.io/apiserver/pkg/util/logs"
 
-	"github.com/openshift/cluster-authentication-operator/pkg/cmd/operator"
 	"github.com/openshift/cluster-authentication-operator/pkg/cmd/operator2"
 )
 
@@ -43,7 +42,6 @@ func NewAuthenticationOperatorCommand() *cobra.Command {
 		},
 	}
 
-	cmd.AddCommand(operator.NewOperator())
 	cmd.AddCommand(operator2.NewOperator())
 
 	return cmd

manifests/cluster-authentication-operator_05_deploy.yaml

@@ -1,45 +1,5 @@
 apiVersion: apps/v1
 kind: Deployment
-metadata:
-  namespace: openshift-authentication-operator
-  name: origin-cluster-authentication-operator1
-  labels:
-    app: origin-cluster-osin-operator
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: origin-cluster-osin-operator
-  template:
-    metadata:
-      name: origin-cluster-osin-operator
-      labels:
-        app: origin-cluster-osin-operator
-    spec:
-      serviceAccountName: openshift-authentication-operator
-      containers:
-      - name: operator
-        image: quay.io/openshift/origin-cluster-authentication-operator:v4.0
-        imagePullPolicy: IfNotPresent
-        command: ["authentication-operator", "operator1"]
-        args:
-        - "--config=/var/run/configmaps/config/operator-config.yaml"
-        - "-v=4"
-        volumeMounts:
-        - mountPath: /var/run/configmaps/config
-          name: config
-      volumes:
-      - name: config
-        configMap:
-          defaultMode: 440
-          name: openshift-authentication-operator-config
-      nodeSelector:
-        node-role.kubernetes.io/master: ""
-      tolerations:
-      - operator: Exists
----
-apiVersion: apps/v1
-kind: Deployment
 metadata:
   namespace: openshift-authentication-operator
   name: openshift-authentication-operator

pkg/operator2/starter.go

@@ -28,14 +28,13 @@ import (
 const (
 	resync = 20 * time.Minute
 
-	// TODO unpause when ready
 	defaultOperatorConfig = `
 apiVersion: operator.openshift.io/v1
 kind: Authentication
 metadata:
   name: ` + globalConfigName + `
 spec:
-  managementState: Paused
+  managementState: Managed
 `
 
 	// TODO figure out the permanent home for top level CRDs and default CRs