Skip to content

Commit

Permalink
Merge pull request #237 from vbnrh/update-storageclusterpeer-api
Browse files Browse the repository at this point in the history
Update deps for OCS and changes to StorageClusterPeer creation
  • Loading branch information
openshift-merge-bot[bot] authored Nov 12, 2024
2 parents 8c27440 + ccbc9cf commit f183d8a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
8 changes: 2 additions & 6 deletions controllers/mirrorpeer_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -313,12 +313,8 @@ func createStorageClusterPeer(ctx context.Context, client client.Client, logger
Namespace: currentClient.ProviderInfo.NamespacedName.Namespace,
},
Spec: ocsv1.StorageClusterPeerSpec{
RemoteCluster: ocsv1.RemoteClusterSpec{
OnboardingTicket: onboardingToken,
ApiEndpoint: oppositeClient.ProviderInfo.StorageProviderEndpoint,
StorageClusterName: ocsv1.NamespacedName{Name: oppositeClient.ProviderInfo.NamespacedName.Name, Namespace: oppositeClient.ProviderInfo.NamespacedName.Namespace},
},
LocalCluster: ocsv1.LocalClusterSpec{Name: corev1.LocalObjectReference{Name: currentClient.ProviderInfo.NamespacedName.Name}},
OnboardingToken: onboardingToken,
ApiEndpoint: oppositeClient.ProviderInfo.StorageProviderEndpoint,
},
}
storageClusterPeerJson, err := json.Marshal(storageClusterPeer)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require (
github.com/openshift/api v0.0.0-20240828125535-01b3675ba7b3
github.com/openshift/library-go v0.0.0-20240124134907-4dfbf6bc7b11
github.com/ramendr/ramen/api v0.0.0-20241001141243-29d6f22ad237
github.com/red-hat-storage/ocs-operator/api/v4 v4.0.0-20241001184356-b1c7177e28a6
github.com/red-hat-storage/ocs-operator/api/v4 v4.0.0-20241111204837-199e115469a1
github.com/rook/rook/pkg/apis v0.0.0-20240828225153-88eab510dd2b
github.com/spf13/cobra v1.8.1
github.com/stolostron/multicloud-operators-foundation v0.0.0-20220824091202-e9cd9710d009
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -731,8 +731,8 @@ github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoG
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
github.com/ramendr/ramen/api v0.0.0-20241001141243-29d6f22ad237 h1:ig6ePD0yopC5Qi5BRmhsIsKaOkdsGXTSmG3HTYIpquo=
github.com/ramendr/ramen/api v0.0.0-20241001141243-29d6f22ad237/go.mod h1:nO6VM/+PEhcPGyFIQJdhY6ip822cA61PAy/s6IjenAA=
github.com/red-hat-storage/ocs-operator/api/v4 v4.0.0-20241001184356-b1c7177e28a6 h1:0aR9oHiLY8+SGN0Gg/SPJ/QROTHUZsfULXCerzkxehI=
github.com/red-hat-storage/ocs-operator/api/v4 v4.0.0-20241001184356-b1c7177e28a6/go.mod h1:fcFoM7FdQba/2m0CecUGNu38JaTt8quRKXhCqt8C3Jg=
github.com/red-hat-storage/ocs-operator/api/v4 v4.0.0-20241111204837-199e115469a1 h1:3fZJ6LVBgriKYuhBCSz0X5wYuyivcxhrbG9XaMhUt3M=
github.com/red-hat-storage/ocs-operator/api/v4 v4.0.0-20241111204837-199e115469a1/go.mod h1:fcFoM7FdQba/2m0CecUGNu38JaTt8quRKXhCqt8C3Jg=
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc=
Expand Down

0 comments on commit f183d8a

Please sign in to comment.