Merge pull request #15926 from justinsb/fix_a_few_log_with_percent_w

fix a few log with percent w
kubernetes · Sep 18, 2023 · 86d90f1 · 86d90f1
2 parents 9816fd9 + 0096451
commit 86d90f1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/cmd/kops-controller/controllers/gceipam.go b/cmd/kops-controller/controllers/gceipam.go
@@ -78,7 +78,7 @@ func (r *GCEIPAMReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 
 	node := &corev1.Node{}
 	if err := r.client.Get(ctx, req.NamespacedName, node); err != nil {
-		klog.Warningf("unable to fetch node %s: %w", node.Name, err)
+		klog.Warningf("unable to fetch node %s: %v", node.Name, err)
 		if apierrors.IsNotFound(err) {
 			// we'll ignore not-found errors, since they can't be fixed by an immediate
 			// requeue (we'll need to wait for a new notification), and we can get them

diff --git a/pkg/applylib/mocks/mockkubeapiserver/apiserver.go b/pkg/applylib/mocks/mockkubeapiserver/apiserver.go
@@ -250,7 +250,7 @@ func (r *baseRequest) writeResponse(obj interface{}) error {
 
 	if _, err := r.w.Write(b); err != nil {
 		// Too late to send error response
-		klog.Warningf("error writing http response: %w", err)
+		klog.Warningf("error writing http response: %v", err)
 		return nil
 	}
 	return nil

diff --git a/upup/pkg/fi/cloudup/template_functions.go b/upup/pkg/fi/cloudup/template_functions.go
@@ -633,6 +633,10 @@ func (tf *TemplateFunctions) DNSControllerArgv() ([]string, error) {
 
 	if cluster.Spec.IsIPv6Only() {
 		argv = append(argv, "--internal-ipv6")
+		// We need IPv4 on GCE, because we aren't publishing IPv6 Node IPs on GCE yet
+		if cluster.Spec.GetCloudProvider() == kops.CloudProviderGCE {
+			argv = append(argv, "--internal-ipv4")
+		}
 	} else {
 		argv = append(argv, "--internal-ipv4")
 	}

diff --git a/upup/pkg/fi/vfs_castore.go b/upup/pkg/fi/vfs_castore.go
@@ -182,7 +182,7 @@ func (c *VFSCAStore) ListKeysets() (map[string]*Keyset, error) {
 		name := tokens[0]
 		loadedKeyset, err := c.loadKeyset(ctx, baseDir.Join(name))
 		if err != nil {
-			klog.Warningf("ignoring keyset %q: %w", name, err)
+			klog.Warningf("ignoring keyset %q: %v", name, err)
 			continue
 		}