Merge pull request #863 from spadgett/pod-env-config-map

Merged by openshift-bot

Author: OpenShift Bot

Diff for: app/scripts/controllers/pod.js

@@ -206,11 +206,24 @@ angular.module('openshiftConsole')
       });
     };
 
+    var altTextForValueFrom = $filter('altTextForValueFrom');
+    var updateEnv = function() {
+      // Copy the containers so we aren't modifying the original pod spec.
+      var containers = angular.copy(_.get($scope, 'pod.spec.containers', []));
+      _.each(containers, function(container) {
+        container.env = container.env || [];
+        _.each(container.env, altTextForValueFrom);
+      });
+
+      $scope.containersEnv = containers;
+    };
+
     var podResolved = function(pod, action) {
       $scope.loaded = true;
       $scope.pod = pod;
       setLogVars(pod);
       setContainerVars();
+      updateEnv();
       if (action === "DELETED") {
         $scope.alerts["deleted"] = {
           type: "warning",

Diff for: app/scripts/controllers/replicaSet.js

@@ -80,10 +80,12 @@ angular.module('openshiftConsole')
       $scope.logCanRun = !(_.includes(['New', 'Pending'], $filter('deploymentStatus')(replicaSet)));
     };
 
+    var altTextForValueFrom = $filter('altTextForValueFrom');
     var copyDeploymentAndEnsureEnv = function(replicaSet) {
       $scope.updatedDeployment = angular.copy(replicaSet);
       _.each($scope.updatedDeployment.spec.template.spec.containers, function(container) {
         container.env = container.env || [];
+        _.each(container.env, altTextForValueFrom);
       });
     };
 

Diff for: app/views/browse/pod.html

@@ -59,7 +59,7 @@ <h1>
                   </uib-tab>
                   <uib-tab heading="Environment" active="selectedTab.environment">
                     <uib-tab-heading>Environment</uib-tab-heading>
-                    <div ng-repeat="container in pod.spec.containers">
+                    <div ng-repeat="container in containersEnv">
                       <h3>Container {{container.name}} Environment Variables</h3>
                       <key-value-editor
                         entries="container.env"

Diff for: app/views/browse/replica-set.html

@@ -50,7 +50,13 @@ <h1>
                   </uib-tab>
                   <uib-tab heading="Environment" active="selectedTab.environment">
                     <uib-tab-heading>Environment</uib-tab-heading>
-                    <div ng-if="deployment || (replicaSet | hasDeploymentConfig)">
+                    <!--
+                      Use the `hasDeployment` filter rather than checking for the `deployment` scope
+                      var. This prevents the editor from displaying briefly before the deployment has
+                      loaded, which adds an empty env var name/value to the array. The empty
+                      value breaks `container.env.length` check for the no env vars message.
+                    -->
+                    <div ng-if="(replicaSet | hasDeployment) || (replicaSet | hasDeploymentConfig)">
                       <p ng-if="deployment && ({ group: 'extensions', resource: 'deployments' } | canI : 'update')">
                         <span class="pficon pficon-info" aria-hidden="true"></span>
                         Environment variables can be edited on the <a ng-href="{{deployment | navigateResourceURL}}?tab=environment">deployment</a>.
@@ -59,7 +65,7 @@ <h1>
                         <span class="pficon pficon-info" aria-hidden="true"></span>
                         Environment variables can be edited on the <a ng-href="{{replicaSet | configURLForResource}}?tab=environment">deployment configuration</a>.
                       </p>
-                      <div ng-repeat="container in replicaSet.spec.template.spec.containers">
+                      <div ng-repeat="container in updatedDeployment.spec.template.spec.containers">
                         <h3>Container {{container.name}} Environment Variables</h3>
                         <key-value-editor
                           ng-if="container.env.length"
@@ -74,7 +80,7 @@ <h3>Container {{container.name}} Environment Variables</h3>
                         <em ng-if="!container.env.length">The container specification has no environment variables set.</em>
                       </div>
                     </div>
-                    <ng-form ng-show="!deployment && !(replicaSet | hasDeploymentConfig)" name="forms.envForm">
+                    <ng-form ng-if="!(replicaSet | hasDeployment) && !(replicaSet | hasDeploymentConfig)" name="forms.envForm">
                       <div ng-repeat="container in updatedDeployment.spec.template.spec.containers">
                         <div ng-if="resource | canI : 'update'">
                           <key-value-editor

Diff for: dist/scripts/scripts.js

@@ -4004,18 +4004,23 @@ name:b.containerName
 }), d = t(c);
 b.containerState = d;
 });
