Merge pull request #2371 from smarterclayton/disable_v1beta1

Merged by openshift-bot

Author: OpenShift Bot

assets/app/scripts/controllers/overview.js

@@ -235,7 +235,12 @@ angular.module('openshiftConsole')
       if (configJson) {
         try {
           var depConfig = $.parseJSON(configJson);
-          deployment.details = depConfig.details;
+          if (depConfig.apiVersion === "v1beta1") {
+            // TODO: will be slightly inaccurate for now
+            deployment.status = {details: depConfig.details};
+          } else {
+            deployment.status = depConfig.status;
+          }
         }
         catch (e) {
           Logger.error("Failed to parse encoded deployment config", e);

assets/app/scripts/filters/resources.js

@@ -253,6 +253,28 @@ angular.module('openshiftConsole')
         (resource && resource.metadata && resource.metadata.namespace);
     };
   })
+  .filter('imageObjectRef', function(){
+    return function(objectRef){
+      // TODO: needs to handle the current namespace
+      var ns = objectRef.namespace || "";
+      if (ns.length > 0) {
+        ns = ns + "/";
+      }
+      var kind = objectRef.kind;
+      if (kind === "ImageStreamTag" || kind === "ImageStreamImage") {
+        return ns+objectRef.name;
+      }
+      if (kind === "DockerImage") {
+        // TODO: replace with real DockerImageReference parse function
+        var name = objectRef.name;
+        name = name.substring(name.lastIndexOf("/")+1);
+        return name;
+      }
+      // TODO: we may want to indicate the actual type
+      var ref = ns + objectRef.name;
+      return ref;
+    };
+  })
   .filter('imageRepoReference', function(){
     return function(objectRef, kind, tag){
       var ns = objectRef.namespace || "";

assets/app/views/_overview-deployment.html

@@ -42,11 +42,11 @@ <h3 class="h4">
 
     <div class="component meta-data">
       created <relative-timestamp timestamp="rc.metadata.creationTimestamp"></relative-timestamp
-      ><span ng-if="rc.details.causes.length"
+      ><span ng-if="rc.status.details.causes.length"
         ><span>, triggered by 
-          <span class="deployment-trigger" ng-repeat="cause in rc.details.causes">
+          <span class="deployment-trigger" ng-repeat="cause in rc.status.details.causes">
             <span ng-switch="cause.type">
-              <span ng-switch-when="ImageChange">a new image for {{cause.imageTrigger.repositoryName | imageStreamName}}:{{cause.imageTrigger.tag}}</span>
+              <span ng-switch-when="ImageChange">a new image for {{cause.imageTrigger.from | imageObjectRef}}</span>
               <span ng-switch-when="ConfigChange">a config change</span>
             </span>
           </span>

assets/test/e2e/test.js

@@ -23,7 +23,7 @@ describe('', function() {
 
   var login = function(loginPageAlreadyLoaded) {
     // The login page doesn't use angular, so we have to use the underlying WebDriver instance
-    var driver = browser.driver;  
+    var driver = browser.driver;
     if (!loginPageAlreadyLoaded) {
       browser.get('/');
       driver.wait(function() {
@@ -76,7 +76,7 @@ describe('', function() {
 
     it('should be able to list the test project', function() {
       browser.get('/');
-      
+
       expect(element(by.cssContainingText("h2.project","test")).isPresent()).toBe(true);
     });
 
@@ -92,10 +92,10 @@ describe('', function() {
 
       expect(element(by.cssContainingText(".pod-template-build","Build: ruby-sample-build")).isPresent()).toBe(true);
 
-      expect(element(by.cssContainingText(".deployment-trigger","new image for test/origin-ruby-sample:latest")).isPresent()).toBe(true);
-      
+      expect(element(by.cssContainingText(".deployment-trigger","new image for origin-ruby-sample:latest")).isPresent()).toBe(true);
+
       expect(element.all(by.css(".pod-running")).count()).toEqual(3);
     });
-  }); 
+  });
 
 });

cmd/origin-version-change/main.go

@@ -0,0 +1,115 @@
+// origin-version-change is a simple utility for converting a
+// storage object into a different api version.
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"io"
+	"io/ioutil"
+	"log"
+	"os"
+	"runtime"
+
+	"github.com/ghodss/yaml"
+	flag "github.com/spf13/pflag"
+
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	_ "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
+
+	"github.com/openshift/origin/pkg/api/latest"
+)
+
+var (
+	inputSource   = flag.StringP("input", "i", "-", "Input source; '-' means stdin")
+	outputDest    = flag.StringP("output", "o", "-", "Output destination; '-' means stdout")
+	rewrite       = flag.StringP("rewrite", "r", "", "If nonempty, use this as both input and output.")
+	outputVersion = flag.StringP("out-version", "v", latest.Version, "Version to convert input to")
+)
+
+// isYAML determines whether data is JSON or YAML formatted by seeing
+// if it will parse as json.
+func isYAML(data []byte) bool {
+	var unused interface{}
+	if err := json.Unmarshal(data, &unused); err != nil {
+		return true
+	}
+	return false
+}
+
+func main() {
+	runtime.GOMAXPROCS(runtime.NumCPU())
+	flag.CommandLine.SetNormalizeFunc(util.WordSepNormalizeFunc)
+	flag.Parse()
+
+	if *rewrite != "" {
+		*inputSource = *rewrite
+		*outputDest = *rewrite
+	}
+
+	var in io.Reader
+	if *inputSource == "-" {
+		in = os.Stdin
+	} else {
+		f, err := os.Open(*inputSource)
+		if err != nil {
+			log.Fatalf("Couldn't open %q: %q", *inputSource, err)
+		}
+		defer f.Close()
+		in = f
+	}
+
+	data, err := ioutil.ReadAll(in)
+	if err != nil {
+		log.Fatalf("Couldn't read from input: %q", err)
+	}
+	isYAML := isYAML(data)
+
+	if isYAML {
+		data, err = yaml.YAMLToJSON(data)
+		if err != nil {
+			log.Fatalf("Failed to convert YAML to JSON: %q", err)
+		}
+	}
+	obj, err := api.Scheme.Decode(data)
+	if err != nil {
+		log.Fatalf("Couldn't decode input: %q", err)
+	}
+
+	outData, err := api.Scheme.EncodeToVersion(obj, *outputVersion)
+	if err != nil {
+		log.Fatalf("Failed to encode to version %q: %q", *outputVersion, err)
+	}
+
+	if isYAML {
+		outData, err = yaml.JSONToYAML(outData)
+		if err != nil {
+			log.Fatalf("Failed to convert to YAML: %q", err)
+		}
+	} else if true {
+		// TODO: figure out if input JSON was pretty.
+		var buf bytes.Buffer
+		err = json.Indent(&buf, outData, "", "  ")
+		if err != nil {
+			log.Fatalf("Failed to indent JSON: %q", err)
+		}
+		outData = buf.Bytes()
+	}
+
+	var out io.Writer
+	if *outputDest == "-" {
+		out = os.Stdout
+	} else {
+		f, err := os.Create(*outputDest)
+		if err != nil {
+			log.Fatalf("Couldn't open %q: %q", *outputDest, err)
+		}
+		defer f.Close()
+		out = f
+	}
+
+	if _, err = out.Write(outData); err != nil {
+		log.Fatalf("Failed to write: %q", err)
+	}
+}

pkg/api/latest/latest.go

@@ -14,6 +14,7 @@ import (
 
 	_ "github.com/openshift/origin/pkg/api"
 	"github.com/openshift/origin/pkg/api/meta"
+	"github.com/openshift/origin/pkg/api/v1"
 	"github.com/openshift/origin/pkg/api/v1beta1"
 	"github.com/openshift/origin/pkg/api/v1beta3"
 )
@@ -29,13 +30,13 @@ const OldestVersion = "v1beta1"
 // may be assumed to be least feature rich to most feature rich, and clients may
 // choose to prefer the latter items in the list over the former items when presented
 // with a set of versions to choose.
-var Versions = []string{"v1beta1", "v1beta3"}
+var Versions = []string{"v1beta1", "v1beta3", "v1"}
 
 // Codec is the default codec for serializing output that should use
 // the latest supported version.  Use this Codec when writing to
 // disk, a data store that is not dynamically versioned, or in tests.
 // This codec can decode any object that OpenShift is aware of.
-var Codec = v1beta1.Codec
+var Codec = v1beta3.Codec
 
 // accessor is the shared static metadata accessor for the API.
 var accessor = kmeta.NewAccessor()
@@ -71,6 +72,12 @@ func InterfacesFor(version string) (*kmeta.VersionInterfaces, error) {
 			ObjectConvertor:  api.Scheme,
 			MetadataAccessor: accessor,
 		}, nil
+	case "v1":
+		return &kmeta.VersionInterfaces{
+			Codec:            v1.Codec,
+			ObjectConvertor:  api.Scheme,
+			MetadataAccessor: accessor,
+		}, nil
 	default:
 		return nil, fmt.Errorf("unsupported storage version: %s (valid: %s)", version, strings.Join(Versions, ", "))
 	}
@@ -108,7 +115,7 @@ func init() {
 	)
 
 	// list of versions we support on the server, in preferred order
-	versions := []string{"v1beta3", "v1beta1"}
+	versions := []string{"v1beta3", "v1beta1", "v1"}
 
 	// versions that used mixed case URL formats
 	versionMixedCase := map[string]bool{
@@ -119,6 +126,7 @@ func init() {
 	versionToNamespaceScope := map[string]kmeta.RESTScope{
 		"v1beta1": kmeta.RESTScopeNamespaceLegacy,
 		"v1beta3": kmeta.RESTScopeNamespace,
+		"v1":      kmeta.RESTScopeNamespace,
 	}
 
 	// the list of kinds that are scoped at the root of the api hierarchy

pkg/api/serialization_test.go

@@ -17,6 +17,7 @@ import (
 
 	osapi "github.com/openshift/origin/pkg/api"
 	_ "github.com/openshift/origin/pkg/api/latest"
+	"github.com/openshift/origin/pkg/api/v1"
 	"github.com/openshift/origin/pkg/api/v1beta1"
 	"github.com/openshift/origin/pkg/api/v1beta3"
 	authorizationapi "github.com/openshift/origin/pkg/authorization/api"
@@ -53,13 +54,13 @@ func fuzzInternalObject(t *testing.T, forVersion string, item runtime.Object, se
 		},
 		func(j *image.ImageRepositoryMapping, c fuzz.Continue) {
 			c.FuzzNoCustom(j)
-			if forVersion == "v1beta3" {
+			if forVersion != "v1beta1" {
 				j.DockerImageRepository = ""
 			}
 		},
 		func(j *image.ImageStreamMapping, c fuzz.Continue) {
 			c.FuzzNoCustom(j)
-			if forVersion == "v1beta3" {
+			if forVersion != "v1beta1" {
 				j.DockerImageRepository = ""
 			}
 		},
@@ -108,7 +109,7 @@ func fuzzInternalObject(t *testing.T, forVersion string, item runtime.Object, se
 			c.FuzzNoCustom(j)
 			specs := []string{"", "a/b", "a/b/c", "a:5000/b/c", "a/b:latest", "a/b@test"}
 			j.DockerImageReference = specs[c.Intn(len(specs))]
-			if forVersion == "v1beta3" {
+			if forVersion != "v1beta1" {
 				j.Tag, j.DockerImageReference = "", ""
 				if j.To != nil && (len(j.To.Kind) == 0 || j.To.Kind == "ImageStream") {
 					j.To.Kind = "ImageStream"
@@ -255,7 +256,10 @@ var skipStandardVersions = map[string][]string{
 	"DockerImage": {"pre012", "1.0"},
 }
 var skipV1beta1 = map[string]struct{}{}
-var skipV1beta2 = map[string]struct{}{
+var skipV1beta3 = map[string]struct{}{
+	"ImageRepository": {},
+}
+var skipV1 = map[string]struct{}{
 	"ImageRepository": {},
 }
 
@@ -277,6 +281,7 @@ func TestSpecificKind(t *testing.T) {
 	roundTrip(t, osapi.Codec, item)
 	roundTrip(t, v1beta1.Codec, item)
 	roundTrip(t, v1beta3.Codec, item)
+	roundTrip(t, v1.Codec, item)
 }
 
 func TestTypes(t *testing.T) {
@@ -310,10 +315,14 @@ func TestTypes(t *testing.T) {
 				fuzzInternalObject(t, "v1beta1", item, seed)
 				roundTrip(t, v1beta1.Codec, item)
 			}
-			if _, ok := skipV1beta2[kind]; !ok {
+			if _, ok := skipV1beta3[kind]; !ok {
 				fuzzInternalObject(t, "v1beta3", item, seed)
 				roundTrip(t, v1beta3.Codec, item)
 			}
+			if _, ok := skipV1[kind]; !ok {
+				fuzzInternalObject(t, "v1", item, seed)
+				roundTrip(t, v1.Codec, item)
+			}
 		}
 	}
 }

pkg/api/v1/doc.go

@@ -0,0 +1,2 @@
+// Package v1 is the v1 version of the API.
+package v1

pkg/api/v1/register.go

@@ -0,0 +1,23 @@
+package v1
+
+import (
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
+
+	_ "github.com/openshift/origin/pkg/authorization/api/v1"
+	_ "github.com/openshift/origin/pkg/build/api/v1"
+	_ "github.com/openshift/origin/pkg/deploy/api/v1"
+	_ "github.com/openshift/origin/pkg/image/api/v1"
+	_ "github.com/openshift/origin/pkg/oauth/api/v1"
+	_ "github.com/openshift/origin/pkg/project/api/v1"
+	_ "github.com/openshift/origin/pkg/route/api/v1"
+	_ "github.com/openshift/origin/pkg/sdn/api/v1"
+	_ "github.com/openshift/origin/pkg/template/api/v1"
+	_ "github.com/openshift/origin/pkg/user/api/v1"
+)
+
+// Codec encodes internal objects to the v1 scheme
+var Codec = runtime.CodecFor(api.Scheme, "v1")
+
+func init() {
+}