Skip to content

Commit

Permalink
Update controller-tools and add to renovate
Browse files Browse the repository at this point in the history
- Remove go block, it wasn't working properly anyway
  • Loading branch information
bmsiegel committed May 15, 2024
1 parent fa16c27 commit 853e706
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 15 deletions.
18 changes: 6 additions & 12 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,6 @@
"groupName": "all non-major dependencies",
"groupSlug": "all-minor-patch"
},
{
"matchPackageNames": [
"golang",
"go"
],
"matchUpdateTypes": [
"minor",
"major"
],
"groupName": "golang",
"groupSlug": "golang-update"
},
{
"matchPackageNames": [
"k8s.io/client-go",
Expand All @@ -54,6 +42,12 @@
"depNameTemplate": "cert-manager/cert-manager",
"datasourceTemplate": "github-releases"
},
{
"fileMatch": ["^Makefile$"],
"matchStrings": ["CONTROLLER_GEN_VERSION := (?<currentValue>.*?)\\n"],
"depNameTemplate": "kubernetes-sigs/controller-tools",
"datasourceTemplate": "github-releases"
},
{
"fileMatch": ["^.github/workflows/on-safe-to-test-label.yml$"],
"matchStrings": ["GOVERSION=go(?<currentValue>.*?)\\n"],
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ DOCKER_IMAGE_NAME ?= cert-manager/aws-privateca-issuer/controller
# Image URL to use all building/pushing image targets
IMG ?= ${DOCKER_REGISTRY}/${DOCKER_IMAGE_NAME}:${VERSION}
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"
CRD_OPTIONS ?= "crd:deprecatedV1beta1CompatibilityPreserveUnknownFields=false"

# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
ifeq (,$(shell go env GOBIN))
Expand All @@ -51,7 +51,7 @@ K8S_CLUSTER_NAME := pca-external-issuer
CERT_MANAGER_VERSION ?= v1.13.3

# Controller tools
CONTROLLER_GEN_VERSION := 0.5.0
CONTROLLER_GEN_VERSION := 0.14.0
CONTROLLER_GEN := ${BIN}/controller-gen-${CONTROLLER_GEN_VERSION}

# Helm tools
Expand Down Expand Up @@ -153,7 +153,7 @@ docker-push:

CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
controller-gen:
$(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.1)
$(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v$(CONTROLLER_GEN_VERSION))

HELM_TOOL = $(shell pwd)/bin/helm-tool
helm-tool:
Expand Down

0 comments on commit 853e706

Please sign in to comment.