Merge pull request #20642 from deads2k/cli-01-patch

allow patching configapi using oc patch
openshift · Aug 20, 2018 · 70c96cb · 70c96cb
2 parents 2e05d26 + 75a195d
commit 70c96cb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/pkg/cmd/server/apis/config/v1/register.go b/pkg/cmd/server/apis/config/v1/register.go
@@ -5,6 +5,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	coreinternalconversions "k8s.io/kubernetes/pkg/apis/core"
 
+	buildv1 "github.com/openshift/api/build/v1"
 	buildinternalconversions "github.com/openshift/origin/pkg/build/apis/build/v1"
 	"github.com/openshift/origin/pkg/cmd/server/apis/config"
 )
@@ -23,6 +24,12 @@ var (
 		addDefaultingFuncs,
 	)
 	InstallLegacy = legacySchemeBuilder.AddToScheme
+
+	externalLegacySchemeBuilder = runtime.NewSchemeBuilder(
+		addKnownTypesToLegacy,
+		buildv1.Install,
+	)
+	InstallLegacyExternal = externalLegacySchemeBuilder.AddToScheme
 )
 
 // Adds the list of known types to api.Scheme.

diff --git a/vendor/k8s.io/kubernetes/cluster/clientbin.sh b/vendor/k8s.io/kubernetes/cluster/clientbin.sh