From 62b8b1702ca24822ee35091273bdfb516420cc6e Mon Sep 17 00:00:00 2001
From: Josh Samuels <joshsamuels04@gmail.com>
Date: Wed, 12 Jun 2019 23:15:13 -0700
Subject: [PATCH] Replaced klog with an error wrapper

---
 pkg/kubectl/cmd/apply/apply.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/kubectl/cmd/apply/apply.go b/pkg/kubectl/cmd/apply/apply.go
index 378b92b39d7..56b05f545a0 100644
--- a/pkg/kubectl/cmd/apply/apply.go
+++ b/pkg/kubectl/cmd/apply/apply.go
@@ -398,7 +398,7 @@ func (o *ApplyOptions) Run() error {
 			if err != nil {
 				return cmdutil.AddSourceToErr("serverside-apply", info.Source, err)
 			}
-			
+
 			options := metav1.PatchOptions{
 				Force:        &o.ForceConflicts,
 				FieldManager: o.FieldManager,
@@ -416,7 +416,7 @@ func (o *ApplyOptions) Run() error {
 			)
 			if err != nil {
 				if isIncompatibleServerError(err) {
-					klog.Warningf("serverside-apply incompatible server: %v", err)
+					err = fmt.Errorf("Server-side apply not available on the server: (%v)", err)
 				}
 
 				return err