Merge pull request #245 from meshery/fix/ci

Update operator mainifest and fix controller spellmistakes error

config/manifests/bases/meshery-operator.clusterserviceversion.yaml

@@ -0,0 +1,50 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: ClusterServiceVersion
+metadata:
+  annotations:
+    alm-examples: '[]'
+    capabilities: Basic Install
+  name: meshery-operator.v0.0.0
+  namespace: placeholder
+spec:
+  apiservicedefinitions: {}
+  customresourcedefinitions:
+    owned:
+    - description: MeshSync is the Schema for the meshsyncs API
+      displayName: Mesh Sync
+      kind: MeshSync
+      name: meshsyncs.meshery.layer5.io
+      version: v1alpha1
+  description: Meshery Operator is the multi-service mesh operator and implementation
+    of MeshSync.
+  displayName: meshery-operator
+  icon:
+  - base64data: ""
+    mediatype: ""
+  install:
+    spec:
+      deployments: null
+    strategy: ""
+  installModes:
+  - supported: false
+    type: OwnNamespace
+  - supported: false
+    type: SingleNamespace
+  - supported: false
+    type: MultiNamespace
+  - supported: true
+    type: AllNamespaces
+  keywords:
+  - servicemesh
+  - meshSync
+  links:
+  - name: Meshery Operator
+    url: https://meshery-operator.domain
+  maintainers:
+  - email: [email protected]
+    name: aisuko
+  maturity: alpha
+  provider:
+    name: meshery
+    url: https://github.com/meshery
+  version: 0.0.0

config/manifests/default.yaml

@@ -1,8 +1,9 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.6.1
+  creationTimestamp: null
   name: brokers.meshery.layer5.io
 spec:
   group: meshery.layer5.io
@@ -12,88 +13,88 @@ spec:
     plural: brokers
     singular: broker
   scope: Namespaced
-  subresources:
-    status: {}
-  validation:
-    openAPIV3Schema:
-      description: Broker is the Schema for the brokers 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: BrokerSpec defines the desired state of Broker
-          properties:
-            size:
-              format: int32
-              type: integer
-          type: object
-        status:
-          description: BrokerStatus defines the observed state of Broker
-          properties:
-            conditions:
-              items:
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: Broker is the Schema for the brokers 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: BrokerSpec defines the desired state of Broker
+            properties:
+              size:
+                format: int32
+                type: integer
+            type: object
+          status:
+            description: BrokerStatus defines the observed state of Broker
+            properties:
+              conditions:
+                items:
+                  properties:
+                    lastProbeTime:
+                      format: date-time
+                      type: string
+                    lastTransitionTime:
+                      format: date-time
+                      type: string
+                    message:
+                      type: string
+                    observedGeneration:
+                      format: int64
+                      type: integer
+                    reason:
+                      type: string
+                    status:
+                      type: string
+                    type:
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - message
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+              endpoint:
                 properties:
-                  lastProbeTime:
-                    format: date-time
-                    type: string
-                  lastTransitionTime:
-                    format: date-time
-                    type: string
-                  message:
-                    type: string
-                  observedGeneration:
-                    format: int64
-                    type: integer
-                  reason:
-                    type: string
-                  status:
+                  external:
                     type: string
-                  type:
+                  internal:
                     type: string
-                required:
-                - lastTransitionTime
-                - message
-                - reason
-                - status
-                - type
                 type: object
-              type: array
-            endpoint:
-              properties:
-                external:
-                  type: string
-                internal:
-                  type: string
-              type: object
-          type: object
-      type: object
-  version: v1alpha1
-  versions:
-  - name: v1alpha1
+            type: object
+        type: object
     served: true
     storage: true
+    subresources:
+      status: {}
 status:
   acceptedNames:
     kind: ""
     plural: ""
   conditions: []
   storedVersions: []
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.6.1
+  creationTimestamp: null
   name: meshsyncs.meshery.layer5.io
 spec:
   group: meshery.layer5.io
@@ -103,86 +104,85 @@ spec:
     plural: meshsyncs
     singular: meshsync
   scope: Namespaced
-  subresources:
-    status: {}
-  validation:
-    openAPIV3Schema:
-      description: MeshSync is the Schema for the meshsyncs 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: MeshSyncSpec defines the desired state of MeshSync
-          properties:
-            broker:
-              properties:
-                custom:
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: MeshSync is the Schema for the meshsyncs 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: MeshSyncSpec defines the desired state of MeshSync
+            properties:
+              broker:
+                properties:
+                  custom:
+                    properties:
+                      url:
+                        type: string
+                    type: object
+                  native:
+                    properties:
+                      name:
+                        type: string
+                      namespace:
+                        type: string
+                    type: object
+                type: object
+              size:
+                format: int32
+                type: integer
+            type: object
+          status:
+            description: MeshSyncStatus defines the observed state of MeshSync
+            properties:
+              conditions:
+                items:
                   properties:
-                    url:
+                    lastProbeTime:
+                      format: date-time
                       type: string
-                  type: object
-                native:
-                  properties:
-                    name:
+                    lastTransitionTime:
+                      format: date-time
+                      type: string
+                    message:
                       type: string
-                    namespace:
+                    observedGeneration:
+                      format: int64
+                      type: integer
+                    reason:
                       type: string
+                    status:
+                      type: string
+                    type:
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - message
+                  - reason
+                  - status
+                  - type
                   type: object
-              type: object
-            size:
-              format: int32
-              type: integer
-          type: object
-        status:
-          description: MeshSyncStatus defines the observed state of MeshSync
-          properties:
-            conditions:
-              items:
-                properties:
-                  lastProbeTime:
-                    format: date-time
-                    type: string
-                  lastTransitionTime:
-                    format: date-time
-                    type: string
-                  message:
-                    type: string
-                  observedGeneration:
-                    format: int64
-                    type: integer
-                  reason:
-                    type: string
-                  status:
-                    type: string
-                  type:
-                    type: string
-                required:
-                - lastTransitionTime
-                - message
-                - reason
-                - status
-                - type
-                type: object
-              type: array
-            publishing-to:
-              type: string
-          type: object
-      type: object
-  version: v1alpha1
-  versions:
-  - name: v1alpha1
+                type: array
+              publishing-to:
+                type: string
+            type: object
+        type: object
     served: true
     storage: true
+    subresources:
+      status: {}
 status:
   acceptedNames:
     kind: ""
@@ -264,6 +264,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
+  creationTimestamp: null
   name: meshery-operator-role
 rules:
 - apiGroups:

controllers/broker_controller.go

@@ -50,7 +50,7 @@ func (r *BrokerReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
 	log := r.Log
 	log = log.WithValues("controller", "Broker")
 	log = log.WithValues("namespace", req.NamespacedName)
-	log.Info("Reconcilling broker")
+	log.Info("Reconciling broker")
 	baseResource := &mesheryv1alpha1.Broker{}
 
 	// Check if resource exists