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 group because it wasn't working anyway

Signed-off-by: Brady Siegel <[email protected]>
  • Loading branch information
bmsiegel committed Jun 13, 2024
1 parent a848e7d commit 5c05f6e
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 924 deletions.
21 changes: 8 additions & 13 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,12 @@
"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",
"k8s.io/api",
"k8s.io/apimachinery"
"k8s.io/apimachinery",
"kubernetes-sigs/controller-tools"
],
"matchUpdateTypes": [
"major"
Expand All @@ -54,6 +43,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
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ 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"
# Produce CRDs that work back to Kubernetes 1.13 (no version conversion)
CRD_OPTIONS ?= "crd"

# 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.14.5

# Controller tools
CONTROLLER_GEN_VERSION := 0.5.0
CONTROLLER_GEN_VERSION := 0.15.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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ Before running ```make cluster``` we will need to do the following:
* [Golang v1.17+](https://golang.org/)
* [Docker v17.03+](https://docs.docker.com/install/)
* [Kind v0.9.0+](https://kind.sigs.k8s.io/docs/user/quick-start/) -> This will be installed via running the test
* [Kubectl v1.11.3+](https://kubernetes.io/docs/tasks/tools/install-kubectl/)
* [Kubectl v1.13+](https://kubernetes.io/docs/tasks/tools/install-kubectl/)
* [AWS CLI v2](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-install.html)
* [Helm](https://helm.sh/docs/intro/install/)
* [Make](https://www.gnu.org/software/make/) Need to have version 3.82+
Expand Down
5 changes: 0 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
Expand All @@ -61,7 +60,6 @@ require (
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
Expand All @@ -74,7 +72,6 @@ require (
github.com/prometheus/procfs v0.12.0 // indirect
github.com/spf13/cobra v1.8.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/crypto v0.22.0 // indirect
Expand All @@ -88,14 +85,12 @@ require (
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.30.0 // indirect
k8s.io/component-base v0.30.0 // indirect
k8s.io/klog/v2 v2.120.1 // indirect
k8s.io/kube-aggregator v0.29.0 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
sigs.k8s.io/gateway-api v1.0.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
Expand Down
Loading

0 comments on commit 5c05f6e

Please sign in to comment.