Merge pull request #5 from rsmitty/master

rsmitty · web-flow · commit cd237c9bb3ed · 2019-11-05T15:13:03.000-05:00
fix: better secret detection and update talos
diff --git a/controllers/secrets.go b/controllers/secrets.go
@@ -41,21 +41,21 @@ func (r *TalosConfigReconciler) fetchInputSecret(ctx context.Context, config *bo
 	return inputSecret, nil
 }
 
-func (r *TalosConfigReconciler) writeInputSecret(ctx context.Context, config *bootstrapv1alpha2.TalosConfig, clusterName string, input *generate.Input) error {
+func (r *TalosConfigReconciler) writeInputSecret(ctx context.Context, config *bootstrapv1alpha2.TalosConfig, clusterName string, input *generate.Input) (*corev1.Secret, error) {
 
 	certMarshal, err := yaml.Marshal(input.Certs)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	kubeTokenMarshal, err := yaml.Marshal(input.KubeadmTokens)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	trustdInfoMarshal, err := yaml.Marshal(input.TrustdInfo)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	certSecret := &corev1.Secret{
@@ -72,7 +72,7 @@ func (r *TalosConfigReconciler) writeInputSecret(ctx context.Context, config *bo
 
 	err = r.Client.Create(ctx, certSecret)
 	if err != nil {
-		return err
+		return nil, err
 	}
-	return nil
+	return certSecret, nil
 }
diff --git a/controllers/talosconfig_controller.go b/controllers/talosconfig_controller.go
@@ -148,7 +148,7 @@ func (r *TalosConfigReconciler) Reconcile(req ctrl.Request) (_ ctrl.Result, rerr
 
 	inputSecret, err := r.fetchInputSecret(ctx, config, cluster.ObjectMeta.Name)
 	if machineType == generate.TypeInit && k8serrors.IsNotFound(err) {
-		err = r.writeInputSecret(ctx, config, cluster.ObjectMeta.Name, input)
+		inputSecret, err = r.writeInputSecret(ctx, config, cluster.ObjectMeta.Name, input)
 		if err != nil {
 			return ctrl.Result{}, err
 		}
diff --git a/go.mod b/go.mod
@@ -6,10 +6,10 @@ require (
 	github.com/go-logr/logr v0.1.0
 	github.com/onsi/ginkgo v1.8.0
 	github.com/onsi/gomega v1.5.0
-	github.com/talos-systems/talos v0.3.0-alpha.4
-	gopkg.in/yaml.v2 v2.2.2
-	k8s.io/api v0.0.0-20190918195907-bd6ac527cfd2
-	k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
+	github.com/talos-systems/talos v0.3.0-alpha.5
+	gopkg.in/yaml.v2 v2.2.4
+	k8s.io/api v0.0.0-20191016110408-35e52d86657a
+	k8s.io/apimachinery v0.0.0-20191004115801-a2eda9f80ab8
 	k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
 	sigs.k8s.io/cluster-api v0.2.5
 	sigs.k8s.io/controller-runtime v0.3.0
diff --git a/go.sum b/go.sum
@@ -260,6 +260,10 @@ github.com/talos-systems/talos v0.3.0-alpha.1.0.20191016174505-d0111fe617bb h1:b
 github.com/talos-systems/talos v0.3.0-alpha.1.0.20191016174505-d0111fe617bb/go.mod h1:22KcKkZ3l69bN1STZ4g4dzs3FapgnFxnNY8xEQOK694=
 github.com/talos-systems/talos v0.3.0-alpha.4 h1:eCIAjzji5cCgIpD8HxWu8qGPnj1gA+y2jEpvfR1vIWg=
 github.com/talos-systems/talos v0.3.0-alpha.4/go.mod h1:22KcKkZ3l69bN1STZ4g4dzs3FapgnFxnNY8xEQOK694=
+github.com/talos-systems/talos v0.3.0-alpha.5 h1:lH8azTDAukRyZI1zENww1IBW93u1pIn2wfeuikziwDM=
+github.com/talos-systems/talos v0.3.0-alpha.5/go.mod h1:o2aQ668ToodnHREccDTZi6dVxKHRmr0vlcsCDVHkn7Q=
+github.com/talos-systems/talos v0.3.0-alpha.5.0.20191105183433-4b3cc34ab044 h1:gi+hLvwB0oGPKi165T4fliiui42m3ReF+QfxmvXGx1s=
+github.com/talos-systems/talos v0.3.0-alpha.5.0.20191105183433-4b3cc34ab044/go.mod h1:o2aQ668ToodnHREccDTZi6dVxKHRmr0vlcsCDVHkn7Q=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/u-root/u-root v6.0.0+incompatible/go.mod h1:RYkpo8pTHrNjW08opNd/U6p/RJE7K0D8fXO0d47+3YY=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
@@ -394,6 +398,7 @@ gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

Original file line number	Diff line number	Diff line change
`@@ -41,21 +41,21 @@ func (r TalosConfigReconciler) fetchInputSecret(ctx context.Context, config bo`
`41`	`41`	`return inputSecret, nil`
`42`	`42`	`}`
`43`	`43`
`44`		`-func (r TalosConfigReconciler) writeInputSecret(ctx context.Context, config bootstrapv1alpha2.TalosConfig, clusterName string, input *generate.Input) error {`
	`44`	`+func (r TalosConfigReconciler) writeInputSecret(ctx context.Context, config bootstrapv1alpha2.TalosConfig, clusterName string, input generate.Input) (corev1.Secret, error) {`
`45`	`45`
`46`	`46`	`certMarshal, err := yaml.Marshal(input.Certs)`
`47`	`47`	`if err != nil {`
`48`		`- return err`
	`48`	`+ return nil, err`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`kubeTokenMarshal, err := yaml.Marshal(input.KubeadmTokens)`
`52`	`52`	`if err != nil {`
`53`		`- return err`
	`53`	`+ return nil, err`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`trustdInfoMarshal, err := yaml.Marshal(input.TrustdInfo)`
`57`	`57`	`if err != nil {`
`58`		`- return err`
	`58`	`+ return nil, err`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`certSecret := &corev1.Secret{`
`@@ -72,7 +72,7 @@ func (r TalosConfigReconciler) writeInputSecret(ctx context.Context, config bo`
`72`	`72`
`73`	`73`	`err = r.Client.Create(ctx, certSecret)`
`74`	`74`	`if err != nil {`
`75`		`- return err`
	`75`	`+ return nil, err`
`76`	`76`	`}`
`77`		`- return nil`
	`77`	`+ return certSecret, nil`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ func (r *TalosConfigReconciler) Reconcile(req ctrl.Request) (_ ctrl.Result, rerr`
`148`	`148`
`149`	`149`	`inputSecret, err := r.fetchInputSecret(ctx, config, cluster.ObjectMeta.Name)`
`150`	`150`	`if machineType == generate.TypeInit && k8serrors.IsNotFound(err) {`
`151`		`- err = r.writeInputSecret(ctx, config, cluster.ObjectMeta.Name, input)`
	`151`	`+ inputSecret, err = r.writeInputSecret(ctx, config, cluster.ObjectMeta.Name, input)`
`152`	`152`	`if err != nil {`
`153`	`153`	`return ctrl.Result{}, err`
`154`	`154`	`}`