mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 04:33:26 +00:00
Kubeadm: clean up MarshalToYamlForCodecs
Proxy will use PrintBytesWithLinePrefix to indent.
This commit is contained in:
parent
d61eff6c19
commit
12301ae319
@ -17,6 +17,7 @@ limitations under the License.
|
|||||||
package proxy
|
package proxy
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
"fmt"
|
"fmt"
|
||||||
"runtime"
|
"runtime"
|
||||||
|
|
||||||
@ -57,11 +58,13 @@ func EnsureProxyAddon(cfg *kubeadmapi.MasterConfiguration, client clientset.Inte
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
proxyBytes, err := kubeadmutil.MarshalToYamlForCodecsWithShift(cfg.KubeProxy.Config, kubeproxyconfigv1alpha1.SchemeGroupVersion,
|
proxyBytes, err := kubeadmutil.MarshalToYamlForCodecs(cfg.KubeProxy.Config, kubeproxyconfigv1alpha1.SchemeGroupVersion,
|
||||||
kubeproxyconfigscheme.Codecs)
|
kubeproxyconfigscheme.Codecs)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("error when marshaling: %v", err)
|
return fmt.Errorf("error when marshaling: %v", err)
|
||||||
}
|
}
|
||||||
|
var prefixBytes bytes.Buffer
|
||||||
|
apiclient.PrintBytesWithLinePrefix(&prefixBytes, proxyBytes, " ")
|
||||||
var proxyConfigMapBytes, proxyDaemonSetBytes []byte
|
var proxyConfigMapBytes, proxyDaemonSetBytes []byte
|
||||||
proxyConfigMapBytes, err = kubeadmutil.ParseTemplate(KubeProxyConfigMap19,
|
proxyConfigMapBytes, err = kubeadmutil.ParseTemplate(KubeProxyConfigMap19,
|
||||||
struct {
|
struct {
|
||||||
@ -69,7 +72,7 @@ func EnsureProxyAddon(cfg *kubeadmapi.MasterConfiguration, client clientset.Inte
|
|||||||
ProxyConfig string
|
ProxyConfig string
|
||||||
}{
|
}{
|
||||||
MasterEndpoint: masterEndpoint,
|
MasterEndpoint: masterEndpoint,
|
||||||
ProxyConfig: proxyBytes,
|
ProxyConfig: prefixBytes.String(),
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("error when parsing kube-proxy configmap template: %v", err)
|
return fmt.Errorf("error when parsing kube-proxy configmap template: %v", err)
|
||||||
|
@ -18,7 +18,6 @@ package util
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
|
||||||
|
|
||||||
"k8s.io/apimachinery/pkg/runtime"
|
"k8s.io/apimachinery/pkg/runtime"
|
||||||
"k8s.io/apimachinery/pkg/runtime/schema"
|
"k8s.io/apimachinery/pkg/runtime/schema"
|
||||||
@ -42,18 +41,3 @@ func MarshalToYamlForCodecs(obj runtime.Object, gv schema.GroupVersion, codecs s
|
|||||||
encoder := codecs.EncoderForVersion(info.Serializer, gv)
|
encoder := codecs.EncoderForVersion(info.Serializer, gv)
|
||||||
return runtime.Encode(encoder, obj)
|
return runtime.Encode(encoder, obj)
|
||||||
}
|
}
|
||||||
|
|
||||||
// MarshalToYamlForCodecsWithShift adds spaces in front of each line so the indents line up
|
|
||||||
// correctly in the manifest
|
|
||||||
func MarshalToYamlForCodecsWithShift(obj runtime.Object, gv schema.GroupVersion, codecs serializer.CodecFactory) (string, error) {
|
|
||||||
serial, err := MarshalToYamlForCodecs(obj, gv, codecs)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
lines := strings.Split(string(serial), "\n")
|
|
||||||
var newSerial string
|
|
||||||
for _, line := range lines {
|
|
||||||
newSerial = newSerial + " " + line + "\n"
|
|
||||||
}
|
|
||||||
return newSerial, err
|
|
||||||
}
|
|
||||||
|
Loading…
Reference in New Issue
Block a user