-
Notifications
You must be signed in to change notification settings - Fork 90
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bump kube-vip/kube-vip to latest release (#3977)
* Bump kube-vip/kube-vip to latest release * Update patches for kube-vip v0.8.5 * Update ATTRIBUTION and CHECKSUMS files for kube-vip v0.8.5 --------- Co-authored-by: Saurabh Parekh <[email protected]>
- Loading branch information
1 parent
715fa4e
commit a0db9cb
Showing
6 changed files
with
47 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,10 +23,7 @@ https://github.com/google/gnostic-models | |
** github.com/google/gofuzz; version v1.2.0 -- | ||
https://github.com/google/gofuzz | ||
|
||
** github.com/kamhlos/upnp; version v0.0.0-20210324072331-5661950dff08 -- | ||
https://github.com/kamilakis/upnp | ||
|
||
** github.com/kube-vip/kube-vip; version v0.8.4 -- | ||
** github.com/kube-vip/kube-vip; version v0.8.5 -- | ||
https://github.com/kube-vip/kube-vip | ||
|
||
** github.com/modern-go/concurrent; version v0.0.0-20180306012644-bacd9c7ef1dd -- | ||
|
@@ -53,7 +50,7 @@ https://github.com/prometheus/procfs | |
** github.com/spf13/afero; version v1.9.5 -- | ||
https://github.com/spf13/afero | ||
|
||
** github.com/spf13/cobra; version v1.8.0 -- | ||
** github.com/spf13/cobra; version v1.8.1 -- | ||
https://github.com/spf13/cobra | ||
|
||
** github.com/vishvananda/netlink; version v1.2.1-beta.2 -- | ||
|
@@ -424,6 +421,35 @@ limitations under the License. | |
|
||
------ | ||
|
||
** github.com/huin/goupnp; version v1.3.0 -- | ||
https://github.com/huin/goupnp | ||
|
||
Copyright (c) 2013, John Beisley <[email protected]> | ||
All rights reserved. | ||
|
||
Redistribution and use in source and binary forms, with or without modification, | ||
are permitted provided that the following conditions are met: | ||
|
||
* Redistributions of source code must retain the above copyright notice, this | ||
list of conditions and the following disclaimer. | ||
|
||
* Redistributions in binary form must reproduce the above copyright notice, this | ||
list of conditions and the following disclaimer in the documentation and/or | ||
other materials provided with the distribution. | ||
|
||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND | ||
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR | ||
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
||
------ | ||
|
||
** github.com/magiconair/properties; version v1.8.7 -- | ||
https://github.com/magiconair/properties | ||
|
||
|
@@ -483,7 +509,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
|
||
------ | ||
|
||
** github.com/cloudflare/ipvs; version v0.10.1 -- | ||
** github.com/cloudflare/ipvs; version v0.10.2 -- | ||
https://github.com/cloudflare/ipvs | ||
|
||
BSD 3-Clause License | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
28a483e060f8afc64f9da4b3a10540bc30e022f64f7e6f853be4bbc772cdbbbf _output/bin/kube-vip/linux-amd64/kube-vip | ||
23fe886a4f2f5b6ad6e19e2ff411a97d4ef0392b75fa8c8d4ac45af82532a8ff _output/bin/kube-vip/linux-arm64/kube-vip | ||
acaab919f109d949c02731355305bed99a90779faceee379a8ff2f39c22d43e4 _output/bin/kube-vip/linux-amd64/kube-vip | ||
2f7bf049384abded09409ad62e86dad3695ccc075b3085dc0e0f10f8c91de60d _output/bin/kube-vip/linux-arm64/kube-vip |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
v0.8.4 | ||
v0.8.5 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 8676d62c73a67e54140b9c1a5397165933c1b1fe Mon Sep 17 00:00:00 2001 | ||
From 1a918565f9b590614765a75cc71a918678df955b Mon Sep 17 00:00:00 2001 | ||
From: Abhinav Pandey <[email protected]> | ||
Date: Wed, 2 Mar 2022 16:40:11 -0800 | ||
Subject: [PATCH] use hostname instead of "kubernetes" to contact apiserver | ||
|
@@ -9,10 +9,10 @@ Subject: [PATCH] use hostname instead of "kubernetes" to contact apiserver | |
2 files changed, 5 insertions(+), 9 deletions(-) | ||
|
||
diff --git a/pkg/kubevip/config_generator.go b/pkg/kubevip/config_generator.go | ||
index 3d6e537..0fb48b1 100644 | ||
index cc06f25..4ac287f 100644 | ||
--- a/pkg/kubevip/config_generator.go | ||
+++ b/pkg/kubevip/config_generator.go | ||
@@ -557,13 +557,6 @@ func generatePodSpec(c *Config, imageVersion string, inCluster bool) *corev1.Pod | ||
@@ -590,13 +590,6 @@ func generatePodSpec(c *Config, imageVersion string, inCluster bool) *corev1.Pod | ||
}, | ||
} | ||
newManifest.Spec.Volumes = append(newManifest.Spec.Volumes, adminConfVolume) | ||
|
@@ -27,23 +27,23 @@ index 3d6e537..0fb48b1 100644 | |
|
||
if c.ProviderConfig != "" { | ||
diff --git a/pkg/manager/manager.go b/pkg/manager/manager.go | ||
index bf266c7..4d90c7a 100644 | ||
index 9b6ddc7..0d386e7 100644 | ||
--- a/pkg/manager/manager.go | ||
+++ b/pkg/manager/manager.go | ||
@@ -78,8 +78,11 @@ func New(configMap string, config *kubevip.Config) (*Manager, error) { | ||
@@ -102,8 +102,11 @@ func New(configMap string, config *kubevip.Config) (*Manager, error) { | ||
if config.DetectControlPlane { | ||
clientset, err = k8s.FindWorkingKubernetesAddress(adminConfigPath, false) | ||
clientConfig, err = k8s.FindWorkingKubernetesAddress(adminConfigPath, false) | ||
} else { | ||
- // This will attempt to use kubernetes as the hostname (this should be passed as a host alias) in the pod manifest | ||
- clientset, err = k8s.NewClientset(adminConfigPath, false, fmt.Sprintf("kubernetes:%v", config.Port)) | ||
- clientConfig, err = k8s.NewRestConfig(adminConfigPath, false, fmt.Sprintf("kubernetes:%v", config.Port)) | ||
+ hostname, err := os.Hostname() | ||
+ if err != nil { | ||
+ return nil, err | ||
+ } | ||
+ clientset, err = k8s.NewClientset(adminConfigPath, false, fmt.Sprintf("%s:%v", hostname, config.Port)) | ||
+ clientConfig, err = k8s.NewRestConfig(adminConfigPath, false, fmt.Sprintf("%s:%v", hostname, config.Port)) | ||
} | ||
} else { | ||
clientset, err = k8s.NewClientset(adminConfigPath, false, "") | ||
clientConfig, err = k8s.NewRestConfig(adminConfigPath, false, "") | ||
-- | ||
2.39.3 (Apple Git-145) | ||
2.47.0 | ||
|