From ae2693d422fb169e1c63bf6e97139df8ed27219b Mon Sep 17 00:00:00 2001 From: Joe Lanford Date: Tue, 27 Jun 2023 15:45:19 -0400 Subject: [PATCH] add operator controller controllers and assets Signed-off-by: Joe Lanford --- ...amespace-openshift-operator-controller.yml | 12 ++ ...erators.operators.operatorframework.io.yml | 109 ++++++++++++++++++ ...operator-controller-controller-manager.yml | 13 +++ ...erator-controller-leader-election-role.yml | 45 ++++++++ ...rrole-operator-controller-manager-role.yml | 61 ++++++++++ ...ole-operator-controller-metrics-reader.yml | 17 +++ ...terrole-operator-controller-proxy-role.yml | 25 ++++ ...controller-leader-election-rolebinding.yml | 21 ++++ ...perator-controller-manager-rolebinding.yml | 20 ++++ ...-operator-controller-proxy-rolebinding.yml | 20 ++++ ...ler-controller-manager-metrics-service.yml | 22 ++++ ...operator-controller-controller-manager.yml | 105 +++++++++++++++++ cmd/cluster-olm-operator/main.go | 56 ++++++++- .../0000_51_olm_02_operator_clusterrole.yaml | 4 + manifests/0000_51_olm_06_deployment.yaml | 2 + 15 files changed, 529 insertions(+), 3 deletions(-) create mode 100644 assets/operator-controller/00-namespace-openshift-operator-controller.yml create mode 100644 assets/operator-controller/01-customresourcedefinition-operators.operators.operatorframework.io.yml create mode 100644 assets/operator-controller/02-serviceaccount-openshift-operator-controller-operator-controller-controller-manager.yml create mode 100644 assets/operator-controller/03-role-openshift-operator-controller-operator-controller-leader-election-role.yml create mode 100644 assets/operator-controller/04-clusterrole-operator-controller-manager-role.yml create mode 100644 assets/operator-controller/05-clusterrole-operator-controller-metrics-reader.yml create mode 100644 assets/operator-controller/06-clusterrole-operator-controller-proxy-role.yml create mode 100644 assets/operator-controller/07-rolebinding-openshift-operator-controller-operator-controller-leader-election-rolebinding.yml create mode 100644 assets/operator-controller/08-clusterrolebinding-operator-controller-manager-rolebinding.yml create mode 100644 assets/operator-controller/09-clusterrolebinding-operator-controller-proxy-rolebinding.yml create mode 100644 assets/operator-controller/10-service-openshift-operator-controller-operator-controller-controller-manager-metrics-service.yml create mode 100644 assets/operator-controller/11-deployment-openshift-operator-controller-operator-controller-controller-manager.yml diff --git a/assets/operator-controller/00-namespace-openshift-operator-controller.yml b/assets/operator-controller/00-namespace-openshift-operator-controller.yml new file mode 100644 index 00000000..744ffb9c --- /dev/null +++ b/assets/operator-controller/00-namespace-openshift-operator-controller.yml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: Namespace +metadata: + labels: + app.kubernetes.io/component: manager + app.kubernetes.io/created-by: operator-controller + app.kubernetes.io/instance: system + app.kubernetes.io/managed-by: kustomize + app.kubernetes.io/name: namespace + app.kubernetes.io/part-of: operator-controller + control-plane: controller-manager + name: openshift-operator-controller diff --git a/assets/operator-controller/01-customresourcedefinition-operators.operators.operatorframework.io.yml b/assets/operator-controller/01-customresourcedefinition-operators.operators.operatorframework.io.yml new file mode 100644 index 00000000..abf73e45 --- /dev/null +++ b/assets/operator-controller/01-customresourcedefinition-operators.operators.operatorframework.io.yml @@ -0,0 +1,109 @@ +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.10.0 + creationTimestamp: null + name: operators.operators.operatorframework.io +spec: + group: operators.operatorframework.io + names: + kind: Operator + listKind: OperatorList + plural: operators + singular: operator + scope: Cluster + versions: + - name: v1alpha1 + schema: + openAPIV3Schema: + description: Operator is the Schema for the operators API + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + description: OperatorSpec defines the desired state of Operator + properties: + channel: + description: Channel constraint definition + maxLength: 48 + pattern: ^[a-z0-9]+([\.-][a-z0-9]+)*$ + type: string + packageName: + maxLength: 48 + pattern: ^[a-z0-9]+(-[a-z0-9]+)*$ + type: string + version: + description: "Version is an optional semver constraint on the package version. If not specified, the latest version available of the package will be installed. If specified, the specific version of the package will be installed so long as it is available in any of the content sources available. Examples: 1.2.3, 1.0.0-alpha, 1.0.0-rc.1 \n For more information on semver, please see https://semver.org/" + maxLength: 64 + pattern: ^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-(0|[1-9]\d*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9]\d*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*))*)?(\+([0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*))?$ + type: string + required: + - packageName + type: object + status: + description: OperatorStatus defines the observed state of Operator + properties: + conditions: + items: + description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, \n type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }" + properties: + lastTransitionTime: + description: lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. + format: date-time + type: string + message: + description: message is a human readable message indicating details about the transition. This may be an empty string. + maxLength: 32768 + type: string + observedGeneration: + description: observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance. + format: int64 + minimum: 0 + type: integer + reason: + description: reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty. + maxLength: 1024 + minLength: 1 + pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ + type: string + status: + description: status of the condition, one of True, False, Unknown. + enum: + - "True" + - "False" + - Unknown + type: string + type: + description: type of condition in CamelCase or in foo.example.com/CamelCase. --- Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) + maxLength: 316 + pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ + type: string + required: + - lastTransitionTime + - message + - reason + - status + - type + type: object + type: array + x-kubernetes-list-map-keys: + - type + x-kubernetes-list-type: map + installedBundleResource: + type: string + resolvedBundleResource: + type: string + type: object + type: object + served: true + storage: true + subresources: + status: {} diff --git a/assets/operator-controller/02-serviceaccount-openshift-operator-controller-operator-controller-controller-manager.yml b/assets/operator-controller/02-serviceaccount-openshift-operator-controller-operator-controller-controller-manager.yml new file mode 100644 index 00000000..2d483839 --- /dev/null +++ b/assets/operator-controller/02-serviceaccount-openshift-operator-controller-operator-controller-controller-manager.yml @@ -0,0 +1,13 @@ +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + labels: + app.kubernetes.io/component: rbac + app.kubernetes.io/created-by: operator-controller + app.kubernetes.io/instance: controller-manager-sa + app.kubernetes.io/managed-by: kustomize + app.kubernetes.io/name: serviceaccount + app.kubernetes.io/part-of: operator-controller + name: operator-controller-controller-manager + namespace: openshift-operator-controller diff --git a/assets/operator-controller/03-role-openshift-operator-controller-operator-controller-leader-election-role.yml b/assets/operator-controller/03-role-openshift-operator-controller-operator-controller-leader-election-role.yml new file mode 100644 index 00000000..159b080e --- /dev/null +++ b/assets/operator-controller/03-role-openshift-operator-controller-operator-controller-leader-election-role.yml @@ -0,0 +1,45 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + labels: + app.kubernetes.io/component: rbac + app.kubernetes.io/created-by: operator-controller + app.kubernetes.io/instance: leader-election-role + app.kubernetes.io/managed-by: kustomize + app.kubernetes.io/name: role + app.kubernetes.io/part-of: operator-controller + name: operator-controller-leader-election-role + namespace: openshift-operator-controller +rules: + - apiGroups: + - "" + resources: + - configmaps + verbs: + - get + - list + - watch + - create + - update + - patch + - delete + - apiGroups: + - coordination.k8s.io + resources: + - leases + verbs: + - get + - list + - watch + - create + - update + - patch + - delete + - apiGroups: + - "" + resources: + - events + verbs: + - create + - patch diff --git a/assets/operator-controller/04-clusterrole-operator-controller-manager-role.yml b/assets/operator-controller/04-clusterrole-operator-controller-manager-role.yml new file mode 100644 index 00000000..be2881d3 --- /dev/null +++ b/assets/operator-controller/04-clusterrole-operator-controller-manager-role.yml @@ -0,0 +1,61 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + creationTimestamp: null + name: operator-controller-manager-role +rules: + - apiGroups: + - catalogd.operatorframework.io + resources: + - bundlemetadata + verbs: + - list + - watch + - apiGroups: + - catalogd.operatorframework.io + resources: + - catalogs + verbs: + - list + - watch + - apiGroups: + - catalogd.operatorframework.io + resources: + - packages + verbs: + - list + - watch + - apiGroups: + - core.rukpak.io + resources: + - bundledeployments + verbs: + - create + - get + - list + - patch + - update + - watch + - apiGroups: + - operators.operatorframework.io + resources: + - operators + verbs: + - get + - list + - watch + - apiGroups: + - operators.operatorframework.io + resources: + - operators/finalizers + verbs: + - update + - apiGroups: + - operators.operatorframework.io + resources: + - operators/status + verbs: + - get + - patch + - update diff --git a/assets/operator-controller/05-clusterrole-operator-controller-metrics-reader.yml b/assets/operator-controller/05-clusterrole-operator-controller-metrics-reader.yml new file mode 100644 index 00000000..4a539bfa --- /dev/null +++ b/assets/operator-controller/05-clusterrole-operator-controller-metrics-reader.yml @@ -0,0 +1,17 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + labels: + app.kubernetes.io/component: kube-rbac-proxy + app.kubernetes.io/created-by: operator-controller + app.kubernetes.io/instance: metrics-reader + app.kubernetes.io/managed-by: kustomize + app.kubernetes.io/name: clusterrole + app.kubernetes.io/part-of: operator-controller + name: operator-controller-metrics-reader +rules: + - nonResourceURLs: + - /metrics + verbs: + - get diff --git a/assets/operator-controller/06-clusterrole-operator-controller-proxy-role.yml b/assets/operator-controller/06-clusterrole-operator-controller-proxy-role.yml new file mode 100644 index 00000000..1628a924 --- /dev/null +++ b/assets/operator-controller/06-clusterrole-operator-controller-proxy-role.yml @@ -0,0 +1,25 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + labels: + app.kubernetes.io/component: kube-rbac-proxy + app.kubernetes.io/created-by: operator-controller + app.kubernetes.io/instance: proxy-role + app.kubernetes.io/managed-by: kustomize + app.kubernetes.io/name: clusterrole + app.kubernetes.io/part-of: operator-controller + name: operator-controller-proxy-role +rules: + - apiGroups: + - authentication.k8s.io + resources: + - tokenreviews + verbs: + - create + - apiGroups: + - authorization.k8s.io + resources: + - subjectaccessreviews + verbs: + - create diff --git a/assets/operator-controller/07-rolebinding-openshift-operator-controller-operator-controller-leader-election-rolebinding.yml b/assets/operator-controller/07-rolebinding-openshift-operator-controller-operator-controller-leader-election-rolebinding.yml new file mode 100644 index 00000000..7b5ed5a2 --- /dev/null +++ b/assets/operator-controller/07-rolebinding-openshift-operator-controller-operator-controller-leader-election-rolebinding.yml @@ -0,0 +1,21 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + labels: + app.kubernetes.io/component: rbac + app.kubernetes.io/created-by: operator-controller + app.kubernetes.io/instance: leader-election-rolebinding + app.kubernetes.io/managed-by: kustomize + app.kubernetes.io/name: rolebinding + app.kubernetes.io/part-of: operator-controller + name: operator-controller-leader-election-rolebinding + namespace: openshift-operator-controller +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: operator-controller-leader-election-role +subjects: + - kind: ServiceAccount + name: operator-controller-controller-manager + namespace: openshift-operator-controller diff --git a/assets/operator-controller/08-clusterrolebinding-operator-controller-manager-rolebinding.yml b/assets/operator-controller/08-clusterrolebinding-operator-controller-manager-rolebinding.yml new file mode 100644 index 00000000..e6023d26 --- /dev/null +++ b/assets/operator-controller/08-clusterrolebinding-operator-controller-manager-rolebinding.yml @@ -0,0 +1,20 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + labels: + app.kubernetes.io/component: rbac + app.kubernetes.io/created-by: operator-controller + app.kubernetes.io/instance: manager-rolebinding + app.kubernetes.io/managed-by: kustomize + app.kubernetes.io/name: clusterrolebinding + app.kubernetes.io/part-of: operator-controller + name: operator-controller-manager-rolebinding +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: operator-controller-manager-role +subjects: + - kind: ServiceAccount + name: operator-controller-controller-manager + namespace: openshift-operator-controller diff --git a/assets/operator-controller/09-clusterrolebinding-operator-controller-proxy-rolebinding.yml b/assets/operator-controller/09-clusterrolebinding-operator-controller-proxy-rolebinding.yml new file mode 100644 index 00000000..29b7cec2 --- /dev/null +++ b/assets/operator-controller/09-clusterrolebinding-operator-controller-proxy-rolebinding.yml @@ -0,0 +1,20 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + labels: + app.kubernetes.io/component: kube-rbac-proxy + app.kubernetes.io/created-by: operator-controller + app.kubernetes.io/instance: proxy-rolebinding + app.kubernetes.io/managed-by: kustomize + app.kubernetes.io/name: clusterrolebinding + app.kubernetes.io/part-of: operator-controller + name: operator-controller-proxy-rolebinding +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: operator-controller-proxy-role +subjects: + - kind: ServiceAccount + name: operator-controller-controller-manager + namespace: openshift-operator-controller diff --git a/assets/operator-controller/10-service-openshift-operator-controller-operator-controller-controller-manager-metrics-service.yml b/assets/operator-controller/10-service-openshift-operator-controller-operator-controller-controller-manager-metrics-service.yml new file mode 100644 index 00000000..456496fb --- /dev/null +++ b/assets/operator-controller/10-service-openshift-operator-controller-operator-controller-controller-manager-metrics-service.yml @@ -0,0 +1,22 @@ +--- +apiVersion: v1 +kind: Service +metadata: + labels: + app.kubernetes.io/component: kube-rbac-proxy + app.kubernetes.io/created-by: operator-controller + app.kubernetes.io/instance: controller-manager-metrics-service + app.kubernetes.io/managed-by: kustomize + app.kubernetes.io/name: service + app.kubernetes.io/part-of: operator-controller + control-plane: controller-manager + name: operator-controller-controller-manager-metrics-service + namespace: openshift-operator-controller +spec: + ports: + - name: https + port: 8443 + protocol: TCP + targetPort: https + selector: + control-plane: controller-manager diff --git a/assets/operator-controller/11-deployment-openshift-operator-controller-operator-controller-controller-manager.yml b/assets/operator-controller/11-deployment-openshift-operator-controller-operator-controller-controller-manager.yml new file mode 100644 index 00000000..93ecdfe6 --- /dev/null +++ b/assets/operator-controller/11-deployment-openshift-operator-controller-operator-controller-controller-manager.yml @@ -0,0 +1,105 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + kubectl.kubernetes.io/default-logs-container: manager + labels: + app.kubernetes.io/component: manager + app.kubernetes.io/created-by: operator-controller + app.kubernetes.io/instance: controller-manager + app.kubernetes.io/managed-by: kustomize + app.kubernetes.io/name: deployment + app.kubernetes.io/part-of: operator-controller + control-plane: controller-manager + name: operator-controller-controller-manager + namespace: openshift-operator-controller +spec: + replicas: 1 + selector: + matchLabels: + control-plane: controller-manager + template: + metadata: + annotations: + kubectl.kubernetes.io/default-container: manager + labels: + control-plane: controller-manager + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/arch + operator: In + values: + - amd64 + - arm64 + - ppc64le + - s390x + - key: kubernetes.io/os + operator: In + values: + - linux + containers: + - args: + - --secure-listen-address=0.0.0.0:8443 + - --upstream=http://127.0.0.1:8080/ + - --logtostderr=true + - --v=0 + image: ${KUBE_RBAC_PROXY_IMAGE} + name: kube-rbac-proxy + ports: + - containerPort: 8443 + name: https + protocol: TCP + resources: + limits: + cpu: 500m + memory: 128Mi + requests: + cpu: 5m + memory: 64Mi + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + - args: + - --health-probe-bind-address=:8081 + - --metrics-bind-address=127.0.0.1:8080 + - --leader-elect + command: + - /manager + image: ${OPERATOR_CONTROLLER_IMAGE} + imagePullPolicy: IfNotPresent + livenessProbe: + httpGet: + path: /healthz + port: 8081 + initialDelaySeconds: 15 + periodSeconds: 20 + name: manager + readinessProbe: + httpGet: + path: /readyz + port: 8081 + initialDelaySeconds: 5 + periodSeconds: 10 + resources: + limits: + cpu: 500m + memory: 128Mi + requests: + cpu: 10m + memory: 64Mi + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + securityContext: + runAsNonRoot: true + serviceAccountName: operator-controller-controller-manager + terminationGracePeriodSeconds: 10 diff --git a/cmd/cluster-olm-operator/main.go b/cmd/cluster-olm-operator/main.go index 57b78efe..ae942297 100644 --- a/cmd/cluster-olm-operator/main.go +++ b/cmd/cluster-olm-operator/main.go @@ -77,16 +77,37 @@ func runOperator(ctx context.Context, cc *controllercmd.ControllerContext) error "catalogd/12-clusterrolebinding-catalogd-proxy-rolebinding.yml", "catalogd/13-service-openshift-catalogd-catalogd-controller-manager-metrics-service.yml", } - catalogdDeployment := "catalogd/14-deployment-openshift-catalogd-catalogd-controller-manager.yml" + opConStaticFiles := []string{ + "operator-controller/00-namespace-openshift-operator-controller.yml", + "operator-controller/01-customresourcedefinition-operators.operators.operatorframework.io.yml", + "operator-controller/02-serviceaccount-openshift-operator-controller-operator-controller-controller-manager.yml", + "operator-controller/03-role-openshift-operator-controller-operator-controller-leader-election-role.yml", + "operator-controller/04-clusterrole-operator-controller-manager-role.yml", + "operator-controller/05-clusterrole-operator-controller-metrics-reader.yml", + "operator-controller/06-clusterrole-operator-controller-proxy-role.yml", + "operator-controller/07-rolebinding-openshift-operator-controller-operator-controller-leader-election-rolebinding.yml", + "operator-controller/08-clusterrolebinding-operator-controller-manager-rolebinding.yml", + "operator-controller/09-clusterrolebinding-operator-controller-proxy-rolebinding.yml", + "operator-controller/10-service-openshift-operator-controller-operator-controller-controller-manager-metrics-service.yml", + } + opConDeployment := "operator-controller/11-deployment-openshift-operator-controller-operator-controller-controller-manager.yml" + catalogdRelatedObjects, err := assets.RelatedObjects(cl.RESTMapper, append(catalogdStaticFiles, catalogdDeployment)) if err != nil { return err } + opConRelatedObjects, err := assets.RelatedObjects(cl.RESTMapper, append(opConStaticFiles, opConDeployment)) + if err != nil { + return err + } + + relatedObjects := append(catalogdRelatedObjects, opConRelatedObjects...) + namespaces := sets.New[string]() - for _, obj := range catalogdRelatedObjects { + for _, obj := range relatedObjects { namespaces.Insert(obj.Namespace) } @@ -119,12 +140,39 @@ func runOperator(ctx context.Context, cc *controllercmd.ControllerContext) error }, ) + opConStaticResourceController := staticresourcecontroller.NewStaticResourceController( + "OperatorControllerStaticResources", + assets.ReadFile, + opConStaticFiles, + cl.ClientHolder(), + cl.OperatorClient, + cc.EventRecorder.ForComponent("OperatorControllerStaticResources"), + ).AddKubeInformers(cl.KubeInformersForNamespaces) + + opConDeploymentManifest, err := assets.ReadFile(opConDeployment) + if err != nil { + return err + } + opConDeploymentController := deploymentcontroller.NewDeploymentController( + "OperatorControllerDeployment", + opConDeploymentManifest, + cc.EventRecorder.ForComponent("OperatorControllerDeployment"), + cl.OperatorClient, + cl.KubeClient, + cl.KubeInformerFactory.Apps().V1().Deployments(), + nil, + []deploymentcontroller.ManifestHookFunc{ + replaceImageHook("${OPERATOR_CONTROLLER_IMAGE}", "OPERATOR_CONTROLLER_IMAGE"), + replaceImageHook("${KUBE_RBAC_PROXY_IMAGE}", "KUBE_RBAC_PROXY_IMAGE"), + }, + ) + versionGetter := status.NewVersionGetter() versionGetter.SetVersion("operator", status.VersionForOperatorFromEnv()) clusterOperatorController := status.NewClusterOperatorStatusController( "olm", - catalogdRelatedObjects, + relatedObjects, cl.ConfigClient.ConfigV1(), cl.ConfigInformerFactory.Config().V1().ClusterOperators(), cl.OperatorClient, @@ -137,6 +185,8 @@ func runOperator(ctx context.Context, cc *controllercmd.ControllerContext) error for _, c := range []factory.Controller{ catalogdStaticResourceController, catalogdDeploymentController, + opConStaticResourceController, + opConDeploymentController, clusterOperatorController, } { go func(c factory.Controller) { diff --git a/manifests/0000_51_olm_02_operator_clusterrole.yaml b/manifests/0000_51_olm_02_operator_clusterrole.yaml index db44b0f9..3f71a37b 100644 --- a/manifests/0000_51_olm_02_operator_clusterrole.yaml +++ b/manifests/0000_51_olm_02_operator_clusterrole.yaml @@ -163,3 +163,7 @@ rules: - catalogd-metrics-reader - catalogd-proxy-role - catalogd-leader-election-role + - operator-controller-manager-role + - operator-controller-metrics-reader + - operator-controller-proxy-role + - operator-controller-leader-election-role diff --git a/manifests/0000_51_olm_06_deployment.yaml b/manifests/0000_51_olm_06_deployment.yaml index e3f46f89..6a4eb443 100644 --- a/manifests/0000_51_olm_06_deployment.yaml +++ b/manifests/0000_51_olm_06_deployment.yaml @@ -43,6 +43,8 @@ spec: value: quay.io/openshift/origin-kube-rbac-proxy:latest - name: CATALOGD_IMAGE value: quay.io/openshift/origin-olm-catalogd:latest + - name: OPERATOR_CONTROLLER_IMAGE + value: quay.io/openshift/origin-olm-operator-controller:latest resources: requests: cpu: 10m