Merge pull request #361 from zdtsw-forking/feat/chore1

zdtsw · web-flow · commit affab7bd181b · 2023-07-26T09:09:19.000+02:00
Update: rbac group, kubebuilder, Owns order and add  recorder
diff --git a/apis/dscinitialization/v1alpha1/dscinitialization_types.go b/apis/dscinitialization/v1alpha1/dscinitialization_types.go
@@ -30,9 +30,11 @@ type DSCInitializationSpec struct {
 	ApplicationsNamespace string `json:"applicationsNamespace"`
 	// Enable monitoring on specified namespace
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
+	// +optional
 	Monitoring Monitoring `json:"monitoring,omitempty"`
 	// Internal development useful field
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
+	// +optional
 	ManifestsUri string `json:"manifestsUri,omitempty"`
 }
 
diff --git a/bundle/manifests/opendatahub-operator.clusterserviceversion.yaml b/bundle/manifests/opendatahub-operator.clusterserviceversion.yaml
@@ -250,6 +250,28 @@ spec:
     spec:
       clusterPermissions:
       - rules:
+        - apiGroups:
+          - '*'
+          resources:
+          - '*'
+          verbs:
+          - '*'
+        - apiGroups:
+          - addons.managed.openshift.io
+          resources:
+          - addons
+          verbs:
+          - get
+          - list
+        - apiGroups:
+          - apps
+          resources:
+          - daemonsets
+          - deployments
+          - replicasets
+          - statefulsets
+          verbs:
+          - '*'
         - apiGroups:
           - ""
           resources:
@@ -278,28 +300,6 @@ spec:
           - patch
           - update
           - watch
-        - apiGroups:
-          - '*'
-          resources:
-          - '*'
-          verbs:
-          - '*'
-        - apiGroups:
-          - addons.managed.openshift.io
-          resources:
-          - addons
-          verbs:
-          - get
-          - list
-        - apiGroups:
-          - apps
-          resources:
-          - daemonsets
-          - deployments
-          - replicasets
-          - statefulsets
-          verbs:
-          - '*'
         - apiGroups:
           - datasciencecluster.opendatahub.io
           resources:
diff --git a/components/kserve/kserve.go b/components/kserve/kserve.go
@@ -34,7 +34,7 @@ func (d *Kserve) SetEnabled(enabled bool) {
 	d.Enabled = enabled
 }
 
