8000 modify lvscare name by Stevent-fei · Pull Request #1937 · sealerio/sealer · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

modify lvscare name #1937

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jan 16, 2023
Merged

modify lvscare name #1937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions common/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ const (
KubeLvsCareStaticPodName = "kube-lvscare"
RegLvsCareStaticPodName = "reg-lvscare"
StaticPodDir = "/etc/kubernetes/manifests"
LvsCareRepoAndTag = "sealerio/lvscare:v1.1.3-beta.8"
)

// API
Expand Down
2 changes: 1 addition & 1 deletion pkg/registry/local.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ func (c *localConfigurator) configureLvs(registryHosts, clientHosts []net.IP) er
}

//todo should make lvs image name as const value in sealer repo.
lvsImageURL := fmt.Sprintf("%s/sealer/lvscare:v1.1.3-beta.8", net.JoinHostPort(c.Domain, strconv.Itoa(c.Port)))
lvsImageURL := filepath.Join(net.JoinHostPort(c.Domain, strconv.Itoa(c.Port)), common.LvsCareRepoAndTag)

vip := common.DefaultVIP
if hosts := c.infraDriver.GetHostIPList(); len(hosts) > 0 && k8snet.IsIPv6(hosts[0]) {
Expand Down
3 changes: 2 additions & 1 deletion pkg/runtime/kubernetes/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"context"
"fmt"
"net"
"path/filepath"
"sort"
"strconv"
"strings"
Expand Down Expand Up @@ -177,7 +178,7 @@ func GetClientFromConfig(adminConfPath string) (runtimeClient.Client, error) {
}

func (k *Runtime) configureLvs(masterHosts, clientHosts []net.IP) error {
lvsImageURL := fmt.Sprintf("%s/sealer/lvscare:v1.1.3-beta.8", k.Config.RegistryInfo.URL)
lvsImageURL := filepath.Join(k.Config.RegistryInfo.URL, common.LvsCareRepoAndTag)

var rs []string
var realEndpoints []string
Expand Down
0