diff --git a/go.mod b/go.mod index b1e630f1c..dd6bec525 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/kubernetes-csi/csi-lib-utils v0.11.0 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.21.1 - github.com/operator-framework/operator-sdk v1.23.0 + github.com/operator-framework/operator-sdk v1.24.0 github.com/robfig/cron/v3 v3.0.1 github.com/stretchr/testify v1.8.0 go.uber.org/zap v1.23.0 @@ -159,7 +159,7 @@ require ( github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect github.com/operator-framework/api v0.15.1-0.20220624132056-decf74800a17 // indirect github.com/operator-framework/helm-operator-plugins v0.0.12-0.20220616200420-1a695cb9f6a1 // indirect - github.com/operator-framework/java-operator-plugins v0.5.1 // indirect + github.com/operator-framework/java-operator-plugins v0.6.0 // indirect github.com/operator-framework/operator-manifest-tools v0.2.1 // indirect github.com/operator-framework/operator-registry v1.23.0 // indirect github.com/otiai10/copy v1.2.0 // indirect diff --git a/go.sum b/go.sum index f64eb4108..008480a73 100644 --- a/go.sum +++ b/go.sum @@ -847,14 +847,14 @@ github.com/operator-framework/api v0.15.1-0.20220624132056-decf74800a17 h1:05SuH github.com/operator-framework/api v0.15.1-0.20220624132056-decf74800a17/go.mod h1:scnY9xqSeCsOdtJtNoHIXd7OtHZ14gj1hkDA4+DlgLY= github.com/operator-framework/helm-operator-plugins v0.0.12-0.20220616200420-1a695cb9f6a1 h1:ulX/0zkiQIg2JkVuAtC329ygfXHg9Sb578vQ7kdNVkY= github.com/operator-framework/helm-operator-plugins v0.0.12-0.20220616200420-1a695cb9f6a1/go.mod h1:D7zPPwmIFBqHtWigU2iJiLuZ0v7hOJOb1/VC+/UuBAQ= -github.com/operator-framework/java-operator-plugins v0.5.1 h1:HmiTocc61d/uqVPY/7EUR6ZTHDVeZ5/fgy7uo1QIBFc= -github.com/operator-framework/java-operator-plugins v0.5.1/go.mod h1:UnUHAWY203Xw1j6Xpiirp/psJJaSRYcjenc0NH2+aVw= +github.com/operator-framework/java-operator-plugins v0.6.0 h1:zVapay2Gm1PKigssVNagD4NdvkfyOLOKlVhRujGJ2aI= +github.com/operator-framework/java-operator-plugins v0.6.0/go.mod h1:UnUHAWY203Xw1j6Xpiirp/psJJaSRYcjenc0NH2+aVw= github.com/operator-framework/operator-manifest-tools v0.2.1 h1:hD3iyOm2mBItzYhpFFWqU1StkolS4XGvXxRvFO4v3Oo= github.com/operator-framework/operator-manifest-tools v0.2.1/go.mod h1:C4AmRDIJiM8WVyGyqoUuK3KlloZr7XqaabKMMKKhHtA= github.com/operator-framework/operator-registry v1.23.0 h1:9bOJbxjjupEUBDhAdjC+n7ogGW0Ah3CGywtLq2EPo/U= github.com/operator-framework/operator-registry v1.23.0/go.mod h1:7XM/SlL9ExTWYJiNxkJfJxdqJrOovuuP35MvVctNtDE= -github.com/operator-framework/operator-sdk v1.23.0 h1:pn8cBzkqdjT6RaPtn/umBcJiYgdSSastuzLRgBNwl0E= -github.com/operator-framework/operator-sdk v1.23.0/go.mod h1:4cHbH4YwFNXKEa/LzwhC3VjoCKJ381xctIpSdq61ZZM= +github.com/operator-framework/operator-sdk v1.24.0 h1:TolUfgiamUrznCfP5m+88Wj8Bq/TgVq1qtQyN47q+7Y= +github.com/operator-framework/operator-sdk v1.24.0/go.mod h1:ABeI+hU/bPfO1u09f7Vranx5GHcwdFnAa21IZjTTKxo= github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k= github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= diff --git a/vendor/github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/api.go b/vendor/github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/api.go index 665b05dd4..81271e886 100644 --- a/vendor/github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/api.go +++ b/vendor/github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/api.go @@ -109,7 +109,7 @@ func (p *createAPISubcommand) Scaffold(fs machinery.Filesystem) error { projectName = strings.ToLower(filepath.Base(dir)) } - makefileBytes = append(makefileBytes, []byte(fmt.Sprintf(makefileBundleVarFragment, p.resource.Plural, p.resource.QualifiedGroup(), p.resource.Version, projectName))...) + makefileBytes = append(makefileBytes, []byte(fmt.Sprintf(makefileBundleVarFragment, p.resource.Plural, p.resource.QualifiedGroup(), p.resource.Version))...) makefileBytes = append([]byte(fmt.Sprintf(makefileBundleImageFragement, p.config.GetDomain(), projectName)), makefileBytes...) @@ -217,7 +217,7 @@ const ( .PHONY: bundle bundle: ## Generate bundle manifests and metadata, then validate generated files. ## marker - cat target/kubernetes/%[1]s.%[2]s-%[3]s.yml target/kubernetes/kubernetes.yml | operator-sdk generate bundle -q --overwrite --version 0.1.1 --default-channel=stable --channels=stable --package=%[4]s + cat target/kubernetes/%[1]s.%[2]s-%[3]s.yml target/kubernetes/kubernetes.yml | operator-sdk generate bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS) operator-sdk bundle validate ./bundle .PHONY: bundle-build @@ -233,7 +233,35 @@ bundle-push: ## Push the bundle image. const ( makefileBundleImageFragement = ` VERSION ?= 0.0.1 + +# CHANNELS define the bundle channels used in the bundle. +# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable") +# To re-generate a bundle for other specific channels without changing the standard setup, you can: +# - use the CHANNELS as arg of the bundle target (e.g make bundle CHANNELS=candidate,fast,stable) +# - use environment variables to overwrite this value (e.g export CHANNELS="candidate,fast,stable") +ifneq ($(origin CHANNELS), undefined) +BUNDLE_CHANNELS := --channels=$(CHANNELS) +endif + +# DEFAULT_CHANNEL defines the default channel used in the bundle. +# Add a new line here if you would like to change its default config. (E.g DEFAULT_CHANNEL = "stable") +# To re-generate a bundle for any other default channel without changing the default setup, you can: +# - use the DEFAULT_CHANNEL as arg of the bundle target (e.g make bundle DEFAULT_CHANNEL=stable) +# - use environment variables to overwrite this value (e.g export DEFAULT_CHANNEL="stable") +ifneq ($(origin DEFAULT_CHANNEL), undefined) +BUNDLE_DEFAULT_CHANNEL := --default-channel=$(DEFAULT_CHANNEL) +endif +BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL) + +# IMAGE_TAG_BASE defines the docker.io namespace and part of the image name for remote images. +# This variable is used to construct full image tags for bundle and catalog images. +# +# For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both +# %[1]s/%[2]s-bundle:$VERSION and %[1]s/%[2]s-catalog:$VERSION. IMAGE_TAG_BASE ?= %[1]s/%[2]s + +# BUNDLE_IMG defines the image:tag used for the bundle. +# You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=/:) BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION) ` ) diff --git a/vendor/github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates/applicationproperties.go b/vendor/github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates/applicationproperties.go index 647ea3a10..b7a76a725 100644 --- a/vendor/github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates/applicationproperties.go +++ b/vendor/github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates/applicationproperties.go @@ -49,6 +49,4 @@ const ApplicationPropertiesTemplate = `quarkus.container-image.build=true quarkus.container-image.name={{ .ProjectName }}-operator # set to true to automatically apply CRDs to the cluster when they get regenerated quarkus.operator-sdk.crd.apply=false -# set to true to automatically generate CSV from your code -quarkus.operator-sdk.generate-csv=false ` diff --git a/vendor/github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go b/vendor/github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go index cd331360a..1ae4de296 100644 --- a/vendor/github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go +++ b/vendor/github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go @@ -57,8 +57,8 @@ const pomxmlTemplate = ` 11 UTF-8 UTF-8 - 3.0.7 - 2.7.5.Final + 4.0.0 + 2.11.2.Final @@ -77,9 +77,10 @@ const pomxmlTemplate = ` io.quarkiverse.operatorsdk quarkus-operator-sdk + io.quarkiverse.operatorsdk - quarkus-operator-sdk-csv-generator + quarkus-operator-sdk-bundle-generator io.quarkus diff --git a/vendor/github.com/operator-framework/operator-sdk/internal/bindata/olm/versions.go b/vendor/github.com/operator-framework/operator-sdk/internal/bindata/olm/versions.go index f713bce21..3a3410408 100644 --- a/vendor/github.com/operator-framework/operator-sdk/internal/bindata/olm/versions.go +++ b/vendor/github.com/operator-framework/operator-sdk/internal/bindata/olm/versions.go @@ -15,9 +15,9 @@ package olm var availableVersions = map[string]struct{}{ - "0.19.1": {}, "0.20.0": {}, "0.21.2": {}, + "0.22.0": {}, } // HasVersion returns whether version maps to released OLM manifests as bindata. diff --git a/vendor/github.com/operator-framework/operator-sdk/internal/olm/fbcutil/util.go b/vendor/github.com/operator-framework/operator-sdk/internal/olm/fbcutil/util.go index e2569503f..0227f4ded 100644 --- a/vendor/github.com/operator-framework/operator-sdk/internal/olm/fbcutil/util.go +++ b/vendor/github.com/operator-framework/operator-sdk/internal/olm/fbcutil/util.go @@ -21,6 +21,7 @@ import ( "fmt" "io/ioutil" "os" + "strings" "github.com/operator-framework/operator-registry/alpha/action" "github.com/operator-framework/operator-registry/alpha/declcfg" @@ -32,9 +33,10 @@ import ( ) const ( - SchemaChannel = "olm.channel" - SchemaPackage = "olm.package" - DefaultChannel = "operator-sdk-run-bundle" + SchemaChannel = "olm.channel" + SchemaPackage = "olm.package" + DefaultChannel = "operator-sdk-run-bundle" + DefaultCacheDir = "operator-sdk-run-bundle-cache" ) const ( @@ -132,16 +134,26 @@ func NullLogger() *log.Entry { // RenderRefs will invoke Operator Registry APIs and return a declarative config object representation // of the references that are passed in as a string array. func RenderRefs(ctx context.Context, refs []string, skipTLSVerify bool, useHTTP bool) (*declarativeconfig.DeclarativeConfig, error) { - + cacheDir := strings.ReplaceAll(strings.Join(refs, "_"), "/", "-") + if cacheDir == "" { + cacheDir = DefaultCacheDir + } reg, err := containerdregistry.NewRegistry( containerdregistry.WithLog(NullLogger()), containerdregistry.SkipTLSVerify(skipTLSVerify), - containerdregistry.WithPlainHTTP(useHTTP)) - + containerdregistry.WithPlainHTTP(useHTTP), + containerdregistry.WithCacheDir(cacheDir)) if err != nil { return nil, fmt.Errorf("error creating new image registry: %v", err) } + defer func() { + err = reg.Destroy() + if err != nil { + log.Warn(fmt.Sprintf("Unable to cleanup registry. You may have to manually cleanup by removing the %q directory", cacheDir)) + } + }() + render := action.Render{ Refs: refs, Registry: reg, diff --git a/vendor/github.com/operator-framework/operator-sdk/internal/olm/operator/bundle/install.go b/vendor/github.com/operator-framework/operator-sdk/internal/olm/operator/bundle/install.go index b93b00a5e..cd3fe483c 100644 --- a/vendor/github.com/operator-framework/operator-sdk/internal/olm/operator/bundle/install.go +++ b/vendor/github.com/operator-framework/operator-sdk/internal/olm/operator/bundle/install.go @@ -17,17 +17,12 @@ package bundle import ( "context" "fmt" - "io/ioutil" - "os" - "strings" log "github.com/sirupsen/logrus" "github.com/spf13/pflag" "github.com/operator-framework/api/pkg/operators/v1alpha1" - "github.com/operator-framework/operator-registry/alpha/action" declarativeconfig "github.com/operator-framework/operator-registry/alpha/declcfg" - "github.com/operator-framework/operator-registry/pkg/image/containerdregistry" registrybundle "github.com/operator-framework/operator-registry/pkg/lib/bundle" fbcutil "github.com/operator-framework/operator-sdk/internal/olm/fbcutil" "github.com/operator-framework/operator-sdk/internal/olm/operator" @@ -125,11 +120,8 @@ func (i *Install) setup(ctx context.Context) error { UseHTTP: i.UseHTTP, } - if _, hasChannelMetadata := labels[registrybundle.ChannelsLabel]; hasChannelMetadata { - f.ChannelName = strings.Split(labels[registrybundle.ChannelsLabel], ",")[0] - } else { - f.ChannelName = fbcutil.DefaultChannel - } + // ignore channels for the bundle and instead use the default + f.ChannelName = fbcutil.DefaultChannel // generate an fbc if an fbc specific label is found on the image or for a default index image. content, err := generateFBCContent(ctx, f, i.BundleImage, i.IndexImageCatalogCreator.IndexImage) @@ -144,7 +136,7 @@ func (i *Install) setup(ctx context.Context) error { i.OperatorInstaller.CatalogSourceName = operator.CatalogNameForPackage(i.OperatorInstaller.PackageName) i.OperatorInstaller.StartingCSV = csv.Name i.OperatorInstaller.SupportedInstallModes = operator.GetSupportedInstallModes(csv.Spec.InstallModes) - i.OperatorInstaller.Channel = strings.Split(labels[registrybundle.ChannelsLabel], ",")[0] + i.OperatorInstaller.Channel = fbcutil.DefaultChannel i.IndexImageCatalogCreator.PackageName = i.OperatorInstaller.PackageName i.IndexImageCatalogCreator.BundleImage = i.BundleImage @@ -191,26 +183,10 @@ func generateFBCContent(ctx context.Context, f *fbcutil.FBCContext, bundleImage, // declarative config type. func generateExtraFBC(ctx context.Context, indexImage string, bundleDeclConfig fbcutil.BundleDeclcfg, skipTLSVerify bool, useHTTP bool) (*declarativeconfig.DeclarativeConfig, error) { log.Infof("Rendering a File-Based Catalog of the Index Image %q to verify if bundle %q is present", indexImage, bundleDeclConfig.Bundle.Name) - log.SetOutput(ioutil.Discard) - - reg, err := containerdregistry.NewRegistry( - containerdregistry.WithLog(fbcutil.NullLogger()), - containerdregistry.SkipTLSVerify(skipTLSVerify), - containerdregistry.WithPlainHTTP(useHTTP)) - - if err != nil { - return nil, fmt.Errorf("error creating new image registry: %v", err) - } - - render := action.Render{ - Refs: []string{indexImage}, - Registry: reg, - } - imageDeclConfig, err := render.Run(ctx) - log.SetOutput(os.Stdout) + imageDeclConfig, err := fbcutil.RenderRefs(ctx, []string{indexImage}, skipTLSVerify, useHTTP) if err != nil { - return nil, fmt.Errorf("error rendering the index image %q: %v", indexImage, err) + return nil, err } for _, bundle := range imageDeclConfig.Bundles { diff --git a/vendor/github.com/operator-framework/operator-sdk/internal/olm/operator/bundleupgrade/upgrade.go b/vendor/github.com/operator-framework/operator-sdk/internal/olm/operator/bundleupgrade/upgrade.go index c5f4dbd3a..9896048fc 100644 --- a/vendor/github.com/operator-framework/operator-sdk/internal/olm/operator/bundleupgrade/upgrade.go +++ b/vendor/github.com/operator-framework/operator-sdk/internal/olm/operator/bundleupgrade/upgrade.go @@ -16,7 +16,6 @@ package bundleupgrade import ( "context" - "strings" "github.com/operator-framework/api/pkg/operators/v1alpha1" registrybundle "github.com/operator-framework/operator-registry/pkg/lib/bundle" @@ -79,7 +78,6 @@ func (u *Upgrade) setup(ctx context.Context) error { u.OperatorInstaller.CatalogSourceName = operator.CatalogNameForPackage(u.OperatorInstaller.PackageName) u.OperatorInstaller.StartingCSV = csv.Name u.OperatorInstaller.SupportedInstallModes = operator.GetSupportedInstallModes(csv.Spec.InstallModes) - u.OperatorInstaller.Channel = strings.Split(labels[registrybundle.ChannelsLabel], ",")[0] // Since an existing CatalogSource will have an annotation containing the existing index image, // defer defaulting the bundle add mode to after the existing CatalogSource is retrieved. @@ -87,11 +85,5 @@ func (u *Upgrade) setup(ctx context.Context) error { u.IndexImageCatalogCreator.BundleImage = u.BundleImage u.IndexImageCatalogCreator.IndexImage = fbcutil.DefaultIndexImage - if _, hasChannelMetadata := labels[registrybundle.ChannelsLabel]; hasChannelMetadata { - u.IndexImageCatalogCreator.ChannelName = strings.Split(labels[registrybundle.ChannelsLabel], ",")[0] - } else { - u.IndexImageCatalogCreator.ChannelName = fbcutil.DefaultChannel - } - return nil } diff --git a/vendor/github.com/operator-framework/operator-sdk/internal/olm/operator/registry/index_image.go b/vendor/github.com/operator-framework/operator-sdk/internal/olm/operator/registry/index_image.go index 1ec72ec7b..084bdc5a1 100644 --- a/vendor/github.com/operator-framework/operator-sdk/internal/olm/operator/registry/index_image.go +++ b/vendor/github.com/operator-framework/operator-sdk/internal/olm/operator/registry/index_image.go @@ -339,6 +339,15 @@ func upgradeFBC(ctx context.Context, f *fbcutil.FBCContext, originalDeclCfg *dec // then deletes existing registry pod based on annotation name found in catalog source object func (c IndexImageCatalogCreator) UpdateCatalog(ctx context.Context, cs *v1alpha1.CatalogSource, subscription *v1alpha1.Subscription) error { var prevRegistryPodName string + + if subscription != nil && c.ChannelName == "" { + c.ChannelName = subscription.Spec.Channel + } + + if c.ChannelName == "" { + c.ChannelName = fbcutil.DefaultChannel + } + if annotations := cs.GetAnnotations(); len(annotations) != 0 { if value, hasAnnotation := annotations[indexImageAnnotation]; hasAnnotation && value != "" { c.IndexImage = value diff --git a/vendor/github.com/operator-framework/operator-sdk/internal/plugins/ansible/v1/scaffolds/internal/templates/makefile.go b/vendor/github.com/operator-framework/operator-sdk/internal/plugins/ansible/v1/scaffolds/internal/templates/makefile.go index 97eaba950..a8b5f21c6 100644 --- a/vendor/github.com/operator-framework/operator-sdk/internal/plugins/ansible/v1/scaffolds/internal/templates/makefile.go +++ b/vendor/github.com/operator-framework/operator-sdk/internal/plugins/ansible/v1/scaffolds/internal/templates/makefile.go @@ -122,7 +122,7 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi $(KUSTOMIZE) build config/default | kubectl delete -f - OS := $(shell uname -s | tr '[:upper:]' '[:lower:]') -ARCH := $(shell uname -m | sed 's/x86_64/amd64/') +ARCH := $(shell uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/') .PHONY: kustomize KUSTOMIZE = $(shell pwd)/bin/kustomize diff --git a/vendor/github.com/operator-framework/operator-sdk/internal/plugins/helm/v1/scaffolds/internal/templates/makefile.go b/vendor/github.com/operator-framework/operator-sdk/internal/plugins/helm/v1/scaffolds/internal/templates/makefile.go index aea468ac2..9bc0584ee 100644 --- a/vendor/github.com/operator-framework/operator-sdk/internal/plugins/helm/v1/scaffolds/internal/templates/makefile.go +++ b/vendor/github.com/operator-framework/operator-sdk/internal/plugins/helm/v1/scaffolds/internal/templates/makefile.go @@ -122,7 +122,7 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi $(KUSTOMIZE) build config/default | kubectl delete -f - OS := $(shell uname -s | tr '[:upper:]' '[:lower:]') -ARCH := $(shell uname -m | sed 's/x86_64/amd64/') +ARCH := $(shell uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/') .PHONY: kustomize KUSTOMIZE = $(shell pwd)/bin/kustomize diff --git a/vendor/github.com/operator-framework/operator-sdk/internal/plugins/manifests/v2/init.go b/vendor/github.com/operator-framework/operator-sdk/internal/plugins/manifests/v2/init.go index 58b2fc577..772d00e90 100644 --- a/vendor/github.com/operator-framework/operator-sdk/internal/plugins/manifests/v2/init.go +++ b/vendor/github.com/operator-framework/operator-sdk/internal/plugins/manifests/v2/init.go @@ -184,7 +184,7 @@ bundle: manifests kustomize ## Generate bundle manifests and metadata, then vali bundle: kustomize ## Generate bundle manifests and metadata, then validate generated files. operator-sdk generate kustomize manifests -q cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG) - $(KUSTOMIZE) build config/manifests | operator-sdk generate bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS) + $(KUSTOMIZE) build config/manifests | operator-sdk generate bundle $(BUNDLE_GEN_FLAGS) operator-sdk bundle validate ./bundle ` diff --git a/vendor/modules.txt b/vendor/modules.txt index c6fce4731..6637fe552 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -671,7 +671,7 @@ github.com/operator-framework/helm-operator-plugins/pkg/plugins/hybrid/v1alpha/s github.com/operator-framework/helm-operator-plugins/pkg/plugins/hybrid/v1alpha/scaffolds/internal/templates/hack github.com/operator-framework/helm-operator-plugins/pkg/plugins/hybrid/v1alpha/scaffolds/internal/templates/rbac github.com/operator-framework/helm-operator-plugins/pkg/plugins/util -# github.com/operator-framework/java-operator-plugins v0.5.1 +# github.com/operator-framework/java-operator-plugins v0.6.0 ## explicit; go 1.17 github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds @@ -704,7 +704,7 @@ github.com/operator-framework/operator-registry/pkg/lib/validation github.com/operator-framework/operator-registry/pkg/registry github.com/operator-framework/operator-registry/pkg/sqlite github.com/operator-framework/operator-registry/pkg/sqlite/migrations -# github.com/operator-framework/operator-sdk v1.23.0 +# github.com/operator-framework/operator-sdk v1.24.0 ## explicit; go 1.18 github.com/operator-framework/operator-sdk/cmd/operator-sdk github.com/operator-framework/operator-sdk/internal/annotations/metrics