-func (m *Kserve) ReconcileComponent(owner metav1.Object, cli client.Client, scheme *runtime.Scheme, enabled bool, namespace string) error {
+func (d *Kserve) ReconcileComponent(owner metav1.Object, cli client.Client, scheme *runtime.Scheme, enabled bool, namespace string) error {
 
 	// Update Default rolebinding
 	err := common.UpdatePodSecurityRolebinding(cli, []string{"kserve-controller-manager"}, namespace)
diff --git a/components/modelmeshserving/modelmeshserving.go b/components/modelmeshserving/modelmeshserving.go
@@ -19,19 +19,19 @@ type ModelMeshServing struct {
 	components.Component `json:""`
 }
 
-func (d *ModelMeshServing) GetComponentName() string {
+func (m *ModelMeshServing) GetComponentName() string {
 	return ComponentName
 }
 
 // Verifies that Dashboard implements ComponentInterface
 var _ components.ComponentInterface = (*ModelMeshServing)(nil)
 
-func (d *ModelMeshServing) IsEnabled() bool {
-	return d.Enabled
+func (m *ModelMeshServing) IsEnabled() bool {
+	return m.Enabled
 }
 
-func (d *ModelMeshServing) SetEnabled(enabled bool) {
-	d.Enabled = enabled
+func (m *ModelMeshServing) SetEnabled(enabled bool) {
+	m.Enabled = enabled
 }
 
 func (m *ModelMeshServing) ReconcileComponent(owner metav1.Object, cli client.Client, scheme *runtime.Scheme, enabled bool, namespace string) error {
diff --git a/components/workbenches/workbenches.go b/components/workbenches/workbenches.go
@@ -19,22 +19,22 @@ type Workbenches struct {
 	components.Component `json:""`
 }
 
-func (d *Workbenches) GetComponentName() string {
+func (w *Workbenches) GetComponentName() string {
 	return ComponentName
 }
 
 // Verifies that Dashboard implements ComponentInterface
 var _ components.ComponentInterface = (*Workbenches)(nil)
 
-func (d *Workbenches) IsEnabled() bool {
-	return d.Enabled
+func (w *Workbenches) IsEnabled() bool {
+	return w.Enabled
 }
 
-func (d *Workbenches) SetEnabled(enabled bool) {
-	d.Enabled = enabled
+func (w *Workbenches) SetEnabled(enabled bool) {
+	w.Enabled = enabled
 }
 
-func (m *Workbenches) ReconcileComponent(owner metav1.Object, cli client.Client, scheme *runtime.Scheme, enabled bool, namespace string) error {
+func (w *Workbenches) ReconcileComponent(owner metav1.Object, cli client.Client, scheme *runtime.Scheme, enabled bool, namespace string) error {
 	// Update Default rolebinding
 	err := common.UpdatePodSecurityRolebinding(cli, []string{"notebook-controller-service-account"}, namespace)
 	if err != nil {
diff --git a/config/crd/bases/kfdef.apps.kubeflow.org_kfdefs.yaml b/config/crd/bases/kfdef.apps.kubeflow.org_kfdefs.yaml
@@ -0,0 +1,189 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.9.2
+    operatorframework.io/required-by: "opendatahub-operator.v0.0.7"
+    operatorframework.io/owning-operator: ""
+  creationTimestamp: null
+  name: kfdefs.kfdef.apps.kubeflow.org
+spec:
+  group: kfdef.apps.kubeflow.org
+  names:
+    kind: KfDef
+    listKind: KfDefList
+    plural: kfdefs
+    singular: kfdef
+  scope: Namespaced
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        description: KfDef is the Schema for the kfdefs 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: KfDefSpec defines the desired state of KfDef
+            properties:
+              applications:
+                items:
+                  description: Application defines an application to install
+                  properties:
+                    kustomizeConfig:
+                      properties:
+                        overlays:
+                          items:
+                            type: string
+                          type: array
+                        parameters:
+                          items:
+                            properties:
+                              name:
+                                type: string
+                              value:
+                                type: string
+                            type: object
+                          type: array
+                        repoRef:
+                          properties:
+                            name:
+                              type: string
+                            path:
+                              type: string
+                          type: object
+                      type: object
+                    name:
+                      type: string
+                  type: object
+                type: array
+              plugins:
+                items:
+                  description: Plugin can be used to customize the generation and
+                    deployment of Kubeflow
+                  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:
+                      type: object
+                  type: object
+                type: array
+              repos:
+                items:
+                  description: Repo provides information about a repository providing
+                    config (e.g. kustomize packages, Deployment manager configs, etc...)
+                  properties:
+                    name:
+                      description: Name is a name to identify the repository.
+                      type: string
+                    uri:
+                      description: 'URI where repository can be obtained. Can use
+                        any URI understood by go-getter: https://github.com/hashicorp/go-getter/blob/master/README.md#installation-and-usage'
+                      type: string
+                  type: object
+                type: array
+              secrets:
+                items:
+                  description: Secret provides information about secrets needed to
+                    configure Kubeflow. Secrets can be provided via references.
+                  properties:
+                    name:
+                      type: string
+                    secretSource:
+                      properties:
+                        envSource:
+                          properties:
+                            name:
+                              type: string
+                          type: object
+                        literalSource:
+                          properties:
+                            value:
+                              type: string
+                          type: object
+                      type: object
+                  type: object
+                type: array
+              version:
+                type: string
+            type: object
+          status:
+            description: KfDefStatus defines the observed state of KfDef
+            properties:
+              conditions:
+                items:
+                  properties:
+                    lastTransitionTime:
+                      description: Last time the condition transitioned from one status
+                        to another.
+                      format: date-time
+                      type: string
+                    lastUpdateTime:
+                      description: The last time this condition was updated.
+                      format: date-time
+                      type: string
+                    message:
+                      description: A human readable message indicating details about
+                        the transition.
+                      type: string
+                    reason:
+                      description: The reason for the condition's last transition.
+                      type: string
+                    status:
+                      description: Status of the condition, one of True, False, Unknown.
+                      type: string
+                    type:
+                      description: Type of deployment condition.
+                      type: string
+                  required:
+                  - status
+                  - type
+                  type: object
+                type: array
+              reposCache:
+                description: ReposCache is used to cache information about local caching
+                  of the URIs.
+                items:
+                  properties:
+                    localPath:
+                      type: string
+                    name:
+                      type: string
+                  required:
+                  - localPath
+                  type: object
+                type: array
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: null
+  storedVersions: null
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -5,6 +5,28 @@ metadata:
   creationTimestamp: null
   name: controller-manager-role
 rules:
+- apiGroups:
+  - '*'
+  resources:
+  - '*'
+  verbs:
+  - '*'
+- apiGroups:
+  - addons.managed.openshift.io
+  resources:
+  - addons
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - apps
+  resources:
+  - daemonsets
+  - deployments
+  - replicasets
+  - statefulsets
+  verbs:
+  - '*'
 - apiGroups:
   - ""
   resources:
@@ -33,28 +55,6 @@ rules:
   - patch
   - update
   - watch
-- apiGroups:
-  - '*'
-  resources:
-  - '*'
-  verbs:
-  - '*'
-- apiGroups:
-  - addons.managed.openshift.io
-  resources:
-  - addons
-  verbs:
-  - get
-  - list
-- apiGroups:
-  - apps
-  resources:
-  - daemonsets
-  - deployments
-  - replicasets
-  - statefulsets
-  verbs:
-  - '*'
 - apiGroups:
   - datasciencecluster.opendatahub.io
   resources:
diff --git a/controllers/datasciencecluster/datasciencecluster_controller.go b/controllers/datasciencecluster/datasciencecluster_controller.go
diff --git a/controllers/dscinitialization/dscinitialization_controller.go b/controllers/dscinitialization/dscinitialization_controller.go
diff --git a/main.go b/main.go

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func (d *Kserve) SetEnabled(enabled bool) {`
`34`	`34`	`d.Enabled = enabled`
`35`	`35`	`}`
`36`	`36`
`37`		`-func (m Kserve) ReconcileComponent(owner metav1.Object, cli client.Client, scheme runtime.Scheme, enabled bool, namespace string) error {`
	`37`	`+func (d Kserve) ReconcileComponent(owner metav1.Object, cli client.Client, scheme runtime.Scheme, enabled bool, namespace string) error {`
`38`	`38`
`39`	`39`	`// Update Default rolebinding`
`40`	`40`	`err := common.UpdatePodSecurityRolebinding(cli, []string{"kserve-controller-manager"}, namespace)`
Original file line number	Diff line number	Diff line change
`@@ -19,19 +19,19 @@ type ModelMeshServing struct {`
`19`	`19`	components.Component `json:""`
`20`	`20`	`}`
`21`	`21`
`22`		`-func (d *ModelMeshServing) GetComponentName() string {`
	`22`	`+func (m *ModelMeshServing) GetComponentName() string {`
`23`	`23`	`return ComponentName`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`// Verifies that Dashboard implements ComponentInterface`
`27`	`27`	`var _ components.ComponentInterface = (*ModelMeshServing)(nil)`
`28`	`28`
`29`		`-func (d *ModelMeshServing) IsEnabled() bool {`
`30`		`- return d.Enabled`
	`29`	`+func (m *ModelMeshServing) IsEnabled() bool {`
	`30`	`+ return m.Enabled`
`31`	`31`	`}`
`32`	`32`
`33`		`-func (d *ModelMeshServing) SetEnabled(enabled bool) {`
`34`		`- d.Enabled = enabled`
	`33`	`+func (m *ModelMeshServing) SetEnabled(enabled bool) {`
	`34`	`+ m.Enabled = enabled`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`func (m ModelMeshServing) ReconcileComponent(owner metav1.Object, cli client.Client, scheme runtime.Scheme, enabled bool, namespace string) error {`
Original file line number	Diff line number	Diff line change
`@@ -19,22 +19,22 @@ type Workbenches struct {`
`19`	`19`	components.Component `json:""`
`20`	`20`	`}`
`21`	`21`
`22`		`-func (d *Workbenches) GetComponentName() string {`
	`22`	`+func (w *Workbenches) GetComponentName() string {`
`23`	`23`	`return ComponentName`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`// Verifies that Dashboard implements ComponentInterface`
`27`	`27`	`var _ components.ComponentInterface = (*Workbenches)(nil)`
`28`	`28`
`29`		`-func (d *Workbenches) IsEnabled() bool {`
`30`		`- return d.Enabled`
	`29`	`+func (w *Workbenches) IsEnabled() bool {`
	`30`	`+ return w.Enabled`
`31`	`31`	`}`
`32`	`32`
`33`		`-func (d *Workbenches) SetEnabled(enabled bool) {`
`34`		`- d.Enabled = enabled`
	`33`	`+func (w *Workbenches) SetEnabled(enabled bool) {`
	`34`	`+ w.Enabled = enabled`
`35`	`35`	`}`
`36`	`36`
`37`		`-func (m Workbenches) ReconcileComponent(owner metav1.Object, cli client.Client, scheme runtime.Scheme, enabled bool, namespace string) error {`
	`37`	`+func (w Workbenches) ReconcileComponent(owner metav1.Object, cli client.Client, scheme runtime.Scheme, enabled bool, namespace string) error {`
`38`	`38`	`// Update Default rolebinding`
`39`	`39`	`err := common.UpdatePodSecurityRolebinding(cli, []string{"notebook-controller-service-account"}, namespace)`
`40`	`40`	`if err != nil {`