Skip to content

Commit

Permalink
Bump dependencies (#373)
Browse files Browse the repository at this point in the history 
* use the same image for all jobs

* bump dependencies

* fix typos

* enable nilness check

* adjust unit tests to changes in ctrl-runtime's fakeclient

* update CRDs, fix containerizing

* adjust shfmt job to new image
  • Loading branch information
@xrstf
xrstf authored Mar 19, 2024
1 parent 3f35bc6 commit c9f317f
Show file tree
Hide file tree
Showing 16 changed files with 202 additions and 146 deletions.
3 changes: 3 additions & 0 deletions .golangci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ linters-settings:
main:
deny:
- { pkg: io/ioutil, desc: https://go.dev/doc/go1.16#ioutil }
govet:
enable:
- nilness # find tautologies / impossible conditions

issues:
exclude:
Expand Down
18 changes: 9 additions & 9 deletions .prow/verify.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ presubmits:
preset-goproxy: "true"
spec:
containers:
- image: quay.io/kubermatic-labs/boilerplate:v0.2.0
- image: quay.io/kubermatic/build:go-1.22-node-18-5
command:
- make
args:
Expand All @@ -36,7 +36,7 @@ presubmits:
preset-goproxy: "true"
spec:
containers:
- image: golang:1.22.1
- image: quay.io/kubermatic/build:go-1.22-node-18-5
command:
- make
args:
Expand All @@ -58,7 +58,7 @@ presubmits:
preset-goproxy: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.22-node-18-0
- image: quay.io/kubermatic/build:go-1.22-node-18-5
command:
- make
args:
Expand All @@ -79,7 +79,7 @@ presubmits:
preset-goproxy: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.22-5
- image: quay.io/kubermatic/build:go-1.22-node-18-5
command:
- ./hack/verify-licenses.sh
resources:
Expand All @@ -95,7 +95,7 @@ presubmits:
preset-goproxy: "true"
spec:
containers:
- image: golangci/golangci-lint:v1.56.0
- image: quay.io/kubermatic/build:go-1.22-node-18-5
command:
- make
args:
Expand All @@ -115,7 +115,7 @@ presubmits:
preset-goproxy: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.22-5
- image: quay.io/kubermatic/build:go-1.22-node-18-5
command:
- make
args:
Expand All @@ -130,9 +130,9 @@ presubmits:
clone_uri: "ssh://[email protected]/kubermatic/operating-system-manager.git"
spec:
containers:
- image: docker.io/mvdan/shfmt:v3.5.1
- image: quay.io/kubermatic/build:go-1.22-node-18-5
command:
- "/bin/shfmt"
- shfmt
args:
# -l list files whose formatting differs from shfmt's
# -d error with a diff when the formatting differs
Expand Down Expand Up @@ -161,7 +161,7 @@ presubmits:
preset-goproxy: "true"
spec:
containers:
- image: golang:1.22.1
- image: quay.io/kubermatic/build:go-1.22-node-18-5
command:
- make
args:
Expand Down
2 changes: 1 addition & 1 deletion deploy/cloud-init-settings.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# cloud-init-settings is a dedicated namespace for storing provisioing configurations for machines. That are later consumed by machine-controller
# cloud-init-settings is a dedicated namespace for storing provisioning configurations for machines. That are later consumed by machine-controller
# The dedicated and restricted service-account, cloud-init-getter is then used in order to reach, authenticate and be autorized by the API server to fetch those
# provisioning configurations for the machines

Expand Down
43 changes: 24 additions & 19 deletions deploy/crd/operatingsystemmanager.k8c.io_operatingsystemconfigs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: operatingsystemconfigs.operatingsystemmanager.k8c.io
spec:
group: operatingsystemmanager.k8c.io
Expand All @@ -22,14 +22,19 @@ spec:
description: OperatingSystemConfig is the object that represents the OperatingSystemConfig
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 All @@ -46,9 +51,9 @@ spec:
description: Files is a list of files that should exist in the
instance
items:
description: File is a file that should get written to the host's
file system. The content can either be inlined or referenced
from a secret in the same namespace.
description: |-
File is a file that should get written to the host's file system. The content can either be inlined or
referenced from a secret in the same namespace.
properties:
content:
description: Content describe the file's content.
Expand All @@ -74,9 +79,9 @@ spec:
type: string
permissions:
default: 644
description: Permissions describes with which permissions
the file should get written to the file system. Should
be in decimal base and without any leading zeroes.
description: |-
Permissions describes with which permissions the file should get written to the file system.
Should be in decimal base and without any leading zeroes.
format: int32
type: integer
required:
Expand Down Expand Up @@ -225,9 +230,9 @@ spec:
description: Files is a list of files that should exist in the
instance
items:
description: File is a file that should get written to the host's
file system. The content can either be inlined or referenced
from a secret in the same namespace.
description: |-
File is a file that should get written to the host's file system. The content can either be inlined or
referenced from a secret in the same namespace.
properties:
content:
description: Content describe the file's content.
Expand All @@ -253,9 +258,9 @@ spec:
type: string
permissions:
default: 644
description: Permissions describes with which permissions
the file should get written to the file system. Should
be in decimal base and without any leading zeroes.
description: |-
Permissions describes with which permissions the file should get written to the file system.
Should be in decimal base and without any leading zeroes.
format: int32
type: integer
required:
Expand Down
81 changes: 42 additions & 39 deletions deploy/crd/operatingsystemmanager.k8c.io_operatingsystemprofiles.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: operatingsystemprofiles.operatingsystemmanager.k8c.io
spec:
group: operatingsystemmanager.k8c.io
Expand All @@ -22,14 +22,19 @@ spec:
description: OperatingSystemProfile is the object that represents the OperatingSystemProfile
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 All @@ -46,9 +51,9 @@ spec:
description: Files is a list of files that should exist in the
instance
items:
description: File is a file that should get written to the host's
file system. The content can either be inlined or referenced
from a secret in the same namespace.
description: |-
File is a file that should get written to the host's file system. The content can either be inlined or
referenced from a secret in the same namespace.
properties:
content:
description: Content describe the file's content.
Expand All @@ -74,9 +79,9 @@ spec:
type: string
permissions:
default: 644
description: Permissions describes with which permissions
the file should get written to the file system. Should
be in decimal base and without any leading zeroes.
description: |-
Permissions describes with which permissions the file should get written to the file system.
Should be in decimal base and without any leading zeroes.
format: int32
type: integer
required:
Expand Down Expand Up @@ -121,9 +126,9 @@ spec:
type: object
type: object
supportedContainerRuntimes:
description: SupportedContainerRuntimes represents the container
runtimes supported by the given OS. Docker has been deprecated
and is no-op.
description: |-
SupportedContainerRuntimes represents the container runtimes supported by the given OS.
Docker has been deprecated and is no-op.
items:
description: ContainerRuntimeSpec aggregates information about
a specific container runtime
Expand All @@ -132,9 +137,9 @@ spec:
description: Files to add to the main files list when the
containerRuntime is selected
items:
description: File is a file that should get written to
the host's file system. The content can either be inlined
or referenced from a secret in the same namespace.
description: |-
File is a file that should get written to the host's file system. The content can either be inlined or
referenced from a secret in the same namespace.
properties:
content:
description: Content describe the file's content.
Expand All @@ -160,10 +165,9 @@ spec:
type: string
permissions:
default: 644
description: Permissions describes with which permissions
the file should get written to the file system.
Should be in decimal base and without any leading
zeroes.
description: |-
Permissions describes with which permissions the file should get written to the file system.
Should be in decimal base and without any leading zeroes.
format: int32
type: integer
required:
Expand Down Expand Up @@ -257,9 +261,9 @@ spec:
description: Files is a list of files that should exist in the
instance
items:
description: File is a file that should get written to the host's
file system. The content can either be inlined or referenced
from a secret in the same namespace.
description: |-
File is a file that should get written to the host's file system. The content can either be inlined or
referenced from a secret in the same namespace.
properties:
content:
description: Content describe the file's content.
Expand All @@ -285,9 +289,9 @@ spec:
type: string
permissions:
default: 644
description: Permissions describes with which permissions
the file should get written to the file system. Should
be in decimal base and without any leading zeroes.
description: |-
Permissions describes with which permissions the file should get written to the file system.
Should be in decimal base and without any leading zeroes.
format: int32
type: integer
required:
Expand Down Expand Up @@ -332,9 +336,9 @@ spec:
type: object
type: object
supportedContainerRuntimes:
description: SupportedContainerRuntimes represents the container
runtimes supported by the given OS. Docker has been deprecated
and is no-op.
description: |-
SupportedContainerRuntimes represents the container runtimes supported by the given OS.
Docker has been deprecated and is no-op.
items:
description: ContainerRuntimeSpec aggregates information about
a specific container runtime
Expand All @@ -343,9 +347,9 @@ spec:
description: Files to add to the main files list when the
containerRuntime is selected
items:
description: File is a file that should get written to
the host's file system. The content can either be inlined
or referenced from a secret in the same namespace.
description: |-
File is a file that should get written to the host's file system. The content can either be inlined or
referenced from a secret in the same namespace.
properties:
content:
description: Content describe the file's content.
Expand All @@ -371,10 +375,9 @@ spec:
type: string
permissions:
default: 644
description: Permissions describes with which permissions
the file should get written to the file system.
Should be in decimal base and without any leading
zeroes.
description: |-
Permissions describes with which permissions the file should get written to the file system.
Should be in decimal base and without any leading zeroes.
format: int32
type: integer
required:
Expand Down
Loading

0 comments on commit c9f317f

Please sign in to comment.