Skip to content

Commit 684c89c

Browse files
leecalcoteleecalcote
authored
Merge pull request #585 from souvikinator/souvik/dependency-version-bump
Souvik/dependency version bump
2 parents ab3613f + 8614bb2 commit 684c89c

9 files changed

+81
-243
lines changed

‎Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
194194

195195
## Tool Versions
196196
KUSTOMIZE_VERSION ?= v3.8.7
197-
CONTROLLER_TOOLS_VERSION ?= v0.9.2
197+
CONTROLLER_TOOLS_VERSION ?= v0.17.1
198198

199199
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
200200
.PHONY: kustomize
@@ -264,7 +264,7 @@ catalog-push: ## Push a catalog image.
264264
$(MAKE) docker-push IMG=$(CATALOG_IMG)
265265

266266
# Test coverage
267-
.PHONY: coverage
267+
.PHONY: coverage
268268
coverage: test-env
269269
go test -v ./... -coverprofile cover.out
270270
go tool cover -html=cover.out -o cover.html
@@ -289,4 +289,4 @@ $(BIN_DIR)/setup-envtest-$(SETUP_ENVTEST_VERSION):
289289
.PHONY: test-env
290290
test-env:
291291
make bin/setup-envtest
292-
bin/setup-envtest use $(ENVTEST_K8S_VERSION) --bin-dir $(BIN_DIR)
292+
bin/setup-envtest use $(ENVTEST_K8S_VERSION) --bin-dir $(BIN_DIR)

‎api/v1alpha1/meshsync_types_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ var _ = Describe("The test case for the meshsync CRDs", func() {
143143
},
144144
}
145145
By("Update the status of the meshsync CRDs")
146-
err := fakeClient.Status().Update(context, meshSync, &client.UpdateOptions{FieldManager: FileManager})
146+
err := fakeClient.Status().Update(context, meshSync)
147147

148148
Expect(err).NotTo(HaveOccurred())
149149
Expect(meshSync.Status.PublishingTo == PublishingTo).Should(BeTrue())

‎api/v1alpha1/zz_generated.deepcopy.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+12-8
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.2
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.17.1
87
name: brokers.meshery.layer5.io
98
spec:
109
group: meshery.layer5.io
@@ -21,14 +20,19 @@ spec:
2120
description: Broker is the Schema for the brokers API
2221
properties:
2322
apiVersion:
24-
description: 'APIVersion defines the versioned schema of this representation
25-
of an object. Servers should convert recognized schemas to the latest
26-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
23+
description: |-
24+
APIVersion defines the versioned schema of this representation of an object.
25+
Servers should convert recognized schemas to the latest internal value, and
26+
may reject unrecognized values.
27+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2728
type: string
2829
kind:
29-
description: 'Kind is a string value representing the REST resource this
30-
object represents. Servers may infer this from the endpoint the client
31-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
30+
description: |-
31+
Kind is a string value representing the REST resource this object represents.
32+
Servers may infer this from the endpoint the client submits requests to.
33+
Cannot be updated.
34+
In CamelCase.
35+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3236
type: string
3337
metadata:
3438
type: object

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

