From 4231844a1b9930ac59c53f6a0aaeda653fe9f908 Mon Sep 17 00:00:00 2001 From: everettraven Date: Wed, 17 Jan 2024 10:46:37 -0500 Subject: [PATCH] bump catalogd to v0.11.0 Signed-off-by: everettraven --- .bingo/Variables.mk | 1 + .bingo/variables.env | 1 + Makefile | 8 +++++++- go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk index 2d7bba548..e4840ad6a 100644 --- a/.bingo/Variables.mk +++ b/.bingo/Variables.mk @@ -70,3 +70,4 @@ $(SETUP_ENVTEST): $(BINGO_DIR)/setup-envtest.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. @echo "(re)installing $(GOBIN)/setup-envtest-v0.0.0-20230606045100-e54088c8c7da" @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=setup-envtest.mod -o=$(GOBIN)/setup-envtest-v0.0.0-20230606045100-e54088c8c7da "sigs.k8s.io/controller-runtime/tools/setup-envtest" + diff --git a/.bingo/variables.env b/.bingo/variables.env index 74790d782..bd624fae5 100644 --- a/.bingo/variables.env +++ b/.bingo/variables.env @@ -25,3 +25,4 @@ OPERATOR_SDK="${GOBIN}/operator-sdk-v1.31.0" OPM="${GOBIN}/opm-v1.28.0" SETUP_ENVTEST="${GOBIN}/setup-envtest-v0.0.0-20230606045100-e54088c8c7da" + diff --git a/Makefile b/Makefile index f7f9afbf3..004c67dc8 100644 --- a/Makefile +++ b/Makefile @@ -25,6 +25,12 @@ export ARTIFACT_PATH ?= OPERATOR_CONTROLLER_NAMESPACE ?= operator-controller-system KIND_CLUSTER_NAME ?= operator-controller +# Not guaranteed to have patch releases available and node image tags are full versions (i.e v1.28.0 - no v1.28, v1.29, etc.) +# The KIND_NODE_VERSION is set by getting the version of the k8s.io/client-go dependency from the go.mod +# and sets major version to "1" and the patch version to "0". For example, a client-go version of v0.28.5 +# will map to a KIND_NODE_VERSION of 1.28.0 +KIND_NODE_VERSION = $(shell go list -m k8s.io/client-go | cut -d" " -f2 | sed 's/^v0\.\([[:digit:]]\{1,\}\)\.[[:digit:]]\{1,\}$$/1.\1.0/') +KIND_CLUSTER_IMAGE ?= kindest/node:v${KIND_NODE_VERSION} CONTAINER_RUNTIME ?= docker @@ -156,7 +162,7 @@ kind-deploy: manifests $(KUSTOMIZE) #EXHELP Install controller and dependencies .PHONY: kind-cluster kind-cluster: $(KIND) #EXHELP Standup a kind cluster. -$(KIND) delete cluster --name ${KIND_CLUSTER_NAME} - $(KIND) create cluster --name ${KIND_CLUSTER_NAME} + $(KIND) create cluster --name ${KIND_CLUSTER_NAME} --image ${KIND_CLUSTER_IMAGE} $(KIND) export kubeconfig --name ${KIND_CLUSTER_NAME} .PHONY: kind-clean diff --git a/go.mod b/go.mod index 84ec91983..62f845fdb 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/blang/semver/v4 v4.0.0 github.com/go-logr/logr v1.4.1 github.com/google/go-cmp v0.6.0 - github.com/operator-framework/catalogd v0.10.0 + github.com/operator-framework/catalogd v0.11.0 github.com/operator-framework/deppy v0.3.0 github.com/operator-framework/operator-registry v1.34.0 github.com/operator-framework/rukpak v0.16.0 diff --git a/go.sum b/go.sum index 52556e0fa..d83a655f5 100644 --- a/go.sum +++ b/go.sum @@ -252,8 +252,8 @@ github.com/opencontainers/runtime-spec v1.1.0 h1:HHUyrt9mwHUjtasSbXSMvs4cyFxh+Bl github.com/opencontainers/runtime-spec v1.1.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/operator-framework/api v0.20.0 h1:A2YCRhr+6s0k3pRJacnwjh1Ue8BqjIGuQ2jvPg9XCB4= github.com/operator-framework/api v0.20.0/go.mod h1:rXPOhrQ6mMeXqCmpDgt1ALoar9ZlHL+Iy5qut9R99a4= -github.com/operator-framework/catalogd v0.10.0 h1:T207IQfQCcd3f31bDPCgfJcwEvmaPGV8BotqIzIvnRo= -github.com/operator-framework/catalogd v0.10.0/go.mod h1:xIeR5f/Spr5rHnLp0yOi0AYetWcHvBAx9n+K3S/va2A= +github.com/operator-framework/catalogd v0.11.0 h1:b1ifk/TriPTo4KkdVTSWi6HY959h/ZD7sHuBKGEbLDA= +github.com/operator-framework/catalogd v0.11.0/go.mod h1:AHz6B7NxC7cywF6P3XclmCim1bs0y0g2+LdycdIGAmE= github.com/operator-framework/deppy v0.3.0 h1:W8wpF0ehcTAdH2WfMyqMPI5Ja0Qv8M5FMO5cXgJvEQ8= github.com/operator-framework/deppy v0.3.0/go.mod h1:EHDxZz8fKGvuymCng3G/Ou7wuX14GaLr0cmf2u29Oog= github.com/operator-framework/operator-registry v1.34.0 h1:dNgWTqMfixBaBwalypo3oJqQvqNwKwJ3NS9RaBHJxzs=