Skip to content

Commit

Permalink
fix: don't boot from not ready environments
Browse files Browse the repository at this point in the history
If the environment is not ready, don't boot from it, as it would fail
anyways.

Fixes #658

Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com>
  • Loading branch information
smira committed Feb 2, 2022
1 parent e44f350 commit 003f6a7
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 24 deletions.
21 changes: 21 additions & 0 deletions app/sidero-controller-manager/api/v1alpha1/environment_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,27 @@ func EnvironmentDefaultSpec(talosRelease, apiEndpoint string, apiPort uint16) *E
}
}

// IsReady returns aggregated Environment readiness.
func (env *Environment) IsReady() bool {
assetURLs := map[string]struct{}{}

if env.Spec.Kernel.URL != "" {
assetURLs[env.Spec.Kernel.URL] = struct{}{}
}

if env.Spec.Initrd.URL != "" {
assetURLs[env.Spec.Initrd.URL] = struct{}{}
}

for _, cond := range env.Status.Conditions {
if cond.Status == "True" && cond.Type == "Ready" {
delete(assetURLs, cond.URL)
}
}

return len(assetURLs) == 0
}

func init() {
SchemeBuilder.Register(&Environment{}, &EnvironmentList{})
}
9 changes: 9 additions & 0 deletions app/sidero-controller-manager/internal/ipxe/ipxe_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,15 @@ func ipxeHandler(w http.ResponseWriter, r *http.Request) {
return
}

if !env.IsReady() {
log.Printf("Environment not ready: %q", env.Name)

w.WriteHeader(http.StatusPreconditionFailed)
fmt.Fprintf(w, "environment %q is not ready", env.Name)

return
}

if server != nil {
log.Printf("Using %q environment for %q", env.Name, server.Name)
} else {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ require (
k8s.io/apimachinery v0.22.2
k8s.io/client-go v0.22.2
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
sigs.k8s.io/cluster-api v1.0.2
sigs.k8s.io/cluster-api v1.0.3
sigs.k8s.io/controller-runtime v0.10.3
)

Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1306,8 +1306,8 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
sigs.k8s.io/cluster-api v1.0.0/go.mod h1:V230kMSaYENTUcx1QRkoRCklb3vfphQGV3/z4ODNGWo=
sigs.k8s.io/cluster-api v1.0.2 h1:V2pzMUfyVv29vf6q5RVLuPIp8PAcnLYcBcH9bzoMDLY=
sigs.k8s.io/cluster-api v1.0.2/go.mod h1:/LkJXtsvhxTV4U0z1Y2Y1Gr2xebJ0/ce09Ab2M0XU/U=
sigs.k8s.io/cluster-api v1.0.3 h1:unJqMUG5LJ312kgHSAnBzfYazbGCcGkTcdGD3lF459k=
sigs.k8s.io/cluster-api v1.0.3/go.mod h1:/LkJXtsvhxTV4U0z1Y2Y1Gr2xebJ0/ce09Ab2M0XU/U=
sigs.k8s.io/controller-runtime v0.10.2/go.mod h1:CQp8eyUQZ/Q7PJvnIrB6/hgfTC1kBkGylwsLgOQi1WY=
sigs.k8s.io/controller-runtime v0.10.3 h1:s5Ttmw/B4AuIbwrXD3sfBkXwnPMMWrqpVj4WRt1dano=
sigs.k8s.io/controller-runtime v0.10.3/go.mod h1:CQp8eyUQZ/Q7PJvnIrB6/hgfTC1kBkGylwsLgOQi1WY=
Expand Down
3 changes: 3 additions & 0 deletions hack/scripts/generate-clusterctl-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,7 @@ providers:
- name: "sidero"
url: "file://${COMPONENTS_YAML}"
type: "InfrastructureProvider"
# temporary, see https://github.com/kubernetes-sigs/cluster-api/issues/6051
cert-manager:
url: "https://github.com/cert-manager/cert-manager/releases/latest/cert-manager.yaml"
EOF
2 changes: 1 addition & 1 deletion sfyra/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1998,7 +1998,7 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyz
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25/go.mod h1:Mlj9PNLmG9bZ6BHFwFKDo5afkpWyUISkb9Me0GnK66I=
sigs.k8s.io/cluster-api v1.0.0/go.mod h1:V230kMSaYENTUcx1QRkoRCklb3vfphQGV3/z4ODNGWo=
sigs.k8s.io/cluster-api v1.0.2/go.mod h1:/LkJXtsvhxTV4U0z1Y2Y1Gr2xebJ0/ce09Ab2M0XU/U=
sigs.k8s.io/cluster-api v1.0.3/go.mod h1:/LkJXtsvhxTV4U0z1Y2Y1Gr2xebJ0/ce09Ab2M0XU/U=
sigs.k8s.io/cluster-api v1.1.0-beta.1 h1:dZGWFvtpdLCX6wLjyEhqBPVFK3nXw7oBWpAl9meL/Gk=
sigs.k8s.io/cluster-api v1.1.0-beta.1/go.mod h1:JpsmFqu0BWtKjJMNR+su+MDxozXLAp6daMpAXYAb+78=
sigs.k8s.io/controller-runtime v0.10.2/go.mod h1:CQp8eyUQZ/Q7PJvnIrB6/hgfTC1kBkGylwsLgOQi1WY=
Expand Down
2 changes: 1 addition & 1 deletion sfyra/pkg/tests/compatibility.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func TestCompatibilityCluster(ctx context.Context, metalClient client.Client, cl
return err
}

if !isEnvironmentReady(&environment) {
if !environment.IsReady() {
return retry.ExpectedErrorf("some assets are not ready")
}

Expand Down
23 changes: 4 additions & 19 deletions sfyra/pkg/tests/environment.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,28 +25,13 @@ import (

const environmentName = "sfyra"

func isEnvironmentReady(env *v1alpha1.Environment) bool {
assetURLs := map[string]struct{}{
env.Spec.Kernel.URL: {},
env.Spec.Initrd.URL: {},
}

for _, cond := range env.Status.Conditions {
if cond.Status == "True" && cond.Type == "Ready" {
delete(assetURLs, cond.URL)
}
}

return len(assetURLs) == 0
}

// TestEnvironmentDefault verifies environment "default".
func TestEnvironmentDefault(ctx context.Context, metalClient client.Client, cluster talos.Cluster, kernelURL, initrdURL string) TestFunc {
return func(t *testing.T) {
var environment v1alpha1.Environment
err := metalClient.Get(ctx, types.NamespacedName{Name: v1alpha1.EnvironmentDefault}, &environment)
require.NoError(t, err)
assert.True(t, isEnvironmentReady(&environment))
assert.True(t, environment.IsReady())

// delete environment to see it being recreated
err = metalClient.Delete(ctx, &environment)
Expand All @@ -61,14 +46,14 @@ func TestEnvironmentDefault(ctx context.Context, metalClient client.Client, clus
return err
}

if !isEnvironmentReady(&environment) {
if !environment.IsReady() {
return retry.ExpectedErrorf("some assets are not ready")
}

return nil
})
require.NoError(t, err)
assert.True(t, isEnvironmentReady(&environment))
assert.True(t, environment.IsReady())
}
}

Expand Down Expand Up @@ -109,7 +94,7 @@ func TestEnvironmentCreate(ctx context.Context, metalClient client.Client, clust
return err
}

if !isEnvironmentReady(&environment) {
if !environment.IsReady() {
return retry.ExpectedErrorf("some assets are not ready")
}

Expand Down

0 comments on commit 003f6a7

Please sign in to comment.