+45-32
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.2
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.17.1
87
name: meshsyncs.meshery.layer5.io
98
spec:
109
group: meshery.layer5.io
@@ -21,14 +20,19 @@ spec:
2120
description: MeshSync is the Schema for the meshsyncs API
2221
properties:
2322
apiVersion:
24-
description: 'APIVersion defines the versioned schema of this representation
25-
of an object. Servers should convert recognized schemas to the latest
26-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
23+
description: |-
24+
APIVersion defines the versioned schema of this representation of an object.
25+
Servers should convert recognized schemas to the latest internal value, and
26+
may reject unrecognized values.
27+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2728
type: string
2829
kind:
29-
description: 'Kind is a string value representing the REST resource this
30-
object represents. Servers may infer this from the endpoint the client
31-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
30+
description: |-
31+
Kind is a string value representing the REST resource this object represents.
32+
Servers may infer this from the endpoint the client submits requests to.
33+
Cannot be updated.
34+
In CamelCase.
35+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3236
type: string
3337
metadata:
3438
type: object
@@ -59,45 +63,54 @@ spec:
5963
description: ConfigMap holds configuration data for pods to consume.
6064
properties:
6165
apiVersion:
62-
description: 'APIVersion defines the versioned schema of this
63-
representation of an object. Servers should convert recognized
64-
schemas to the latest internal value, and may reject unrecognized
65-
values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
66+
description: |-
67+
APIVersion defines the versioned schema of this representation of an object.
68+
Servers should convert recognized schemas to the latest internal value, and
69+
may reject unrecognized values.
70+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
6671
type: string
6772
binaryData:
6873
additionalProperties:
6974
format: byte
7075
type: string
71-
description: BinaryData contains the binary data. Each key must
72-
consist of alphanumeric characters, '-', '_' or '.'. BinaryData
73-
can contain byte sequences that are not in the UTF-8 range.
74-
The keys stored in BinaryData must not overlap with the ones
75-
in the Data field, this is enforced during validation process.
76-
Using this field will require 1.10+ apiserver and kubelet.
76+
description: |-
77+
BinaryData contains the binary data.
78+
Each key must consist of alphanumeric characters, '-', '_' or '.'.
79+
BinaryData can contain byte sequences that are not in the UTF-8 range.
80+
The keys stored in BinaryData must not overlap with the ones in
81+
the Data field, this is enforced during validation process.
82+
Using this field will require 1.10+ apiserver and
83+
kubelet.
7784
type: object
7885
data:
7986
additionalProperties:
8087
type: string
81-
description: Data contains the configuration data. Each key must
82-
consist of alphanumeric characters, '-', '_' or '.'. Values
83-
with non-UTF-8 byte sequences must use the BinaryData field.
84-
The keys stored in Data must not overlap with the keys in the
85-
BinaryData field, this is enforced during validation process.
88+
description: |-
89+
Data contains the configuration data.
90+
Each key must consist of alphanumeric characters, '-', '_' or '.'.
91+
Values with non-UTF-8 byte sequences must use the BinaryData field.
92+
The keys stored in Data must not overlap with the keys in
93+
the BinaryData field, this is enforced during validation process.
8694
type: object
8795
immutable:
88-
description: Immutable, if set to true, ensures that data stored
89-
in the ConfigMap cannot be updated (only object metadata can
90-
be modified). If not set to true, the field can be modified
91-
at any time. Defaulted to nil.
96+
description: |-
97+
Immutable, if set to true, ensures that data stored in the ConfigMap cannot
98+
be updated (only object metadata can be modified).
99+
If not set to true, the field can be modified at any time.
100+
Defaulted to nil.
92101
type: boolean
93102
kind:
94-
description: 'Kind is a string value representing the REST resource
95-
this object represents. Servers may infer this from the endpoint
96-
the client submits requests to. Cannot be updated. In CamelCase.
97-
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
103+
description: |-
104+
Kind is a string value representing the REST resource this object represents.
105+
Servers may infer this from the endpoint the client submits requests to.
106+
Cannot be updated.
107+
In CamelCase.
108+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
98109
type: string
99110
metadata:
100-
description: 'Standard object''s metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata'
111+
description: |-
112+
Standard object's metadata.
113+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
101114
type: object
102115
type: object
103116
type: object

‎config/rbac/role.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRole
44
metadata:
5-
creationTimestamp: null
65
name: operator-role
76
rules:
87
- apiGroups:

‎controllers/suit_test.go

+11-4
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ import (
3535
"sigs.k8s.io/controller-runtime/pkg/envtest"
3636
logf "sigs.k8s.io/controller-runtime/pkg/log"
3737
"sigs.k8s.io/controller-runtime/pkg/log/zap"
38+
"sigs.k8s.io/controller-runtime/pkg/metrics/server"
39+
"sigs.k8s.io/controller-runtime/pkg/webhook"
3840

3941
mesheryv1alpha1 "github.com/layer5io/meshery-operator/api/v1alpha1"
4042
)
@@ -93,10 +95,15 @@ var _ = BeforeSuite(func(ctx SpecContext) {
9395
Expect(k8sClient).NotTo(BeNil())
9496

9597
mgr, err = ctrl.NewManager(cfg, ctrl.Options{
96-
Scheme: scheme,
97-
MetricsBindAddress: "0",
98-
LeaderElection: false,
99-
Port: 8443,
98+
Scheme: scheme,
99+
Metrics: server.Options{
100+
BindAddress: "0",
101+
},
102+
WebhookServer: webhook.NewServer(webhook.Options{
103+
Port: 8443,
104+
Host: "", // isten on all interfaces
105+
}),
106+
LeaderElection: false,
100107
})
101108
Expect(err).ToNot(HaveOccurred())
102109
Expect(mgr).ToNot(BeNil())

0 commit comments

Comments
 (0)