mirrors/talos
1
0
Fork 0
mirror of https://github.com/siderolabs/talos.git synced 2025-11-05 10:51:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: ignore 404 for AWS external IPs

Browse Source 
Also ignore expected errors for other platforms to keep controller from
failing over and over again.

Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com>
This commit is contained in:
Andrey Smirnov 2021-09-30 16:35:57 +03:00
parent 44a63e9a4d
commit d52befd1ac
No known key found for this signature in database
GPG Key ID: 7B26396447AB6DFD
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/app/machined/pkg/controllers/network/platform_config.go
View File

@ -6,6 +6,7 @@ package network
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/controller"
@ -14,6 +15,7 @@ import (
"inet.af/netaddr" "inet.af/netaddr"
v1alpha1runtime "github.com/talos-systems/talos/internal/app/machined/pkg/runtime" v1alpha1runtime "github.com/talos-systems/talos/internal/app/machined/pkg/runtime"
platformerrors "github.com/talos-systems/talos/internal/app/machined/pkg/runtime/v1alpha1/platform/errors"
"github.com/talos-systems/talos/pkg/machinery/nethelpers" "github.com/talos-systems/talos/pkg/machinery/nethelpers"
"github.com/talos-systems/talos/pkg/resources/network" "github.com/talos-systems/talos/pkg/resources/network"
) )
@ -68,8 +70,10 @@ func (ctrl *PlatformConfigController) Run(ctx context.Context, r controller.Runt
// platform is fetched only once (but controller might fail and restart if fetching platform fails) // platform is fetched only once (but controller might fail and restart if fetching platform fails)
hostname, err := ctrl.V1alpha1Platform.Hostname(ctx) hostname, err := ctrl.V1alpha1Platform.Hostname(ctx)
if err != nil { if err != nil {
if !errors.Is(err, platformerrors.ErrNoHostname) {
return fmt.Errorf("error getting hostname: %w", err) return fmt.Errorf("error getting hostname: %w", err)
} }
}
if len(hostname) > 0 { if len(hostname) > 0 {
id := network.LayeredID(network.ConfigPlatform, network.HostnameID) id := network.LayeredID(network.ConfigPlatform, network.HostnameID)
@ -89,8 +93,10 @@ func (ctrl *PlatformConfigController) Run(ctx context.Context, r controller.Runt
externalIPs, err := ctrl.V1alpha1Platform.ExternalIPs(ctx) externalIPs, err := ctrl.V1alpha1Platform.ExternalIPs(ctx)
if err != nil { if err != nil {
if !errors.Is(err, platformerrors.ErrNoExternalIPs) {
return fmt.Errorf("error getting external IPs: %w", err) return fmt.Errorf("error getting external IPs: %w", err)
} }
}
touchedIDs := make(map[resource.ID]struct{}) touchedIDs := make(map[resource.ID]struct{})

6
internal/app/machined/pkg/runtime/v1alpha1/platform/aws/aws.go
View File

@ -194,8 +194,12 @@ func (a *AWS) ExternalIPs(ctx context.Context) (addrs []net.IP, err error) {
//nolint:errcheck //nolint:errcheck
defer resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode == http.StatusNotFound {
return nil, nil
}
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
return addrs, fmt.Errorf("failed to retrieve external addresses for instance") return addrs, fmt.Errorf("failed to retrieve external addresses for instance: %d", resp.StatusCode)
} }
if body, err = ioutil.ReadAll(resp.Body); err != nil { if body, err = ioutil.ReadAll(resp.Body); err != nil {

2
internal/app/machined/pkg/runtime/v1alpha1/platform/gcp/gcp.go
View File

@ -80,7 +80,7 @@ func (g *GCP) ExternalIPs(ctx context.Context) (addrs []net.IP, err error) {
defer resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
return addrs, fmt.Errorf("failed to retrieve external addresses for instance") return addrs, fmt.Errorf("failed to retrieve external addresses for instance: %d", resp.StatusCode)
} }
type metadata []struct { type metadata []struct {

4
internal/app/machined/pkg/runtime/v1alpha1/platform/scaleway/scaleway.go
View File

@ -127,8 +127,8 @@ func (s *Scaleway) Hostname(ctx context.Context) (hostname []byte, err error) {
log.Printf("fetching hostname from: %q", ScalewayMetadataEndpoint) log.Printf("fetching hostname from: %q", ScalewayMetadataEndpoint)
metadataDl, err := download.Download(ctx, ScalewayMetadataEndpoint, metadataDl, err := download.Download(ctx, ScalewayMetadataEndpoint,
download.WithErrorOnNotFound(errors.ErrNoExternalIPs), download.WithErrorOnNotFound(errors.ErrNoHostname),
download.WithErrorOnEmptyResponse(errors.ErrNoExternalIPs)) download.WithErrorOnEmptyResponse(errors.ErrNoHostname))
if err != nil { if err != nil {
return nil, err return nil, err
} }