switch process to produce groupified openshift api resources

openshift · Apr 23, 2018 · a6c6877 · a6c6877
1 parent 30a0b59
commit a6c6877
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/pkg/oc/cli/groupification.go → ...pi/legacygroupification/groupification.go b/pkg/oc/cli/groupification.go → ...pi/legacygroupification/groupification.go
@@ -1,4 +1,4 @@
-package cli
+package legacygroupification
 
 import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

diff --git a/pkg/oc/cli/cli.go b/pkg/oc/cli/cli.go
@@ -7,6 +7,7 @@ import (
 	"runtime"
 	"strings"
 
+	"github.com/openshift/origin/pkg/api/legacygroupification"
 	"github.com/spf13/cobra"
 
 	kubecmd "k8s.io/kubernetes/pkg/kubectl/cmd"
@@ -317,8 +318,8 @@ func CommandFor(basename string) *cobra.Command {
 		cmd = kubecmd.NewKubectlCommand(kcmdutil.NewFactory(nil), in, out, errout)
 	default:
 		// we only need this change for `oc`.  `kubectl` should behave as close to `kubectl` as we can
-		resource.OAPIToGroupified = OAPIToGroupified
-		kcmdutil.OAPIToGroupifiedGVK = OAPIToGroupifiedGVK
+		resource.OAPIToGroupified = legacygroupification.OAPIToGroupified
+		kcmdutil.OAPIToGroupifiedGVK = legacygroupification.OAPIToGroupifiedGVK
 		cmd = NewCommandCLI("oc", "oc", in, out, errout)
 	}
 

diff --git a/pkg/template/template.go b/pkg/template/template.go
@@ -10,6 +10,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 
+	"github.com/openshift/origin/pkg/api/legacygroupification"
 	templateapi "github.com/openshift/origin/pkg/template/apis/template"
 	. "github.com/openshift/origin/pkg/template/generator"
 	"github.com/openshift/origin/pkg/util"
@@ -84,6 +85,11 @@ func (p *Processor) Process(template *templateapi.Template) field.ErrorList {
 		// referenced namespace.
 		stripNamespace(item)
 
+		// this changes oapi GVKs to groupified GVKs so they can be submitted to modern, aggregated servers
+		gvk := item.GetObjectKind().GroupVersionKind()
+		legacygroupification.OAPIToGroupifiedGVK(&gvk)
+		item.GetObjectKind().SetGroupVersionKind(gvk)
+
 		newItem, err := p.SubstituteParameters(paramMap, item)
 		if err != nil {
 			templateErrors = append(templateErrors, field.Invalid(idxPath.Child("parameters"), template.Parameters, err.Error()))

diff --git a/test/templates/testdata/guestbook_list.json b/test/templates/testdata/guestbook_list.json
@@ -12,7 +12,7 @@
     "message": "Your admin credentials are adminQ3H:dwNJiJwW",
     "objects": [
         {
-            "apiVersion": "v1",
+            "apiVersion": "route.openshift.io/v1",
             "kind": "Route",
             "metadata": {
                 "creationTimestamp": null,