kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove support for disabling manifest normalization

This commit is contained in:
John Gardiner Myers 2020-11-22 11:01:15 -08:00
parent 47b407c230
commit 227c179f83
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/assets/BUILD.bazel
View File

@ -8,7 +8,6 @@ go_library(
deps = [ deps = [
"//pkg/apis/kops:go_default_library", "//pkg/apis/kops:go_default_library",
"//pkg/apis/kops/util:go_default_library", "//pkg/apis/kops/util:go_default_library",
"//pkg/featureflag:go_default_library",
"//pkg/kubemanifest:go_default_library", "//pkg/kubemanifest:go_default_library",
"//pkg/values:go_default_library", "//pkg/values:go_default_library",
"//util/pkg/hashing:go_default_library", "//util/pkg/hashing:go_default_library",

9
pkg/assets/builder.go
View File

@ -30,7 +30,6 @@ import (
"k8s.io/klog/v2" "k8s.io/klog/v2"
"k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/apis/kops/util" "k8s.io/kops/pkg/apis/kops/util"
"k8s.io/kops/pkg/featureflag"
"k8s.io/kops/pkg/kubemanifest" "k8s.io/kops/pkg/kubemanifest"
"k8s.io/kops/pkg/values" "k8s.io/kops/pkg/values"
"k8s.io/kops/util/pkg/hashing" "k8s.io/kops/util/pkg/hashing"
@ -38,10 +37,6 @@ import (
"k8s.io/kops/util/pkg/vfs" "k8s.io/kops/util/pkg/vfs"
) )
// RewriteManifests controls whether we rewrite manifests
// Because manifest rewriting converts everything to and from YAML, we normalize everything by doing so
var RewriteManifests = featureflag.New("RewriteManifests", featureflag.Bool(true))
// AssetBuilder discovers and remaps assets. // AssetBuilder discovers and remaps assets.
type AssetBuilder struct { type AssetBuilder struct {
ContainerAssets []*ContainerAsset ContainerAssets []*ContainerAsset
@ -109,10 +104,6 @@ func NewAssetBuilder(cluster *kops.Cluster, phase string) *AssetBuilder {
// This will: // This will:
// * rewrite the images if they are being redirected to a mirror, and ensure the image is uploaded // * rewrite the images if they are being redirected to a mirror, and ensure the image is uploaded
func (a *AssetBuilder) RemapManifest(data []byte) ([]byte, error) { func (a *AssetBuilder) RemapManifest(data []byte) ([]byte, error) {
if !RewriteManifests.Enabled() {
return data, nil
}
objects, err := kubemanifest.LoadObjectsFrom(data) objects, err := kubemanifest.LoadObjectsFrom(data)
if err != nil { if err != nil {
return nil, err return nil, err