Skip to content

Commit

Permalink
pin dependencies to versions for go 1.21 and remove update flag (#101)
Browse files Browse the repository at this point in the history
* pin dependencies to versions for go 1.21 and remove update flag

Signed-off-by: Jordan Dubrick <jdubrick@redhat.com>

* bump controller-gen to 0.14.0

Signed-off-by: Jordan Dubrick <jdubrick@redhat.com>

---------

Signed-off-by: Jordan Dubrick <jdubrick@redhat.com>
  • Loading branch information
Jdubrick authored Oct 24, 2024
1 parent c318134 commit 383dd6b
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ jobs:
fi
- name: Check format
run: |
go get -u github.com/google/addlicense@dc31ac9ffcca99c9457226366135701794b128c0
go install github.com/google/addlicense@dc31ac9ffcca99c9457226366135701794b128c0
go get -u golang.org/x/tools/cmd/goimports@0cc407e63f5fdd71499c32afa4c54382c5b48d71
go install golang.org/x/tools/cmd/goimports@0cc407e63f5fdd71499c32afa4c54382c5b48d71
go get github.com/google/addlicense@v1.1.1
go install github.com/google/addlicense@v1.1.1
go get golang.org/x/tools/cmd/goimports@v0.24.0
go install golang.org/x/tools/cmd/goimports@v0.24.0
git reset HEAD --hard
make fmt
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ ENVTEST_VERSION=v0.0.0-20240405143037-c25fe2f5ca0f
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION = 1.26
# Controller tools version number
CONTROLLER_TOOLS_VERSION ?= v0.9.2
CONTROLLER_TOOLS_VERSION ?= v0.14.0
# Kustomize version number
KUSTOMIZE_VERSION ?= v3.8.7

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ The repository contains a Makefile; building and deploying can be configured via
| `BUNDLE_CHANNELS` | Sets the list channel(s) include bundle build under | `alpha` |
| `BUNDLE_DEFAULT_CHANNEL` | Sets the default channel to use when installing the bundle | |
| `ENVTEST_K8S_VERSION` | Version of k8s to use for the test environment | `1.26` (current) |
| `CONTROLLER_TOOLS_VERSION` | Version of the controller tools | `v0.9.2` |
| `CONTROLLER_TOOLS_VERSION` | Version of the controller tools | `v0.14.0` |
| `KUSTOMIZE_VERSION` | Version of kustomize | `v3.8.7` |
| `GOBIN` | Path to install Go binaries to | `${GOPATH}/bin` |
| `K8S_CLI` | Path to CLI tool to use with the target cluster environment, `kubectl` or `oc` | Either `oc` or `kubectl` if installed in that order |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: registry-operator-system/registry-operator-serving-cert
controller-gen.kubebuilder.io/version: v0.9.2
controller-gen.kubebuilder.io/version: v0.14.0
creationTimestamp: null
name: clusterdevfileregistrieslists.registry.devfile.io
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.9.2
controller-gen.kubebuilder.io/version: v0.14.0
creationTimestamp: null
name: devfileregistries.registry.devfile.io
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: registry-operator-system/registry-operator-serving-cert
controller-gen.kubebuilder.io/version: v0.9.2
controller-gen.kubebuilder.io/version: v0.14.0
creationTimestamp: null
name: devfileregistrieslists.registry.devfile.io
spec:
Expand Down
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.9.2
controller-gen.kubebuilder.io/version: v0.14.0
creationTimestamp: null
name: clusterdevfileregistrieslists.registry.devfile.io
spec:
Expand Down
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.9.2
controller-gen.kubebuilder.io/version: v0.14.0
creationTimestamp: null
name: devfileregistries.registry.devfile.io
spec:
Expand Down
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.9.2
controller-gen.kubebuilder.io/version: v0.14.0
creationTimestamp: null
name: devfileregistrieslists.registry.devfile.io
spec:
Expand Down

0 comments on commit 383dd6b

Please sign in to comment.