Merge pull request #585 from souvikinator/souvik/dependency-version-bump

Souvik/dependency version bump

Makefile

@@ -194,7 +194,7 @@ CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v3.8.7
-CONTROLLER_TOOLS_VERSION ?= v0.9.2
+CONTROLLER_TOOLS_VERSION ?= v0.17.1
 
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
 .PHONY: kustomize
@@ -264,7 +264,7 @@ catalog-push: ## Push a catalog image.
 	$(MAKE) docker-push IMG=$(CATALOG_IMG)
 
 # Test coverage
-.PHONY: coverage 
+.PHONY: coverage
 coverage: test-env
 	go test -v ./... -coverprofile cover.out
 	go tool cover -html=cover.out -o cover.html
@@ -289,4 +289,4 @@ $(BIN_DIR)/setup-envtest-$(SETUP_ENVTEST_VERSION):
 .PHONY: test-env
 test-env:
 	make bin/setup-envtest
-	bin/setup-envtest use $(ENVTEST_K8S_VERSION) --bin-dir $(BIN_DIR)
+	bin/setup-envtest use $(ENVTEST_K8S_VERSION) --bin-dir $(BIN_DIR)

api/v1alpha1/meshsync_types_test.go

@@ -143,7 +143,7 @@ var _ = Describe("The test case for the meshsync CRDs", func() {
 				},
 			}
 			By("Update the status of the meshsync CRDs")
-			err := fakeClient.Status().Update(context, meshSync, &client.UpdateOptions{FieldManager: FileManager})
+			err := fakeClient.Status().Update(context, meshSync)
 
 			Expect(err).NotTo(HaveOccurred())
 			Expect(meshSync.Status.PublishingTo == PublishingTo).Should(BeTrue())

config/crd/bases/meshery.layer5.io_brokers.yaml

@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.17.1
   name: brokers.meshery.layer5.io
 spec:
   group: meshery.layer5.io
@@ -21,14 +20,19 @@ spec:
         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'
+            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'
+            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

config/crd/bases/meshery.layer5.io_meshsyncs.yaml

@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.17.1
   name: meshsyncs.meshery.layer5.io
 spec:
   group: meshery.layer5.io
@@ -21,14 +20,19 @@ spec:
         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'
+            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'
+            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
@@ -59,45 +63,54 @@ spec:
                 description: ConfigMap holds configuration data for pods to consume.
                 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'
+                    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
                   binaryData:
                     additionalProperties:
                       format: byte
                       type: string
-                    description: BinaryData contains the binary data. Each key must
-                      consist of alphanumeric characters, '-', '_' or '.'. BinaryData
-                      can contain byte sequences that are not in the UTF-8 range.
-                      The keys stored in BinaryData must not overlap with the ones
-                      in the Data field, this is enforced during validation process.
-                      Using this field will require 1.10+ apiserver and kubelet.
+                    description: |-
+                      BinaryData contains the binary data.
+                      Each key must consist of alphanumeric characters, '-', '_' or '.'.
+                      BinaryData can contain byte sequences that are not in the UTF-8 range.
+                      The keys stored in BinaryData must not overlap with the ones in
+                      the Data field, this is enforced during validation process.
+                      Using this field will require 1.10+ apiserver and
+                      kubelet.
                     type: object
                   data:
                     additionalProperties:
                       type: string
-                    description: Data contains the configuration data. Each key must
-                      consist of alphanumeric characters, '-', '_' or '.'. Values
-                      with non-UTF-8 byte sequences must use the BinaryData field.
-                      The keys stored in Data must not overlap with the keys in the
-                      BinaryData field, this is enforced during validation process.
+                    description: |-
+                      Data contains the configuration data.
+                      Each key must consist of alphanumeric characters, '-', '_' or '.'.
+                      Values with non-UTF-8 byte sequences must use the BinaryData field.
+                      The keys stored in Data must not overlap with the keys in
+                      the BinaryData field, this is enforced during validation process.
                     type: object
                   immutable:
-                    description: Immutable, if set to true, ensures that data stored
-                      in the ConfigMap cannot be updated (only object metadata can
-                      be modified). If not set to true, the field can be modified
-                      at any time. Defaulted to nil.
+                    description: |-
+                      Immutable, if set to true, ensures that data stored in the ConfigMap cannot
+                      be updated (only object metadata can be modified).
+                      If not set to true, the field can be modified at any time.
+                      Defaulted to nil.
                     type: boolean
                   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'
+                    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:
-                    description: 'Standard object''s metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata'
+                    description: |-
+                      Standard object's metadata.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
                     type: object
                 type: object
             type: object

config/rbac/role.yaml

@@ -2,7 +2,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  creationTimestamp: null
   name: operator-role
 rules:
 - apiGroups:

controllers/suit_test.go

@@ -35,6 +35,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
+	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
 	mesheryv1alpha1 "github.com/layer5io/meshery-operator/api/v1alpha1"
 )
@@ -93,10 +95,15 @@ var _ = BeforeSuite(func(ctx SpecContext) {
 	Expect(k8sClient).NotTo(BeNil())
 
 	mgr, err = ctrl.NewManager(cfg, ctrl.Options{
-		Scheme:             scheme,
-		MetricsBindAddress: "0",
-		LeaderElection:     false,
-		Port:               8443,
+		Scheme: scheme,
+		Metrics: server.Options{
+			BindAddress: "0",
+		},
+		WebhookServer: webhook.NewServer(webhook.Options{
+			Port: 8443,
+			Host: "", // isten on all interfaces
+		}),
+		LeaderElection: false,
 	})
 	Expect(err).ToNot(HaveOccurred())
 	Expect(mgr).ToNot(BeNil())