diff --git a/go.mod b/go.mod index 20c019e7d..a91161aa1 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/nmstate/kubernetes-nmstate/api v0.0.0-20240605150941-df565dd7bf35 github.com/onsi/ginkgo/v2 v2.20.2 github.com/onsi/gomega v1.34.2 - github.com/openshift-kni/eco-goinfra v0.0.0-20241205223303-6804b09b35e1 // latest + github.com/openshift-kni/eco-goinfra v0.0.0-20241206172333-435742805618 // latest github.com/openshift-kni/k8sreporter v1.0.6 github.com/openshift/api v3.9.1-0.20191111211345-a27ff30ebf09+incompatible github.com/openshift/cluster-nfd-operator v0.0.0-20240902145504-f70d1389d329 // release-4.17 diff --git a/go.sum b/go.sum index c6793a6f7..dd41c4593 100644 --- a/go.sum +++ b/go.sum @@ -1257,8 +1257,8 @@ github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/openshift-kni/cluster-group-upgrades-operator v0.0.0-20240918194836-a0a3f896c283 h1:KGQuA0R53YMHkUVWVK5NcFKixjTXB/vaQswcwt3Pdy0= github.com/openshift-kni/cluster-group-upgrades-operator v0.0.0-20240918194836-a0a3f896c283/go.mod h1:TYB+3zGmMhqOmyZ6FCbtNZSndvRDcfh16U7wgYGpe/8= -github.com/openshift-kni/eco-goinfra v0.0.0-20241205223303-6804b09b35e1 h1:2Y8O+w6ys9VAdgeLQxX93JG7/tVqEeYFM+qCEiZJs6s= -github.com/openshift-kni/eco-goinfra v0.0.0-20241205223303-6804b09b35e1/go.mod h1:T51OM/Mq7OogaCm7rBxdaaCrK8iXVh4E3FlEv8v90B4= +github.com/openshift-kni/eco-goinfra v0.0.0-20241206172333-435742805618 h1:fg4/Uo+Txw2cwxfzKFuV9kfNMoW41TOloMqyf7V3ECc= +github.com/openshift-kni/eco-goinfra v0.0.0-20241206172333-435742805618/go.mod h1:T51OM/Mq7OogaCm7rBxdaaCrK8iXVh4E3FlEv8v90B4= github.com/openshift-kni/k8sreporter v1.0.6 h1:aaxDzZx3s9bo1I3nopR63RGVZxcJgR94j5X87aDihYo= github.com/openshift-kni/k8sreporter v1.0.6/go.mod h1:tX6LOg0m0oXje7WNLFo8LKHC9Ix8VV0a7vUc6eyeFBQ= github.com/openshift-kni/lifecycle-agent v0.0.0-20241002223755-1e32b456449f h1:2k35EoDXvfOx/pgQKaBp2DkbBvMUBi+LuGATTH0El+U= diff --git a/vendor/github.com/openshift-kni/eco-goinfra/pkg/siteconfig/clusterinstance.go b/vendor/github.com/openshift-kni/eco-goinfra/pkg/siteconfig/clusterinstance.go index 6c45dbfa5..8f31f3026 100644 --- a/vendor/github.com/openshift-kni/eco-goinfra/pkg/siteconfig/clusterinstance.go +++ b/vendor/github.com/openshift-kni/eco-goinfra/pkg/siteconfig/clusterinstance.go @@ -369,6 +369,29 @@ func (builder *CIBuilder) WithExtraManifests(extraManifestsName string) *CIBuild return builder } +// WithCABundle sets a CA bundle via configmap name. +func (builder *CIBuilder) WithCABundle(caBundleConfigMapName string) *CIBuilder { + if valid, _ := builder.validate(); !valid { + return builder + } + + glog.V(100).Infof("Adding CA bundle via configmap %s to ClusterInstance definition", caBundleConfigMapName) + + if caBundleConfigMapName == "" { + glog.V(100).Infof("The clusterinstance cabundle is empty") + + builder.errorMsg = "clusterinstance cabundle cannot be empty" + + return builder + } + + builder.Definition.Spec.CaBundleRef = &corev1.LocalObjectReference{ + Name: caBundleConfigMapName, + } + + return builder +} + // WithExtraLabels applies extraLabels to ClusterInstance definition. func (builder *CIBuilder) WithExtraLabels(key string, labels map[string]string) *CIBuilder { if valid, _ := builder.validate(); !valid { diff --git a/vendor/modules.txt b/vendor/modules.txt index bbf7776ac..14150aa8c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -564,7 +564,7 @@ github.com/opencontainers/runtime-spec/specs-go ## explicit; go 1.22.0 github.com/openshift-kni/cluster-group-upgrades-operator/pkg/api/clustergroupupgrades github.com/openshift-kni/cluster-group-upgrades-operator/pkg/api/clustergroupupgrades/v1alpha1 -# github.com/openshift-kni/eco-goinfra v0.0.0-20241205223303-6804b09b35e1 +# github.com/openshift-kni/eco-goinfra v0.0.0-20241206172333-435742805618 ## explicit; go 1.23 github.com/openshift-kni/eco-goinfra/pkg/apiservers github.com/openshift-kni/eco-goinfra/pkg/argocd