Skip to content
This repository has been archived by the owner on Apr 7, 2020. It is now read-only.

Commit

Permalink
Fix build by vendoring calico extension
Browse files Browse the repository at this point in the history
  • Loading branch information
rfranzke committed Jan 29, 2020
1 parent 95b9092 commit e879ddb
Show file tree
Hide file tree
Showing 92 changed files with 2,518 additions and 89 deletions.
2 changes: 1 addition & 1 deletion controllers/provider-azure/pkg/webhook/network/add.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
package network

import (
"github.com/gardener/gardener-extensions/controllers/networking-calico/pkg/calico"
"github.com/gardener/gardener-extensions/controllers/provider-azure/pkg/azure"
extensionswebhook "github.com/gardener/gardener-extensions/pkg/webhook"
"github.com/gardener/gardener-extensions/pkg/webhook/network"

"github.com/gardener/gardener-extension-networking-calico/pkg/calico"
extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
"k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/controller-runtime/pkg/log"
Expand Down
4 changes: 2 additions & 2 deletions controllers/provider-azure/pkg/webhook/network/mutate.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
package network

import (
calicov1alpha1 "github.com/gardener/gardener-extensions/controllers/networking-calico/pkg/apis/calico/v1alpha1"
"github.com/gardener/gardener-extensions/controllers/networking-calico/pkg/controller"
extensionswebhook "github.com/gardener/gardener-extensions/pkg/webhook"

calicov1alpha1 "github.com/gardener/gardener-extension-networking-calico/pkg/apis/calico/v1alpha1"
"github.com/gardener/gardener-extension-networking-calico/pkg/controller"
extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
10 changes: 3 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ require (
github.com/aliyun/alibaba-cloud-sdk-go v1.60.340
github.com/aliyun/aliyun-oss-go-sdk v2.0.1+incompatible
github.com/aws/aws-sdk-go v1.21.10
github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f
github.com/gardener/gardener v0.35.1-0.20200128130120-5b69a02f511a
github.com/gardener/gardener-extension-networking-calico v0.0.0-20200129184310-ca90704ba78e
github.com/gardener/gardener-resource-manager v0.9.1-0.20200124091350-6ea41bbae81f
github.com/gardener/machine-controller-manager v0.25.1-0.20200115123605-0510de7ddfca // master
github.com/go-logr/logr v0.1.0
Expand All @@ -24,9 +24,8 @@ require (
github.com/gophercloud/gophercloud v0.7.0
github.com/gophercloud/utils v0.0.0-20190527093828-25f1b77b8c03
github.com/huandu/xstrings v1.3.0
github.com/json-iterator/go v1.1.9 // indirect
github.com/onsi/ginkgo v1.8.0
github.com/onsi/gomega v1.5.0
github.com/onsi/ginkgo v1.10.1
github.com/onsi/gomega v1.7.0
github.com/packethost/packngo v0.0.0-20181217122008-b3b45f1b4979
github.com/pkg/errors v0.8.1
github.com/sirupsen/logrus v1.4.2
Expand All @@ -36,9 +35,6 @@ require (
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
gomodules.xyz/jsonpatch/v2 v2.0.1
google.golang.org/api v0.9.0
google.golang.org/grpc v1.23.1 // indirect
gopkg.in/ini.v1 v1.51.1 // indirect
gopkg.in/yaml.v2 v2.2.7
k8s.io/api v0.0.0-20191010143144-fbf594f18f80
k8s.io/apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783
k8s.io/apimachinery v0.0.0-20191016060620-86f2f1b9c076
Expand Down
7 changes: 7 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,9 @@ github.com/gardener/external-dns-management v0.0.0-20190927090840-6659f5a46d13 h
github.com/gardener/external-dns-management v0.0.0-20190927090840-6659f5a46d13/go.mod h1:Y3om11E865x4aQ7cmcHjknb8RMgCO153huRb/SvP+9o=
github.com/gardener/gardener v0.35.1-0.20200128130120-5b69a02f511a h1:rLj4qh4PWFtlGo4PWjC4Mbovp9tQZjcHDoRrNcSdHK4=
github.com/gardener/gardener v0.35.1-0.20200128130120-5b69a02f511a/go.mod h1:cu4WkHhpM9JLvqx76qSViagsPO4UH9Qx5i0h3AEIdiE=
github.com/gardener/gardener-extension-networking-calico v0.0.0-20200129184310-ca90704ba78e h1:qoYA1gs9+Sv1C8N9IMp9S/fa9fEaHfLYffrFX/f+2Vo=
github.com/gardener/gardener-extension-networking-calico v0.0.0-20200129184310-ca90704ba78e/go.mod h1:IY4O46FVVDcmmlTwTP8keIiD5G+4HRm+oMhKQ64Mdv4=
github.com/gardener/gardener-extensions v1.2.1-0.20200129183102-afdd6bad562a/go.mod h1:qJHM2NaRCdCBKjnvWXpixWBq1866kqZR76kA7edk8I4=
github.com/gardener/gardener-resource-manager v0.9.1-0.20200124091350-6ea41bbae81f h1:kaJJ2j6/uHTt6tDQiDO25HOq6Uit6Hu31hu47HfY/Lw=
github.com/gardener/gardener-resource-manager v0.9.1-0.20200124091350-6ea41bbae81f/go.mod h1:0pKTHOhvU91eQB0EYr/6Ymd7lXc/5Hi8P8tF/gpV0VQ=
github.com/gardener/hvpa-controller v0.0.0-20191014062307-fad3bdf06a25 h1:nOFITmV7vt4fcYPEXgj66Qs83FdDEMvL/LQcR0diRRE=
Expand Down Expand Up @@ -398,11 +401,15 @@ github.com/onsi/ginkgo v1.4.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w=
github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo=
github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
github.com/onsi/gomega v1.3.0/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
github.com/onsi/gomega v1.4.2/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME=
github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/packethost/packngo v0.0.0-20181217122008-b3b45f1b4979 h1:Ts8y7YbUMuHPAerXDOpnZWr7TeV2b3oTzKa6rP0erow=
github.com/packethost/packngo v0.0.0-20181217122008-b3b45f1b4979/go.mod h1:otzZQXgoO96RTzDB/Hycg0qZcXZsWJGJRSXbmEIJ+4M=
github.com/pborman/uuid v0.0.0-20170612153648-e790cca94e6c/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34=
Expand Down
Loading

0 comments on commit e879ddb

Please sign in to comment.