Disable deployment retry on web console until we have an api

openshift · Sep 2, 2015 · 3f6ebb8 · 3f6ebb8
1 parent a6808f9
commit 3f6ebb8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/assets/app/scripts/controllers/deployments.js b/assets/app/scripts/controllers/deployments.js
@@ -162,6 +162,8 @@ angular.module('openshiftConsole')
       var deployment = $scope.deploymentsByDeploymentConfig[deploymentConfigName][deploymentName];
       var req = deployment;
 
+      // TODO: we need a "retry" api endpoint so we don't have to do this manually
+
       // delete the deployer pod as well as the deployment hooks pods, if any
       DataService.list("pods", $scope, function(list) {
         var pods = list.by("metadata.name");
@@ -233,6 +235,8 @@ angular.module('openshiftConsole')
         }
       };
 
+      // TODO: we need a "rollback" api endpoint so we don't have to do this manually
+
       // create the deployment config rollback 
       DataService.create("deploymentconfigrollbacks", null, req, $scope).then(
         function(newDeploymentConfig) {
@@ -273,6 +277,8 @@ angular.module('openshiftConsole')
       var deployment = $scope.deploymentsByDeploymentConfig[deploymentConfigName][deploymentName];
       var req = deployment;
 
+      // TODO: we need a "cancel" api endpoint so we don't have to do this manually
+
       // set the cancellation annotations
       var deploymentCancelledAnnotation = $filter('annotationName')('deploymentCancelled');
       var deploymentStatusReasonAnnotation = $filter('annotationName')('deploymentStatusReason');

diff --git a/assets/app/views/deployments.html b/assets/app/views/deployments.html
@@ -146,8 +146,10 @@ <h3>
                       </label>
                     </div>
                     <button type="button" ng-click="rollbackToDeployment(deploymentConfigName, deployment.metadata.name, changeScaleSettings, changeStrategy, changeTriggers)" ng-disabled="(deploymentConfigDeploymentsInProgress[deploymentConfigName] | hashSize) > 0" class="btn btn-primary">Roll Back</button>
-                  </div> 
+                  </div>
+                  <!-- disabled until we have an api endpoint for retry
                   <button ng-show="deploymentStatus(deployment) == 'Failed'" type="button" ng-click="retryFailedDeployment(deploymentConfigName, deployment.metadata.name)" ng-disabled="(deploymentConfigDeploymentsInProgress[deploymentConfigName] | hashSize) > 0" class="btn btn-primary" ng-if="deploymentIsLatest(deploymentConfig, deployment)">Retry</button>
+                  -->
                   <button ng-show="deploymentIsInProgress(deployment)" type="button" ng-click="cancelRunningDeployment(deploymentConfigName, deployment.metadata.name)" class="btn btn-primary">Cancel</button>
                 </span>                
               </div>