Original file line number	Diff line number	Diff line change
Expand Up		@@ -169,10 +169,11 @@ func (b Backup) removeFinalizerOfPeriodicBackup(eb api.EtcdBackup) error {

		func (b Backup) periodicRunnerFunc(ctx context.Context, t time.Ticker, eb *api.EtcdBackup) {
		defer t.Stop()
	periodicRunnerFunc:
		for {
		select {
		case <-ctx.Done():
	break
	break periodicRunnerFunc
		case <-t.C:
		var latestEb *api.EtcdBackup
		var bs *api.BackupStatus
Expand All		@@ -184,7 +185,7 @@ func (b Backup) periodicRunnerFunc(ctx context.Context, t time.Ticker, eb *api
		if apierrors.IsNotFound(err) {
		b.logger.Infof("Could not find EtcdBackup. Stopping periodic backup for EtcdBackup CR %v",
		eb.Name)
	break
	break periodicRunnerFunc
		}
		b.logger.Warningf("[Attempt: %d/%d] Failed to get latest EtcdBackup %v : (%v)",
		i, retryLimit, eb.Name, err)
Expand Down

10 changes: 7 additions & 3 deletions pkg/util/etcdutil/member.go

Show comments View file Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -38,13 +38,17 @@ type Member struct {
		ClusterDomain string
		}

	func (m *Member) Addr() string {
	func (m *Member) ClientAddr() string {
	return fmt.Sprintf("%s-client.%s.svc%s", clusterNameFromMemberName(m.Name), m.Namespace, m.ClusterDomain)
	}

	func (m *Member) PeerAddr() string {
		return fmt.Sprintf("%s.%s.%s.svc%s", m.Name, clusterNameFromMemberName(m.Name), m.Namespace, m.ClusterDomain)
		}

		// ClientURL is the client URL for this member
		func (m *Member) ClientURL() string {
	return fmt.Sprintf("%s://%s:2379", m.clientScheme(), m.Addr())
	return fmt.Sprintf("%s://%s:2379", m.clientScheme(), m.ClientAddr())
		}

		func (m *Member) clientScheme() string {
Expand All		@@ -69,7 +73,7 @@ func (m *Member) ListenPeerURL() string {
		}

		func (m *Member) PeerURL() string {
	return fmt.Sprintf("%s://%s:2380", m.peerScheme(), m.Addr())
	return fmt.Sprintf("%s://%s:2380", m.peerScheme(), m.PeerAddr())
		}

		type MemberSet map[string]*Member
Expand Down

2 changes: 1 addition & 1 deletion pkg/util/k8sutil/k8sutil.go

Show comments View file Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -388,7 +388,7 @@ func newEtcdPod(m *etcdutil.Member, initialCluster []string, clusterName, state,
		exit 1
		fi
		sleep 1
	done`, DNSTimeout, m.Addr())},
	done`, DNSTimeout, m.PeerAddr())},
		}},
		Containers: []v1.Container{container},
		RestartPolicy: v1.RestartPolicyNever,
Expand Down

Navigation Menu

Search code, repositories, users, issues, pull requests...