Skip to content

Commit b8ca869

Browse files
committed
Bump Makefile dependencies pin helmify
Helmify was installed slightly different, so make it work the same way as the other dependencies. Bump all dependencies to the latest versions.
1 parent 3471a3c commit b8ca869

6 files changed

Lines changed: 19 additions & 13 deletions

File tree

Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Image URL to use all building/pushing image targets
55
IMG ?= keppel.eu-de-1.cloud.sap/ccloud/openstack-hypervisor-operator:latest
66
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
7-
ENVTEST_K8S_VERSION = 1.31.0
7+
ENVTEST_K8S_VERSION = 1.34.1
88

99
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
1010
ifeq (,$(shell go env GOBIN))
@@ -158,13 +158,15 @@ KUBECTL ?= kubectl
158158
KUSTOMIZE ?= $(LOCALBIN)/kustomize
159159
CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
160160
ENVTEST ?= $(LOCALBIN)/setup-envtest
161-
GOLANGCI_LINT = $(LOCALBIN)/golangci-lint
161+
GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
162+
HELMIFY ?= $(LOCALBIN)/helmify
162163

163164
## Tool Versions
164-
KUSTOMIZE_VERSION ?= v5.4.3
165-
CONTROLLER_TOOLS_VERSION ?= v0.16.1
165+
KUSTOMIZE_VERSION ?= v5.7.1
166+
CONTROLLER_TOOLS_VERSION ?= v0.19.0
166167
ENVTEST_VERSION ?= release-0.19
167-
GOLANGCI_LINT_VERSION ?= v1.59.1
168+
GOLANGCI_LINT_VERSION ?= v2.5.0
169+
HELMIFY_VERSION ?= v0.4.18
168170

169171
.PHONY: kustomize
170172
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
@@ -184,14 +186,12 @@ $(ENVTEST): $(LOCALBIN)
184186
.PHONY: golangci-lint
185187
golangci-lint: $(GOLANGCI_LINT) ## Download golangci-lint locally if necessary.
186188
$(GOLANGCI_LINT): $(LOCALBIN)
187-
$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint,$(GOLANGCI_LINT_VERSION))
188-
189-
HELMIFY ?= $(LOCALBIN)/helmify
189+
$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/v2/cmd/golangci-lint,$(GOLANGCI_LINT_VERSION))
190190

191191
.PHONY: helmify
192192
helmify: $(HELMIFY) ## Download helmify locally if necessary.
193193
$(HELMIFY): $(LOCALBIN)
194-
test -s $(LOCALBIN)/helmify || GOBIN=$(LOCALBIN) go install github.com/arttor/helmify/cmd/helmify@latest
194+
$(call go-install-tool,$(HELMIFY),github.com/arttor/helmify/cmd/helmify,$(HELMIFY_VERSION))
195195

196196
helm: manifests kustomize helmify
197197
$(KUSTOMIZE) build config/default | $(HELMIFY) -crd-dir charts/openstack-hypervisor-operator

charts/openstack-hypervisor-operator/crds/eviction-crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.1
5+
controller-gen.kubebuilder.io/version: v0.19.0
66
name: evictions.kvm.cloud.sap
77
spec:
88
group: kvm.cloud.sap

charts/openstack-hypervisor-operator/crds/hypervisor-crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.1
5+
controller-gen.kubebuilder.io/version: v0.19.0
66
name: hypervisors.kvm.cloud.sap
77
spec:
88
group: kvm.cloud.sap

config/crd/bases/kvm.cloud.sap_evictions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.1
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: evictions.kvm.cloud.sap
88
spec:
99
group: kvm.cloud.sap

config/crd/bases/kvm.cloud.sap_hypervisors.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.1
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: hypervisors.kvm.cloud.sap
88
spec:
99
group: kvm.cloud.sap

config/manager/kustomization.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
images:
4+
- name: controller
5+
newName: keppel.eu-de-1.cloud.sap/ccloud/openstack-hypervisor-operator
6+
newTag: latest
17
resources:
28
- manager.yaml
39
- secret.yaml

0 commit comments

Comments
 (0)