bump(github.com/openshift/origin-web-console): 6fce309ab345f01c60ed1385f7ff6ea15d0b1110

Author: OpenShift Bot

pkg/assets/bindata.go

@@ -9177,34 +9177,31 @@ link:d.routeURL
 title:"Edit"
 } ], i.get(c.project).then(_.spread(function(i, k) {
 if (d.project = i, d.breadcrumbs[0].title = a("displayName")(i), !f.canI("routes", "update", c.project)) return void h.toErrorPage("You do not have authority to update route " + c.routeName + ".", "access_denied");
-var l, m = a("orderByDisplayName");
+var l, m = a("orderByDisplayName"), n = function() {
+h.toErrorPage('Editing routes with non-service targets is unsupported. You can edit the route with the "Edit YAML" action instead.');
+};
 g.get("routes", d.routeName, k).then(function(a) {
+if ("Service" !== a.spec.to.kind) return void n();
 l = angular.copy(a);
 var b = _.get(l, "spec.host"), c = "Subdomain" === _.get(l, "spec.wildcardPolicy");
 c && (b = "*." + j.getSubdomain(l)), d.routing = {
-service:_.get(l, "spec.to.name"),
 host:b,
 wildcardPolicy:_.get(l, "spec.wildcardPolicy"),
 path:_.get(l, "spec.path"),
 targetPort:_.get(l, "spec.port.targetPort"),
 tls:angular.copy(_.get(l, "spec.tls"))
 }, g.list("services", k).then(function(a) {
-var b = a.by("metadata.name"), c = _.get(l, "spec.to", {});
-d.loading = !1, d.services = m(b), d.routing.to = {
-service:b[c.name],
-weight:c.weight
-}, d.routing.alternateServices = [], _.each(_.get(l, "spec.alternateBackends"), function(a) {
-return "Service" !== a.kind ? (h.toErrorPage('Editing routes with non-service targets is unsupported. You can edit the route with the "Edit YAML" action instead.'), !1) :void d.routing.alternateServices.push({
-service:b[a.name],
-weight:a.weight
-});
-});
+d.loading = !1;
+var b = a.by("metadata.name");
+d.routing.to = l.spec.to, d.routing.alternateServices = [], _.each(_.get(l, "spec.alternateBackends"), function(a) {
+return "Service" !== a.kind ? (n(), !1) :void d.routing.alternateServices.push(a);
+}), d.services = m(b);
 });
 }, function() {
 h.toErrorPage("Could not load route " + d.routeName + ".");
 });
-var n = function() {
-var a = angular.copy(l), b = _.get(d, "routing.to.service.metadata.name");
+var o = function() {
+var a = angular.copy(l), b = _.get(d, "routing.to.name");
 _.set(a, "spec.to.name", b);
 var c = _.get(d, "routing.to.weight");
 isNaN(c) || _.set(a, "spec.to.weight", c), a.spec.path = d.routing.path;
@@ -9214,15 +9211,15 @@ var f = _.get(d, "routing.alternateServices", []);
 return _.isEmpty(f) ? delete a.spec.alternateBackends :a.spec.alternateBackends = _.map(f, function(a) {
 return {
 kind:"Service",
-name:_.get(a, "service.metadata.name"),
+name:a.name,
 weight:a.weight
 };
 }), a;
 };
 d.updateRoute = function() {
 if (d.form.$valid) {
 d.disableInputs = !0;
-var c = n();
+var c = o();
 g.update("routes", d.routeName, c, k).then(function() {
 e.addAlert({
 name:d.routeName,
@@ -10003,10 +10000,12 @@ title:"Create Route"
 } ], i.get(b.project).then(_.spread(function(i, k) {
 if (c.project = i, c.breadcrumbs[0].title = a("displayName")(i), !f.canI("routes", "create", b.project)) return void h.toErrorPage("You do not have authority to create routes in project " + b.project + ".", "access_denied");
 var l = a("orderByDisplayName");
-g.list("services", k).then(function(a) {
-c.services = l(a.by("metadata.name")), c.routing.to = {}, c.routing.to.service = _.find(c.services, function(a) {
-return !c.serviceName || a.metadata.name === c.serviceName;
-});
+c.routing.to = {
+kind:"Service",
+name:c.serviceName,
+weight:1
+}, g.list("services", k).then(function(a) {
+c.services = l(a.by("metadata.name"));
 }), c.copyServiceLabels = function() {
 var a = _.get(c, "routing.to.service.metadata.labels", {}), b = j.mapEntries(j.compactEntries(c.labels)), d = _.assign(b, a);
 c.labels = _.map(d, function(a, b) {
@@ -10018,11 +10017,11 @@ value:a
 }, c.createRoute = function() {
 if (c.createRouteForm.$valid) {
 c.disableInputs = !0;
-var b = c.routing.to.service.metadata.name, f = j.mapEntries(j.compactEntries(c.labels)), h = e.createRoute(c.routing, b, f), i = _.get(c, "routing.alternateServices", []);
+var b = c.routing.to.name, f = j.mapEntries(j.compactEntries(c.labels)), h = e.createRoute(c.routing, b, f), i = _.get(c, "routing.alternateServices", []);
 _.isEmpty(i) || (h.spec.to.weight = _.get(c, "routing.to.weight"), h.spec.alternateBackends = _.map(i, function(a) {
 return {
 kind:"Service",
-name:_.get(a, "service.metadata.name"),
+name:a.name,
 weight:a.weight
 };
 })), g.create("routes", null, h, k).then(function() {
@@ -11300,19 +11299,22 @@ c.routeForm.insecureTraffic.$setValidity("passthrough", a);
 };
 c.$watchGroup([ "route.tls.termination", "route.tls.insecureEdgeTerminationPolicy" ], g), c.nameValidation = b, c.disableWildcards ? c.hostnamePattern = b.pattern :c.hostnamePattern = /^(\*(\.[a-z0-9]([-a-z0-9]*[a-z0-9]))+|[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*)$/, c.hostnameMaxLength = b.maxlength;
 var h = function(a) {
-a && (c.unnamedServicePort = 1 === a.spec.ports.length && !a.spec.ports[0].name, a.spec.ports.length && !c.unnamedServicePort ? c.route.portOptions = _.map(a.spec.ports, function(a) {
+if (a) {
+var b = _.get(a, "spec.ports", []);
+c.unnamedServicePort = 1 === b.length && !b[0].name, b.length && !c.unnamedServicePort ? c.route.portOptions = _.map(b, function(a) {
 return {
 port:a.name,
 label:a.port + " → " + a.targetPort + " (" + a.protocol + ")"
 };
-}) :c.route.portOptions = []);
+}) :c.route.portOptions = [];
+}
 };
-c.services && !c.route.service && (c.route.service = _.find(c.services)), c.$watch("route.to.service", function(a, b) {
-h(a), a === b && c.route.targetPort || (c.route.targetPort = _.get(c, "route.portOptions[0].port")), c.services && (c.alternateServiceOptions = _.reject(c.services, function(b) {
-return a === b;
+c.services && !c.route.service && (c.route.service = _.find(c.services)), c.servicesByName, c.services ? c.servicesByName = _.indexBy(c.services, "metadata.name") :c.servicesByName = {}, c.$watch("route.to.name", function(a, b) {
+h(c.servicesByName[a]), a === b && c.route.targetPort || (c.route.targetPort = _.get(c, "route.portOptions[0].port")), c.services && (c.alternateServiceOptions = _.reject(c.services, function(b) {
+return a === b.metadata.name;
 }));
 }), c.$watch("route.alternateServices", function(a) {
-c.duplicateServices = _(a).map("service").filter(function(a, b, c) {
+c.duplicateServices = _(a).map("name").filter(function(a, b, c) {
 return _.includes(c, a, b + 1);
 }).value(), f.$setValidity("duplicateServices", !c.duplicateServices.length), c.options.alternateServices = !_.isEmpty(a);
 }, !0);
@@ -11333,12 +11335,12 @@ a !== b && (a || (c.route.alternateServices = []), a && _.isEmpty(c.route.altern
 }), c.addAlternateService = function() {
 c.route.alternateServices = c.route.alternateServices || [];
 var a = _.find(c.services, function(a) {
-return a !== c.route.to.service && !_.some(c.route.alternateServices, {
-service:a
+return a.metadata.name !== c.route.to.service && !_.some(c.route.alternateServices, {
+service:a.metadata.name
 });
 });
 _.has(c, "route.to.weight") || _.set(c, "route.to.weight", 1), c.route.alternateServices.push({
-service:a,
+service:a.metadata.name,
 weight:1
 });
 }, c.weightAsPercentage = function(a, b) {
@@ -11366,20 +11368,18 @@ return {
 restrict:"E",
 scope:{
 model:"=",
-services:"=",
+serviceOptions:"=",
+allServices:"=",
 isAlternate:"=?",
-showWeight:"=?"
+showWeight:"=?",
+warnUnnamedPort:"=?"
 },
 templateUrl:"views/directives/osc-routing-service.html",
 link:function(a, b, c, d) {
-a.form = d, a.id = _.uniqueId("osc-routing-service-"), a.$watchGroup([ "model.service", "services" ], function() {
-if (!_.isEmpty(a.services)) {
-var b = _.get(a, "model.service");
-if (!b || !_.includes(a.services, b)) {
-var c = _.find(a.services);
-_.set(a, "model.service", c);
-}
-}
+a.form = d, a.id = _.uniqueId("osc-routing-service-"), a.$watchGroup([ "model.name", "serviceOptions" ], function() {
+if (_.isEmpty(a.serviceOptions)) return void (a.optionsNames = []);
+var b = _.get(a, "model.name");
+a.optionNames = [], a.selectedExists = !1, a.optionNames = _.map(a.serviceOptions, "metadata.name"), b && !a.allServices[b] && a.optionNames.push(b), b || _.set(a, "model.name", _.first(a.optionNames));
 });
 }
 };
@@ -23671,10 +23671,10 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "<label for=\"{{id}}-service-select\" class=\"required\">\n" +
     "Service\n" +
     "</label>\n" +
-    "<ui-select ng-model=\"model.service\" input-id=\"{{id}}-service-select\" aria-describedby=\"{{id}}-service-help\" required>\n" +
-    "<ui-select-match>{{$select.selected.metadata.name}}</ui-select-match>\n" +
-    "<ui-select-choices repeat=\"service in (services | filter : {metadata: { name: $select.search }}) track by (service | uid)\">\n" +
-    "<div ng-bind-html=\"service.metadata.name | highlight : $select.search\"></div>\n" +
+    "<ui-select ng-model=\"model.name\" input-id=\"{{id}}-service-select\" aria-describedby=\"{{id}}-service-help\" required>\n" +
+    "<ui-select-match>{{$select.selected}}</ui-select-match>\n" +
+    "<ui-select-choices repeat=\"serviceName in (optionNames | filter : $select.search)\">\n" +
+    "<div ng-bind-html=\"serviceName | highlight : $select.search\"></div>\n" +
     "</ui-select-choices>\n" +
     "</ui-select>\n" +
     "<div>\n" +
@@ -23683,14 +23683,19 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "<span ng-if=\"isAlternate\">Alternate service for route traffic.</span>\n" +
     "</span>\n" +
     "</div>\n" +
-    "<div ng-if=\"(services | hashSize) === 0\" class=\"has-error\">\n" +
+    "<div ng-if=\"model.name && !allServices[model.name]\" class=\"has-warning\">\n" +
+    "<span class=\"help-block\">\n" +
+    "Service {{model.name}} does not exist.\n" +
+    "</span>\n" +
+    "</div>\n" +
+    "<div ng-if=\"(optionNames | size) === 0\" class=\"has-error\">\n" +
     "<span class=\"help-block\">\n" +
     "There are no <span ng-if=\"is-alternate\">additional</span> services in your project to expose with a route.\n" +
     "</span>\n" +
     "</div>\n" +
-    "<div ng-if=\"unnamedServicePort\" class=\"has-warning\">\n" +
+    "<div ng-if=\"warnUnnamedPort\" class=\"has-warning\">\n" +
     "<span class=\"help-block\">\n" +
-    "Service {{route.service.metadata.name}} has a single, unnamed port. A route cannot specifically target an unnamed service port. If more service ports are added later, the route will also direct traffic to them.\n" +
+    "Service {{model.name}} has a single, unnamed port. A route cannot specifically target an unnamed service port. If more service ports are added later, the route will also direct traffic to them.\n" +
     "</span>\n" +
     "</div>\n" +
     "</div>\n" +
@@ -23796,7 +23801,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "</div>\n" +
     "\n" +
     "<div ng-if=\"services\">\n" +
-    "<osc-routing-service model=\"route.to\" services=\"services\" show-weight=\"route.alternateServices.length > 1 || (controls.hideSlider && route.alternateServices.length)\">\n" +
+    "<osc-routing-service model=\"route.to\" service-options=\"services\" all-services=\"servicesByName\" show-weight=\"route.alternateServices.length > 1 || (controls.hideSlider && route.alternateServices.length)\" warn-unnamed-port=\"unnamedServicePort\">\n" +
     "</osc-routing-service>\n" +
     "</div>\n" +
     "\n" +
@@ -23829,7 +23834,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "</div>\n" +
     "</div>\n" +
     "<div ng-repeat=\"alternate in route.alternateServices\" class=\"form-group\">\n" +
-    "<osc-routing-service model=\"alternate\" services=\"alternateServiceOptions\" is-alternate=\"true\" show-weight=\"route.alternateServices.length > 1 || controls.hideSlider\">\n" +
+    "<osc-routing-service model=\"alternate\" service-options=\"alternateServiceOptions\" all-services=\"servicesByName\" is-alternate=\"true\" show-weight=\"route.alternateServices.length > 1 || controls.hideSlider\">\n" +
     "</osc-routing-service>\n" +
     "<a href=\"\" ng-click=\"route.alternateServices.splice($index, 1)\">Remove Service</a>\n" +
     "<span ng-if=\"$last && route.alternateServices.length < alternateServiceOptions.length\">\n" +
@@ -23849,12 +23854,12 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "<div class=\"form-group\">\n" +
     "<div class=\"weight-slider-values\">\n" +
     "<div>\n" +
-    "<span class=\"service-name\">{{route.to.service.metadata.name}}</span>\n" +
+    "<span class=\"service-name\">{{route.to.name}}</span>\n" +
     "<span class=\"weight-percentage\">{{weightAsPercentage(route.to.weight, true)}}</span>\n" +
     "</div>\n" +
     "<div>\n" +
     "<span class=\"weight-percentage hidden-xs\">{{weightAsPercentage(route.alternateServices[0].weight, true)}}</span>\n" +
-    "<span class=\"service-name\">{{route.alternateServices[0].service.metadata.name}}</span>\n" +
+    "<span class=\"service-name\">{{route.alternateServices[0].name}}</span>\n" +
     "<span class=\"weight-percentage visible-xs-inline\">{{weightAsPercentage(route.alternateServices[0].weight, true)}}</span>\n" +
     "</div>\n" +
     "</div>\n" +