Skip to content

Commit 095596f

Browse files
rsmittytalos-bot
authored andcommitted
chore: update to new talos modules
This PR pulls in the new machinery and crypto packages instead of having to pull in the whole talos repo! Signed-off-by: Spencer Smith <[email protected]>
1 parent 7dde1cb commit 095596f

File tree

4 files changed

+61
-204
lines changed

4 files changed

+61
-204
lines changed

controllers/secrets.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020

2121
bootstrapv1alpha2 "github.com/talos-systems/cluster-api-bootstrap-provider-talos/api/v1alpha2"
2222
bootstrapv1alpha3 "github.com/talos-systems/cluster-api-bootstrap-provider-talos/api/v1alpha3"
23-
"github.com/talos-systems/talos/pkg/config/types/v1alpha1/generate"
24-
"github.com/talos-systems/talos/pkg/crypto/x509"
23+
"github.com/talos-systems/crypto/x509"
24+
"github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/generate"
2525
"gopkg.in/yaml.v2"
2626
corev1 "k8s.io/api/core/v1"
2727
k8serrors "k8s.io/apimachinery/pkg/api/errors"

controllers/talosconfig_controller.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424

2525
"github.com/go-logr/logr"
2626
bootstrapv1alpha3 "github.com/talos-systems/cluster-api-bootstrap-provider-talos/api/v1alpha3"
27-
configmachine "github.com/talos-systems/talos/pkg/config/machine"
28-
"github.com/talos-systems/talos/pkg/config/types/v1alpha1"
29-
"github.com/talos-systems/talos/pkg/config/types/v1alpha1/generate"
27+
"github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1"
28+
"github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/generate"
29+
configmachine "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine"
3030
"gopkg.in/yaml.v2"
3131
apierrors "k8s.io/apimachinery/pkg/api/errors"
3232
k8serrors "k8s.io/apimachinery/pkg/api/errors"
@@ -265,7 +265,7 @@ func (r *TalosConfigReconciler) genConfigs(ctx context.Context, scope *TalosConf
265265
retBundle := &TalosConfigBundle{}
266266

267267
// Determine what type of node this is
268-
machineType := configmachine.TypeWorker
268+
machineType := configmachine.TypeJoin
269269
switch scope.Config.Spec.GenerateType {
270270
case "init":
271271
machineType = configmachine.TypeInit

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ require (
88
github.com/go-logr/logr v0.1.0
99
github.com/onsi/ginkgo v1.12.0
1010
github.com/onsi/gomega v1.9.0
11-
github.com/talos-systems/talos v0.4.0
11+
github.com/talos-systems/crypto v0.2.0
12+
github.com/talos-systems/talos/pkg/machinery v0.0.0-20200817172914-fca19cb8be2e
1213
gopkg.in/yaml.v2 v2.2.8
1314
k8s.io/api v0.18.2
1415
k8s.io/apimachinery v0.18.2

0 commit comments

Comments
 (0)