From 227c179f8328e908e53169ba981fa4030b606abf Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Sun, 22 Nov 2020 11:01:15 -0800 Subject: [PATCH] Remove support for disabling manifest normalization --- pkg/assets/BUILD.bazel | 1 - pkg/assets/builder.go | 9 --------- 2 files changed, 10 deletions(-) diff --git a/pkg/assets/BUILD.bazel b/pkg/assets/BUILD.bazel index e91789ada4..1d004fd682 100644 --- a/pkg/assets/BUILD.bazel +++ b/pkg/assets/BUILD.bazel @@ -8,7 +8,6 @@ go_library( deps = [ "//pkg/apis/kops:go_default_library", "//pkg/apis/kops/util:go_default_library", - "//pkg/featureflag:go_default_library", "//pkg/kubemanifest:go_default_library", "//pkg/values:go_default_library", "//util/pkg/hashing:go_default_library", diff --git a/pkg/assets/builder.go b/pkg/assets/builder.go index 13043a5444..cf92b7df03 100644 --- a/pkg/assets/builder.go +++ b/pkg/assets/builder.go @@ -30,7 +30,6 @@ import ( "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops/util" - "k8s.io/kops/pkg/featureflag" "k8s.io/kops/pkg/kubemanifest" "k8s.io/kops/pkg/values" "k8s.io/kops/util/pkg/hashing" @@ -38,10 +37,6 @@ import ( "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. type AssetBuilder struct { ContainerAssets []*ContainerAsset @@ -109,10 +104,6 @@ func NewAssetBuilder(cluster *kops.Cluster, phase string) *AssetBuilder { // This will: // * 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) { - if !RewriteManifests.Enabled() { - return data, nil - } - objects, err := kubemanifest.LoadObjectsFrom(data) if err != nil { return nil, err