-}, x = function(b, c) {
-a.loaded = !0, a.pod = b, n(b), o(), "DELETED" === c && (a.alerts.deleted = {
+}, x = b("altTextForValueFrom"), y = function() {
+var b = angular.copy(_.get(a, "pod.spec.containers", []));
+_.each(b, function(a) {
+a.env = a.env || [], _.each(a.env, x);
+}), a.containersEnv = b;
+}, z = function(b, c) {
+a.loaded = !0, a.pod = b, n(b), o(), y(), "DELETED" === c && (a.alerts.deleted = {
 type:"warning",
 message:"This pod has been deleted."
 });
 };
 k.get(c.project).then(_.spread(function(d, i) {
 m = i, a.project = d, a.projectContext = i, g.get("pods", c.pod, i).then(function(b) {
-x(b);
+z(b);
 var d = {};
 d[b.metadata.name] = b, a.containerTerminals = u(), v(b), h.fetchReferencedImageStreamImages(d, a.imagesByDockerReference, a.imageStreamImageRefByDockerReference, m), l.push(g.watchObject("pods", c.pod, i, function(b, c) {
-x(b, c), w(a.containerTerminals), v(b);
+z(b, c), w(a.containerTerminals), v(b);
 }));
 }, function(c) {
 a.loaded = !0, a.alerts.load = {
@@ -5750,9 +5755,9 @@ a.metricsAvailable = b;
 });
 var u = function(c) {
 a.logCanRun = !_.includes([ "New", "Pending" ], b("deploymentStatus")(c));
-}, v = function(b) {
+}, v = b("altTextForValueFrom"), w = function(b) {
 a.updatedDeployment = angular.copy(b), _.each(a.updatedDeployment.spec.template.spec.containers, function(a) {
-a.env = a.env || [];
+a.env = a.env || [], _.each(a.env, v);
 });
 };
 a.saveEnvVars = function() {
@@ -5771,17 +5776,17 @@ details:"Reason: " + b("getErrorDetails")(c)
 };
 });
 }, a.clearEnvVarUpdates = function() {
-v(a.replicaSet), a.forms.envForm.$setPristine();
+w(a.replicaSet), a.forms.envForm.$setPristine();
 };
-var w = b("isIE")() || b("isEdge")();
+var x = b("isIE")() || b("isEdge")();
 i.get(c.project).then(_.spread(function(d, h) {
 a.project = d, a.projectContext = h;
-var i, n, x = {}, y = {}, z = function() {
-if (a.hpaForRS = g.filterHPA(x, o, c.replicaSet), a.deploymentConfigName && a.isActive) {
-var b = g.filterHPA(x, "DeploymentConfig", a.deploymentConfigName);
+var i, n, v = {}, y = {}, z = function() {
+if (a.hpaForRS = g.filterHPA(v, o, c.replicaSet), a.deploymentConfigName && a.isActive) {
+var b = g.filterHPA(v, "DeploymentConfig", a.deploymentConfigName);
 a.autoscalers = a.hpaForRS.concat(b);
 } else if (a.deployment && a.isActive) {
-var d = g.filterHPA(x, "Deployment", a.deployment.metadata.name);
+var d = g.filterHPA(v, "Deployment", a.deployment.metadata.name);
 a.autoscalers = a.hpaForRS.concat(d);
 } else a.autoscalers = a.hpaForRS;
 }, A = function() {
@@ -5877,7 +5882,7 @@ object:b
 "DELETED" === c && (a.alerts.deleted = {
 type:"warning",
 message:"This " + r + " has been deleted."
-}), a.replicaSet = b, !a.forms.envForm || a.forms.envForm.$pristine ? v(b) :a.alerts.background_update = {
+}), a.replicaSet = b, !a.forms.envForm || a.forms.envForm.$pristine ? w(b) :a.alerts.background_update = {
 type:"warning",
 message:"This " + r + " has been updated in the background. Saving your changes may create a conflict or cause loss of data.",
 links:[ {
@@ -5923,9 +5928,9 @@ a.builds = b.by("metadata.name"), m.log("builds (subscribe)", a.builds);
 group:"extensions",
 resource:"horizontalpodautoscalers"
 }, h, function(a) {
-x = a.by("metadata.name"), z(), C();
+v = a.by("metadata.name"), z(), C();
 }, {
-poll:w,
+poll:x,
 pollInterval:6e4
 })), f.list("limitranges", h, function(a) {
 y = a.by("metadata.name"), C();

Diff for: dist/scripts/templates.js

@@ -2775,7 +2775,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</uib-tab>\n" +
     "<uib-tab heading=\"Environment\" active=\"selectedTab.environment\">\n" +
     "<uib-tab-heading>Environment</uib-tab-heading>\n" +
-    "<div ng-repeat=\"container in pod.spec.containers\">\n" +
+    "<div ng-repeat=\"container in containersEnv\">\n" +
     "<h3>Container {{container.name}} Environment Variables</h3>\n" +
     "<key-value-editor entries=\"container.env\" is-readonly cannot-add cannot-sort cannot-delete ng-if=\"container.env.length\"></key-value-editor>\n" +
     "<em ng-if=\"!container.env.length\">The container specification has no environment variables set.</em>\n" +
@@ -2915,7 +2915,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</uib-tab>\n" +
     "<uib-tab heading=\"Environment\" active=\"selectedTab.environment\">\n" +
     "<uib-tab-heading>Environment</uib-tab-heading>\n" +
-    "<div ng-if=\"deployment || (replicaSet | hasDeploymentConfig)\">\n" +
+    "\n" +
+    "<div ng-if=\"(replicaSet | hasDeployment) || (replicaSet | hasDeploymentConfig)\">\n" +
     "<p ng-if=\"deployment && ({ group: 'extensions', resource: 'deployments' } | canI : 'update')\">\n" +
     "<span class=\"pficon pficon-info\" aria-hidden=\"true\"></span>\n" +
     "Environment variables can be edited on the <a ng-href=\"{{deployment | navigateResourceURL}}?tab=environment\">deployment</a>.\n" +
@@ -2924,13 +2925,13 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<span class=\"pficon pficon-info\" aria-hidden=\"true\"></span>\n" +
     "Environment variables can be edited on the <a ng-href=\"{{replicaSet | configURLForResource}}?tab=environment\">deployment configuration</a>.\n" +
     "</p>\n" +
-    "<div ng-repeat=\"container in replicaSet.spec.template.spec.containers\">\n" +
+    "<div ng-repeat=\"container in updatedDeployment.spec.template.spec.containers\">\n" +
     "<h3>Container {{container.name}} Environment Variables</h3>\n" +
     "<key-value-editor ng-if=\"container.env.length\" entries=\"container.env\" key-placeholder=\"Name\" value-placeholder=\"Value\" cannot-add cannot-delete cannot-sort is-readonly show-header></key-value-editor>\n" +
     "<em ng-if=\"!container.env.length\">The container specification has no environment variables set.</em>\n" +
     "</div>\n" +
     "</div>\n" +
-    "<ng-form ng-show=\"!deployment && !(replicaSet | hasDeploymentConfig)\" name=\"forms.envForm\">\n" +
+    "<ng-form ng-if=\"!(replicaSet | hasDeployment) && !(replicaSet | hasDeploymentConfig)\" name=\"forms.envForm\">\n" +
     "<div ng-repeat=\"container in updatedDeployment.spec.template.spec.containers\">\n" +
     "<div ng-if=\"resource | canI : 'update'\">\n" +
     "<key-value-editor entries=\"container.env\" key-placeholder=\"Name\" value-placeholder=\"Value\" key-validator=\"[A-Za-z_][A-Za-z0-9_]*\" key-validator-error=\"Please enter a valid key\" key-validator-error-tooltip=\"A valid environment variable name is an alphanumeric (a-z and 0-9) string beginning with a letter that may contain underscores.\" add-row-link=\"Add environment variable\" show-header></key-value-editor>\n" +