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

Support KubeOVN VPC and Subnet #1863

Merged
Merged
Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions cmd/machine-controller/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"time"

"github.com/go-logr/zapr"
kubeovnv1 "github.com/kubeovn/kube-ovn/pkg/apis/kubeovn/v1"
"github.com/prometheus/client_golang/prometheus"
"go.uber.org/zap"

Expand Down Expand Up @@ -227,6 +228,9 @@ func main() {
if err := clusterv1alpha1.AddToScheme(scheme.Scheme); err != nil {
log.Fatalw("Failed to add api to scheme", "api", clusterv1alpha1.SchemeGroupVersion, zap.Error(err))
}
if err := kubeovnv1.AddToScheme(scheme.Scheme); err != nil {
log.Fatalw("Failed to add kubeovn api to scheme", "api", clusterv1alpha1.SchemeGroupVersion, zap.Error(err))
}

cfg, err := clientcmd.BuildConfigFromFlags(masterURL, kubeconfig)
if err != nil {
Expand Down
15 changes: 11 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module k8c.io/machine-controller

go 1.22.3
go 1.22.7

toolchain go1.23.1

Expand Down Expand Up @@ -28,6 +28,7 @@ require (
github.com/gophercloud/gophercloud v1.14.0
github.com/heptiolabs/healthcheck v0.0.0-20211123025425-613501dd5deb
github.com/hetznercloud/hcloud-go/v2 v2.13.1
github.com/kubeovn/kube-ovn v1.12.26
github.com/linode/linodego v1.40.0
github.com/nutanix-cloud-native/prism-go-client v0.5.1
github.com/packethost/packngo v0.31.0
Expand All @@ -52,7 +53,7 @@ require (
k8s.io/api v0.31.1
k8s.io/apiextensions-apiserver v0.31.1
k8s.io/apimachinery v0.31.1
k8s.io/client-go v0.31.1
k8s.io/client-go v1.5.2
k8s.io/cloud-provider v0.31.1
k8s.io/klog v1.0.0
k8s.io/kubectl v0.31.1
Expand Down Expand Up @@ -114,7 +115,7 @@ require (
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
Expand Down Expand Up @@ -146,6 +147,7 @@ require (
github.com/onsi/gomega v1.34.1 // indirect
github.com/openshift/custom-resource-status v1.1.2 // indirect
github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect
github.com/ovn-org/libovsdb v0.7.0 // indirect
github.com/peterhellberg/link v1.2.0 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.59.1 // indirect
Expand Down Expand Up @@ -181,8 +183,13 @@ require (
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
k8s.io/kube-openapi v0.30.0 // indirect
kubevirt.io/controller-lifecycle-operator-sdk/api v0.2.4 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)

replace (
k8s.io/client-go v1.5.2 => k8s.io/client-go v0.31.1
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20240812233141-91dab695df6f
)
Loading