kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply PKI even if addon fails

This commit is contained in:
Ole Markus With 2022-06-28 09:40:24 +02:00
parent 9a3e86ca31
commit ba67287540
2 changed files with 47 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
channels/pkg/channels/addon.go
View File

@ -23,6 +23,7 @@ import (
"fmt"
"net/url"
"go.uber.org/multierr"
"k8s.io/kops/pkg/pki"
"k8s.io/kops/util/pkg/vfs"
@ -161,44 +162,55 @@ func (a *Addon) EnsureUpdated(ctx context.Context, k8sClient kubernetes.Interfac
return nil, nil
}
var merr error
if required.NewVersion != nil {
manifestURL, err := a.GetManifestFullUrl()
err := a.updateAddon(ctx, k8sClient, pruner, required)
if err != nil {
return nil, err
}
klog.Infof("Applying update from %q", manifestURL)
// We copy the manifest to a temp file because it is likely e.g. an s3 URL, which kubectl can't read
data, err := vfs.Context.ReadFile(manifestURL.String())
if err != nil {
return nil, fmt.Errorf("error reading manifest: %w", err)
}
if err := Apply(data); err != nil {
return nil, fmt.Errorf("error applying update from %q: %w", manifestURL, err)
}
if err := pruner.Prune(ctx, data, a.Spec.Prune); err != nil {
return nil, fmt.Errorf("error pruning manifest from %q: %w", manifestURL, err)
}
if err := a.AddNeedsUpdateLabel(ctx, k8sClient, required); err != nil {
return nil, fmt.Errorf("error adding needs-update label: %v", err)
}
channel := a.buildChannel()
err = channel.SetInstalledVersion(ctx, k8sClient, a.ChannelVersion())
if err != nil {
return nil, fmt.Errorf("error applying annotation to record addon installation: %v", err)
merr = multierr.Append(merr, err)
}
}
if required.InstallPKI {
err := a.installPKI(ctx, k8sClient, cmClient)
if err != nil {
return nil, fmt.Errorf("error installing PKI: %v", err)
merr = multierr.Append(merr, err)
}
}
return required, nil
return required, merr
}
func (a *Addon) updateAddon(ctx context.Context, k8sClient kubernetes.Interface, pruner *Pruner, required *AddonUpdate) error {
manifestURL, err := a.GetManifestFullUrl()
if err != nil {
return err
}
klog.Infof("Applying update from %q", manifestURL)
// We copy the manifest to a temp file because it is likely e.g. an s3 URL, which kubectl can't read
data, err := vfs.Context.ReadFile(manifestURL.String())
if err != nil {
return fmt.Errorf("error reading manifest: %w", err)
}
if err := Apply(data); err != nil {
return fmt.Errorf("error applying update from %q: %w", manifestURL, err)
}
if err := pruner.Prune(ctx, data, a.Spec.Prune); err != nil {
return fmt.Errorf("error pruning manifest from %q: %w", manifestURL, err)
}
if err := a.AddNeedsUpdateLabel(ctx, k8sClient, required); err != nil {
return fmt.Errorf("error adding needs-update label: %v", err)
}
channel := a.buildChannel()
err = channel.SetInstalledVersion(ctx, k8sClient, a.ChannelVersion())
if err != nil {
return fmt.Errorf("error applying annotation to record addon installation: %v", err)
}
return nil
}
func (a *Addon) AddNeedsUpdateLabel(ctx context.Context, k8sClient kubernetes.Interface, required *AddonUpdate) error {

8
channels/pkg/channels/apply.go
View File

@ -45,20 +45,24 @@ func Apply(data []byte) error {
if err := os.WriteFile(localManifestFile, data, 0o600); err != nil {
return fmt.Errorf("error writing temp file: %v", err)
}
// First do an apply. This may fail when removing things from lists/arrays and required fields are not removed.
{
_, err := execKubectl("apply", "-f", localManifestFile, "--server-side", "--force-conflicts", "--field-manager=kops")
if err != nil {
klog.Errorf("failed to apply the manifest: %v", err)
}
}
// Replace will force ownership on all fields to kops. But on some k8s versions, this will fail on e.g trying to set clusterIP to "".
{
_, err := execKubectl("replace", "-f", localManifestFile, "--field-manager=kops")
if err != nil {
return fmt.Errorf("failed to replace manifest: %w", err)
klog.Errorf("failed to replace manifest: %v", err)
}
}
// Remove this one. Just to show that apply works properly after replace
// Do a final replace to ensure resources are correctly apply. This should always succeed if the addon is updated as expected.
{
_, err := execKubectl("apply", "-f", localManifestFile, "--server-side", "--force-conflicts", "--field-manager=kops")
if err != nil {