Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Souvik/dependency version bump #585

Merged
merged 2 commits into from
Jan 16, 2025
Merged

Souvik/dependency version bump #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3bdfba
dependency version bump
souvikinator Jan 16, 2025
8614bb2
resolved conflict
souvikinator Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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)
2 changes: 1 addition & 1 deletion api/v1alpha1/meshsync_types_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* our CRDs resouces group version could be support by specific kubernetes server
* the specific value of the CRDs field can be workwell without pruning by the api-server to etcd
*/
var _ = Describe("The test case for the meshsync CRDs", func() {

Check failure on line 19 in api/v1alpha1/meshsync_types_test.go

View workflow job for this annotation

GitHub Actions / golangci-lint (ubuntu-22.04, 1.23.x) 

undefined: Describe (typecheck)

context := context.Background()

Expand Down Expand Up @@ -143,7 +143,7 @@
},
}
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())
Expand Down
1 change: 0 additions & 1 deletion api/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 12 additions & 8 deletions config/crd/bases/meshery.layer5.io_brokers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
77 changes: 45 additions & 32 deletions config/crd/bases/meshery.layer5.io_meshsyncs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion config/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
name: operator-role
rules:
- apiGroups:
Expand Down
15 changes: 11 additions & 4 deletions controllers/suit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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())
Expand Down
Loading
Loading