diff --git a/go.mod b/go.mod index cd6df4cf..c230a437 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-20241105195130-61303bf337b6 // latest + github.com/openshift-kni/eco-goinfra v0.0.0-20241106135846-6ab06a3a8f4b // 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 9925b044..80cac148 100644 --- a/go.sum +++ b/go.sum @@ -1288,8 +1288,8 @@ github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8= github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc= 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-20241105195130-61303bf337b6 h1:YsPZJZGpm24Zc1uEC+PdEzCQkXFZqkfC6oNNbeYTA5Q= -github.com/openshift-kni/eco-goinfra v0.0.0-20241105195130-61303bf337b6/go.mod h1:6d3OZBxd6JN3xkknYiSLpRAcRVO6jcZZN4+LScvhUPE= +github.com/openshift-kni/eco-goinfra v0.0.0-20241106135846-6ab06a3a8f4b h1:jXkISifv5oEvoeIcL8JgWgm8QG2EBnTuBjWY87ixG5g= +github.com/openshift-kni/eco-goinfra v0.0.0-20241106135846-6ab06a3a8f4b/go.mod h1:6d3OZBxd6JN3xkknYiSLpRAcRVO6jcZZN4+LScvhUPE= 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/schemes/argocd/argocdoperatorcommon/keys.go b/vendor/github.com/openshift-kni/eco-goinfra/pkg/schemes/argocd/argocdoperatorcommon/keys.go index 636cebd0..3f67dab5 100644 --- a/vendor/github.com/openshift-kni/eco-goinfra/pkg/schemes/argocd/argocdoperatorcommon/keys.go +++ b/vendor/github.com/openshift-kni/eco-goinfra/pkg/schemes/argocd/argocdoperatorcommon/keys.go @@ -172,6 +172,10 @@ const ( // to used for the argocd container. ArgoCDImageEnvName = "ARGOCD_IMAGE" + // ArgoCDExtensionImageEnvName is the environment variable used to get the image + // to be used for the Argo-CD extension image + ArgoCDExtensionImageEnvName = "ARGOCD_EXTENSION_IMAGE" + // ArgoCDKeycloakImageEnvName is the environment variable used to get the image // to used for the Keycloak container. ArgoCDKeycloakImageEnvName = "ARGOCD_KEYCLOAK_IMAGE" diff --git a/vendor/github.com/openshift-kni/eco-goinfra/pkg/schemes/ocs/operatorv1/storageclusterpeer_types.go b/vendor/github.com/openshift-kni/eco-goinfra/pkg/schemes/ocs/operatorv1/storageclusterpeer_types.go index abcf7194..5fdc54ea 100644 --- a/vendor/github.com/openshift-kni/eco-goinfra/pkg/schemes/ocs/operatorv1/storageclusterpeer_types.go +++ b/vendor/github.com/openshift-kni/eco-goinfra/pkg/schemes/ocs/operatorv1/storageclusterpeer_types.go @@ -17,57 +17,37 @@ limitations under the License. package operatorv1 import ( - corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN! // NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized. -type NamespacedName struct { - Name string `json:"name"` - Namespace string `json:"namespace"` -} - -// RemoteClusterSpec specifies the spec required for the remote cluster -type RemoteClusterSpec struct { - // ApiEndpoint is the URI of the ODF api server - ApiEndpoint string `json:"apiEndpoint"` - - // OnboardingTicket holds an identity information required by the local ODF cluster to onboard. - OnboardingTicket string `json:"onboardingTicket"` - // StorageClusterName holds the namespacedName of the Remote ODF Cluster - StorageClusterName NamespacedName `json:"storageClusterName"` -} +type StorageClusterPeerState string -// LocalClusterSpec specifies the spec required for the local cluster -type LocalClusterSpec struct { - // Name holds the name of the local ODF cluster - Name corev1.LocalObjectReference `json:"name"` -} +const ( + StorageClusterPeerStatePending StorageClusterPeerState = "Pending" + StorageClusterPeerStatePeered StorageClusterPeerState = "Peered" +) -// BlockPoolMirroringSpec enables setting up of mirroring for blockPools in the same namespace. -type BlockPoolMirroringSpec struct { - // Selector is used to select blockPools by label - Selector metav1.LabelSelector `json:"selector"` +type PeerInfo struct { + StorageClusterUid string `json:"storageClusterUid,omitempty"` } // StorageClusterPeerSpec defines the desired state of StorageClusterPeer type StorageClusterPeerSpec struct { - // RemoteCluster specifies the spec required for the remote cluster - RemoteCluster RemoteClusterSpec `json:"remoteCluster"` - - // LocalCluster specifies the spec required for the local cluster - LocalCluster LocalClusterSpec `json:"localCluster"` + // ApiEndpoint is the URI of the ODF api server + ApiEndpoint string `json:"apiEndpoint"` - // BlockPoolMirroring indicates ceph block mirroring between block pool on the local and remote clusters - //+optional - BlockPoolMirroring *BlockPoolMirroringSpec `json:"blockPoolMirroring,omitempty"` + // OnboardingToken holds an identity information required by the local ODF cluster to onboard. + OnboardingToken string `json:"onboardingToken"` } // StorageClusterPeerStatus defines the observed state of StorageClusterPeer type StorageClusterPeerStatus struct { + State StorageClusterPeerState `json:"state,omitempty"` + PeerInfo PeerInfo `json:"peerInfo"` } //+kubebuilder:object:root=true diff --git a/vendor/github.com/openshift-kni/eco-goinfra/pkg/schemes/ocs/operatorv1/zz_generated.deepcopy.go b/vendor/github.com/openshift-kni/eco-goinfra/pkg/schemes/ocs/operatorv1/zz_generated.deepcopy.go index c974e526..727a3188 100644 --- a/vendor/github.com/openshift-kni/eco-goinfra/pkg/schemes/ocs/operatorv1/zz_generated.deepcopy.go +++ b/vendor/github.com/openshift-kni/eco-goinfra/pkg/schemes/ocs/operatorv1/zz_generated.deepcopy.go @@ -94,22 +94,6 @@ func (in *BlockPoolConfigurationSpec) DeepCopy() *BlockPoolConfigurationSpec { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *BlockPoolMirroringSpec) DeepCopyInto(out *BlockPoolMirroringSpec) { - *out = *in - in.Selector.DeepCopyInto(&out.Selector) -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BlockPoolMirroringSpec. -func (in *BlockPoolMirroringSpec) DeepCopy() *BlockPoolMirroringSpec { - if in == nil { - return nil - } - out := new(BlockPoolMirroringSpec) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CSIDriverSpec) DeepCopyInto(out *CSIDriverSpec) { *out = *in @@ -272,22 +256,6 @@ func (in *KeyRotationSpec) DeepCopy() *KeyRotationSpec { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *LocalClusterSpec) DeepCopyInto(out *LocalClusterSpec) { - *out = *in - out.Name = in.Name -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new LocalClusterSpec. -func (in *LocalClusterSpec) DeepCopy() *LocalClusterSpec { - if in == nil { - return nil - } - out := new(LocalClusterSpec) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ManageCephBlockPools) DeepCopyInto(out *ManageCephBlockPools) { *out = *in @@ -595,21 +563,6 @@ func (in *NFSSpec) DeepCopy() *NFSSpec { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *NamespacedName) DeepCopyInto(out *NamespacedName) { - *out = *in -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NamespacedName. -func (in *NamespacedName) DeepCopy() *NamespacedName { - if in == nil { - return nil - } - out := new(NamespacedName) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *NodeTopologyMap) DeepCopyInto(out *NodeTopologyMap) { *out = *in @@ -768,17 +721,16 @@ func (in *OverprovisionControlSpec) DeepCopy() *OverprovisionControlSpec { } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *RemoteClusterSpec) DeepCopyInto(out *RemoteClusterSpec) { +func (in *PeerInfo) DeepCopyInto(out *PeerInfo) { *out = *in - out.StorageClusterName = in.StorageClusterName } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RemoteClusterSpec. -func (in *RemoteClusterSpec) DeepCopy() *RemoteClusterSpec { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PeerInfo. +func (in *PeerInfo) DeepCopy() *PeerInfo { if in == nil { return nil } - out := new(RemoteClusterSpec) + out := new(PeerInfo) in.DeepCopyInto(out) return out } @@ -884,7 +836,7 @@ func (in *StorageClusterPeer) DeepCopyInto(out *StorageClusterPeer) { *out = *in out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - in.Spec.DeepCopyInto(&out.Spec) + out.Spec = in.Spec out.Status = in.Status } @@ -941,13 +893,6 @@ func (in *StorageClusterPeerList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *StorageClusterPeerSpec) DeepCopyInto(out *StorageClusterPeerSpec) { *out = *in - out.RemoteCluster = in.RemoteCluster - out.LocalCluster = in.LocalCluster - if in.BlockPoolMirroring != nil { - in, out := &in.BlockPoolMirroring, &out.BlockPoolMirroring - *out = new(BlockPoolMirroringSpec) - (*in).DeepCopyInto(*out) - } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new StorageClusterPeerSpec. @@ -963,6 +908,7 @@ func (in *StorageClusterPeerSpec) DeepCopy() *StorageClusterPeerSpec { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *StorageClusterPeerStatus) DeepCopyInto(out *StorageClusterPeerStatus) { *out = *in + out.PeerInfo = in.PeerInfo } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new StorageClusterPeerStatus. diff --git a/vendor/modules.txt b/vendor/modules.txt index dcce63d4..7f6dc139 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -521,7 +521,7 @@ github.com/onsi/gomega/types ## 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-20241105195130-61303bf337b6 +# github.com/openshift-kni/eco-goinfra v0.0.0-20241106135846-6ab06a3a8f4b ## explicit; go 1.23 github.com/openshift-kni/eco-goinfra/pkg/apiservers github.com/openshift-kni/eco-goinfra/pkg/argocd