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.

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

NO-ISSUE: cleanup etcd member update from lca as it was moved to recert #656

Merged
merged 1 commit into from
Sep 19, 2024
Merged

NO-ISSUE: cleanup etcd member update from lca as it was moved to recert #656

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
38 changes: 2 additions & 36 deletions lca-cli/postpivot/postpivot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ import (

cp "github.com/otiai10/copy"
"github.com/sirupsen/logrus"
etcdClient "go.etcd.io/etcd/client/v3"
omertuc marked this conversation as resolved.
Show resolved Hide resolved
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
Expand Down Expand Up @@ -245,7 +244,7 @@ func (p *PostPivot) recert(ctx context.Context, seedReconfiguration *clusterconf
err := p.ops.RecertFullFlow(seedClusterInfo.RecertImagePullSpec, p.authFile,
path.Join(p.workingDir, recert.RecertConfigFile),
nil,
func() error { return p.postRecertCommands(ctx, seedReconfiguration) },
func() error { return p.postRecertCommands() },
"-v", fmt.Sprintf("%s:%s", p.workingDir, p.workingDir))
if err != nil {
return fmt.Errorf("failed recert full flow: %w", err)
Expand Down Expand Up @@ -355,46 +354,13 @@ func (p *PostPivot) setProxyAndProxyStatus(seedReconfig *clusterconfig_api.SeedR
return nil
}

func (p *PostPivot) etcdPostPivotOperations(ctx context.Context, reconfigurationInfo *clusterconfig_api.SeedReconfiguration) error {
p.log.Info("Start running etcd post pivot operations")
cli, err := etcdClient.New(etcdClient.Config{
Endpoints: []string{common.EtcdDefaultEndpoint},
DialTimeout: 5 * time.Second,
})
if err != nil {
return fmt.Errorf("failed start new etcd client: %w", err)
}
defer cli.Close()

newEtcdIp := reconfigurationInfo.NodeIP
if utils.IsIpv6(newEtcdIp) {
newEtcdIp = fmt.Sprintf("[%s]", newEtcdIp)
}

members, err := cli.MemberList(ctx)
if err != nil {
return fmt.Errorf("failed to get etcd members list")
}
_, err = cli.MemberUpdate(ctx, members.Members[0].ID, []string{fmt.Sprintf("https://%s:2380", newEtcdIp)})
if err != nil {
return fmt.Errorf("failed to change etcd peer url, err: %w", err)
}

return nil
}

func (p *PostPivot) postRecertCommands(ctx context.Context, clusterInfo *clusterconfig_api.SeedReconfiguration) error {
func (p *PostPivot) postRecertCommands() error {
// changing seed ip to new ip in all static pod files
_, err := p.ops.RunBashInHostNamespace("update-ca-trust")
if err != nil {
return fmt.Errorf("failed to run update-ca-trust after recert: %w", err)
}

//// TODO: remove after https://issues.redhat.com/browse/ETCD-503
if err := p.etcdPostPivotOperations(ctx, clusterInfo); err != nil {
return fmt.Errorf("failed to run post pivot etcd operations, err: %w", err)
}

return nil
}

Expand Down