Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: dependabot issues with volcano and multicluster-observability-operator #6607

Merged
merged 1 commit into from
Nov 15, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions kubernetes-model-generator/openapi/generator/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ require (
github.com/ovn-org/ovn-kubernetes/go-controller v0.0.0-20241030140127-a68ef49d9441
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.1
github.com/spf13/cobra v1.8.1
github.com/stolostron/discovery v0.0.0-20241023180217-47cd9895f600
github.com/stolostron/klusterlet-addon-controller v0.0.0-20240912124113-fe0b6574a401
github.com/stolostron/multicluster-observability-operator v1.0.1
github.com/stolostron/multiclusterhub-operator v0.0.0-20240626140553-4f1ed6be3b84
github.com/stolostron/search-v2-operator v0.0.0-20241029125341-1a376a062a45
github.com/tektoncd/pipeline v0.65.1
github.com/tektoncd/triggers v0.30.0
istio.io/client-go v1.24.0
Expand All @@ -45,10 +50,15 @@ require (
knative.dev/eventing-prometheus v0.28.0
knative.dev/networking v0.0.0-20241022012959-60e29ff520dc
knative.dev/serving v0.43.0
open-cluster-management.io/api v0.15.0
open-cluster-management.io/governance-policy-propagator v0.15.0
open-cluster-management.io/multicloud-operators-channel v0.15.0
open-cluster-management.io/multicloud-operators-subscription v0.15.0
sigs.k8s.io/cluster-api v1.8.5
sigs.k8s.io/gateway-api v1.2.0
sigs.k8s.io/kustomize/api v0.18.0
volcano.sh/apis v1.10.0
// This version is older than v1.10.0 see replacements below
volcano.sh/apis v1.19.6
)

// Required by some openshift operator dependencies
Expand All @@ -59,6 +69,7 @@ replace (
github.com/openshift/assisted-service/models => github.com/openshift/assisted-service/models v0.0.0-20241003070528-341f9860c455
github.com/openshift/hive => github.com/openshift/hive v1.1.17-0.20240930213556-2d25383963db // Latest Master
github.com/openshift/installer => github.com/openshift/installer v0.91.0 // Most up-to-date tag https://issues.redhat.com/browse/OCPBUGS-42448

k8s.io/api => k8s.io/api v0.31.1
k8s.io/client-go => k8s.io/client-go v0.31.1
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.1
Expand All @@ -67,6 +78,12 @@ replace (
k8s.io/mount-utils => k8s.io/mount-utils v0.31.1
)

// Issues with dependabot, force pseudo-versions as replacements since dependabot will try to replace with invalid tagged major versions
replace (
github.com/stolostron/multicluster-observability-operator => github.com/stolostron/multicluster-observability-operator v0.0.0-20241107140827-cef6b049dcef
volcano.sh/apis => volcano.sh/apis v1.10.0
)

replace (
// TODO: WIP while this gets merged or fixed https://github.com/chaos-mesh/chaos-mesh/pull/4525
github.com/chaos-mesh/chaos-mesh => github.com/marcnuri-forks/chaos-mesh v0.0.0-20241023085955-dbae1077f45f
Expand All @@ -82,18 +99,6 @@ replace (
k8s.io/autoscaler/vertical-pod-autoscaler => github.com/marcnuri-forks/kubernetes-autoscaler/vertical-pod-autoscaler v0.0.0-20241015073945-66b859601d68
)

require (
github.com/stolostron/discovery v0.0.0-20241023180217-47cd9895f600
github.com/stolostron/klusterlet-addon-controller v0.0.0-20240912124113-fe0b6574a401
github.com/stolostron/multicluster-observability-operator v0.0.0-20241107140827-cef6b049dcef
github.com/stolostron/multiclusterhub-operator v0.0.0-20240626140553-4f1ed6be3b84
github.com/stolostron/search-v2-operator v0.0.0-20241029125341-1a376a062a45
open-cluster-management.io/api v0.15.0
open-cluster-management.io/governance-policy-propagator v0.15.0
open-cluster-management.io/multicloud-operators-channel v0.15.0
open-cluster-management.io/multicloud-operators-subscription v0.15.0
)

require (
contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d // indirect
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
Expand Down
Loading