From 7e375ad1f0af4c1faeefd94b1c8f4232a263c8a5 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Thu, 27 Jul 2023 12:05:23 +0300 Subject: [PATCH] generate: bump tools to their latest versions Bump tools versions and re-auto-generate files. --- Dockerfile_generator | 16 ++++++++-------- deployment/base/nfd-crds/nfd-api-crds.yaml | 6 ++---- .../crds/nfd-api-crds.yaml | 6 ++---- pkg/apihelper/mock_APIHelpers.go | 11 +++++------ pkg/labeler/labeler.pb.go | 2 +- pkg/labeler/mock_LabelerClient.go | 11 +++++------ pkg/podres/mocks/PodResourcesListerClient.go | 11 +++++------ source/mock_LabelSource.go | 11 +++++------ 8 files changed, 33 insertions(+), 41 deletions(-) diff --git a/Dockerfile_generator b/Dockerfile_generator index 4b755c1e7..0fc626679 100644 --- a/Dockerfile_generator +++ b/Dockerfile_generator @@ -2,18 +2,18 @@ ARG BUILDER_IMAGE FROM ${BUILDER_IMAGE} as builder # Install tools -RUN go install github.com/vektra/mockery/v2@v2.25.1 && \ - go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.11.3 && \ - git clone https://github.com/kubernetes/code-generator -b v0.27.1 --depth 1 && \ - go install k8s.io/code-generator/cmd/go-to-protobuf/...@v0.27.1 && \ - go install golang.org/x/tools/cmd/goimports@v0.8.0 && \ +RUN go install github.com/vektra/mockery/v2@v2.32.0 && \ + go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.12.1 && \ + git clone https://github.com/kubernetes/code-generator -b v0.27.4 --depth 1 && \ + go install k8s.io/code-generator/cmd/go-to-protobuf/...@v0.27.4 && \ + go install golang.org/x/tools/cmd/goimports@v0.11.0 && \ go install github.com/golang/protobuf/protoc-gen-go@v1.4.3 RUN apt-get update && apt-get install unzip -RUN curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v22.3/protoc-22.3-linux-x86_64.zip && \ - unzip protoc-22.3-linux-x86_64.zip -d /usr/local && \ - rm protoc-22.3-linux-x86_64.zip && \ +RUN curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v23.4/protoc-23.4-linux-x86_64.zip && \ + unzip protoc-23.4-linux-x86_64.zip -d /usr/local && \ + rm protoc-23.4-linux-x86_64.zip && \ chmod a+x /usr/local/bin/protoc && \ find /usr/local -type d | xargs chmod 755 && \ find /usr/local -type f | xargs chmod a+r diff --git a/deployment/base/nfd-crds/nfd-api-crds.yaml b/deployment/base/nfd-crds/nfd-api-crds.yaml index 7136f2094..6866c7ffe 100644 --- a/deployment/base/nfd-crds/nfd-api-crds.yaml +++ b/deployment/base/nfd-crds/nfd-api-crds.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.3 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.1 name: nodefeatures.nfd.k8s-sigs.io spec: group: nfd.k8s-sigs.io @@ -114,8 +113,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.3 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.1 name: nodefeaturerules.nfd.k8s-sigs.io spec: group: nfd.k8s-sigs.io diff --git a/deployment/helm/node-feature-discovery/crds/nfd-api-crds.yaml b/deployment/helm/node-feature-discovery/crds/nfd-api-crds.yaml index 7136f2094..6866c7ffe 100644 --- a/deployment/helm/node-feature-discovery/crds/nfd-api-crds.yaml +++ b/deployment/helm/node-feature-discovery/crds/nfd-api-crds.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.3 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.1 name: nodefeatures.nfd.k8s-sigs.io spec: group: nfd.k8s-sigs.io @@ -114,8 +113,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.3 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.1 name: nodefeaturerules.nfd.k8s-sigs.io spec: group: nfd.k8s-sigs.io diff --git a/pkg/apihelper/mock_APIHelpers.go b/pkg/apihelper/mock_APIHelpers.go index 7d6a8f104..60b349d4e 100644 --- a/pkg/apihelper/mock_APIHelpers.go +++ b/pkg/apihelper/mock_APIHelpers.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.25.1. DO NOT EDIT. +// Code generated by mockery v2.32.0. DO NOT EDIT. package apihelper @@ -188,13 +188,12 @@ func (_m *MockAPIHelpers) UpdateNode(_a0 *kubernetes.Clientset, _a1 *v1.Node) er return r0 } -type mockConstructorTestingTNewMockAPIHelpers interface { +// NewMockAPIHelpers creates a new instance of MockAPIHelpers. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewMockAPIHelpers(t interface { mock.TestingT Cleanup(func()) -} - -// NewMockAPIHelpers creates a new instance of MockAPIHelpers. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewMockAPIHelpers(t mockConstructorTestingTNewMockAPIHelpers) *MockAPIHelpers { +}) *MockAPIHelpers { mock := &MockAPIHelpers{} mock.Mock.Test(t) diff --git a/pkg/labeler/labeler.pb.go b/pkg/labeler/labeler.pb.go index cfe9d6f5a..51ba10739 100644 --- a/pkg/labeler/labeler.pb.go +++ b/pkg/labeler/labeler.pb.go @@ -16,7 +16,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.23.0 -// protoc v4.22.3 +// protoc v4.23.4 // source: labeler.proto package labeler diff --git a/pkg/labeler/mock_LabelerClient.go b/pkg/labeler/mock_LabelerClient.go index 0489ab7b7..c1d76823b 100644 --- a/pkg/labeler/mock_LabelerClient.go +++ b/pkg/labeler/mock_LabelerClient.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.25.1. DO NOT EDIT. +// Code generated by mockery v2.32.0. DO NOT EDIT. package labeler @@ -48,13 +48,12 @@ func (_m *MockLabelerClient) SetLabels(ctx context.Context, in *SetLabelsRequest return r0, r1 } -type mockConstructorTestingTNewMockLabelerClient interface { +// NewMockLabelerClient creates a new instance of MockLabelerClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewMockLabelerClient(t interface { mock.TestingT Cleanup(func()) -} - -// NewMockLabelerClient creates a new instance of MockLabelerClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewMockLabelerClient(t mockConstructorTestingTNewMockLabelerClient) *MockLabelerClient { +}) *MockLabelerClient { mock := &MockLabelerClient{} mock.Mock.Test(t) diff --git a/pkg/podres/mocks/PodResourcesListerClient.go b/pkg/podres/mocks/PodResourcesListerClient.go index c0ad6a94c..e8463f62e 100644 --- a/pkg/podres/mocks/PodResourcesListerClient.go +++ b/pkg/podres/mocks/PodResourcesListerClient.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.25.1. DO NOT EDIT. +// Code generated by mockery v2.32.0. DO NOT EDIT. package mocks @@ -116,13 +116,12 @@ func (_m *PodResourcesListerClient) List(ctx context.Context, in *v1.ListPodReso return r0, r1 } -type mockConstructorTestingTNewPodResourcesListerClient interface { +// NewPodResourcesListerClient creates a new instance of PodResourcesListerClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewPodResourcesListerClient(t interface { mock.TestingT Cleanup(func()) -} - -// NewPodResourcesListerClient creates a new instance of PodResourcesListerClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewPodResourcesListerClient(t mockConstructorTestingTNewPodResourcesListerClient) *PodResourcesListerClient { +}) *PodResourcesListerClient { mock := &PodResourcesListerClient{} mock.Mock.Test(t) diff --git a/source/mock_LabelSource.go b/source/mock_LabelSource.go index 8aa6e0b25..e1f1b674c 100644 --- a/source/mock_LabelSource.go +++ b/source/mock_LabelSource.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.25.1. DO NOT EDIT. +// Code generated by mockery v2.32.0. DO NOT EDIT. package source @@ -63,13 +63,12 @@ func (_m *MockLabelSource) Priority() int { return r0 } -type mockConstructorTestingTNewMockLabelSource interface { +// NewMockLabelSource creates a new instance of MockLabelSource. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewMockLabelSource(t interface { mock.TestingT Cleanup(func()) -} - -// NewMockLabelSource creates a new instance of MockLabelSource. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -func NewMockLabelSource(t mockConstructorTestingTNewMockLabelSource) *MockLabelSource { +}) *MockLabelSource { mock := &MockLabelSource{} mock.Mock.Test(t)