Skip to content

Don't request isimage more than once on page load #557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 20, 2016
Merged

Don't request isimage more than once on page load #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions app/scripts/controllers/deployment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ angular.module('openshiftConsole')
Navigate,
ProjectsService,
keyValueEditorUtils) {
var imageStreamImageRefByDockerReference = {}; // lets us determine if a particular container's docker image reference belongs to an imageStream

$scope.projectName = $routeParams.project;
$scope.name = $routeParams.deployment;
$scope.forms = {};
$scope.alerts = {};
$scope.imageStreams = {};
$scope.imagesByDockerReference = {};
$scope.imageStreamImageRefByDockerReference = {}; // lets us determine if a particular container's docker image reference belongs to an imageStream
$scope.breadcrumbs = [
{
title: "Deployments",
Expand Down Expand Up @@ -91,7 +91,6 @@ angular.module('openshiftConsole')
$scope.loaded = true;
$scope.deployment = deployment;
updateHPAWarnings();
ImageStreamResolver.fetchReferencedImageStreamImages([deployment.spec.template], $scope.imagesByDockerReference, $scope.imageStreamImageRefByDockerReference, context);

$scope.saveEnvVars = function() {
_.each($scope.updatedDeployment.spec.template.spec.containers, function(container) {
Expand Down Expand Up @@ -156,6 +155,7 @@ angular.module('openshiftConsole')
}

updateHPAWarnings();
ImageStreamResolver.fetchReferencedImageStreamImages([deployment.spec.template], $scope.imagesByDockerReference, imageStreamImageRefByDockerReference, context);
}));

// Watch replica sets for this deployment
Expand Down Expand Up @@ -194,12 +194,12 @@ angular.module('openshiftConsole')
updateHPAWarnings();
});

watches.push(DataService.watch("imagestreams", context, function(imageStreams) {
$scope.imageStreams = imageStreams.by("metadata.name");
ImageStreamResolver.buildDockerRefMapForImageStreams($scope.imageStreams, $scope.imageStreamImageRefByDockerReference);
watches.push(DataService.watch("imagestreams", context, function(imageStreamData) {
var imageStreams = imageStreamData.by("metadata.name");
ImageStreamResolver.buildDockerRefMapForImageStreams(imageStreams, imageStreamImageRefByDockerReference);
// If the deployment has been loaded already
if ($scope.deployment) {
ImageStreamResolver.fetchReferencedImageStreamImages([$scope.deployment.spec.template], $scope.imagesByDockerReference, $scope.imageStreamImageRefByDockerReference, context);
ImageStreamResolver.fetchReferencedImageStreamImages([$scope.deployment.spec.template], $scope.imagesByDockerReference, imageStreamImageRefByDockerReference, context);
}
Logger.log("imagestreams (subscribe)", $scope.imageStreams);
}));
Expand Down
32 changes: 7 additions & 25 deletions app/scripts/controllers/deploymentConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,17 @@ angular.module('openshiftConsole')
LabelFilter,
labelNameFilter,
keyValueEditorUtils) {
var imageStreamImageRefByDockerReference = {}; // lets us determine if a particular container's docker image reference belongs to an imageStream

$scope.projectName = $routeParams.project;
$scope.deploymentConfigName = $routeParams.deploymentconfig;
$scope.deploymentConfig = null;
$scope.deployments = {};
$scope.unfilteredDeployments = {};
$scope.imageStreams = {};
$scope.imagesByDockerReference = {};
$scope.imageStreamImageRefByDockerReference = {}; // lets us determine if a particular container's docker image reference belongs to an imageStream
$scope.builds = {};
$scope.labelSuggestions = {};
$scope.forms = {};
// TODO we should add this back in and show the pod template on this page
//$scope.podTemplates = {};
//$scope.imageStreams = {};
//$scope.imagesByDockerReference = {};
//$scope.imageStreamImageRefByDockerReference = {}; // lets us determine if a particular container's docker image reference belongs to an imageStream
//$scope.builds = {};
$scope.alerts = {};
$scope.breadcrumbs = BreadcrumbsService.getBreadcrumbs({
name: $routeParams.deploymentconfig,
Expand Down Expand Up @@ -97,7 +91,6 @@ angular.module('openshiftConsole')
$scope.loaded = true;
$scope.deploymentConfig = deploymentConfig;
updateHPAWarnings();
ImageStreamResolver.fetchReferencedImageStreamImages([deploymentConfig.spec.template], $scope.imagesByDockerReference, $scope.imageStreamImageRefByDockerReference, context);
copyDeploymentConfigAndEnsureEnv(deploymentConfig);
$scope.saveEnvVars = function() {
_.each($scope.updatedDeploymentConfig.spec.template.spec.containers, function(container) {
Expand Down Expand Up @@ -156,7 +149,7 @@ angular.module('openshiftConsole')
}

updateHPAWarnings();
ImageStreamResolver.fetchReferencedImageStreamImages([deploymentConfig.spec.template], $scope.imagesByDockerReference, $scope.imageStreamImageRefByDockerReference, context);
ImageStreamResolver.fetchReferencedImageStreamImages([deploymentConfig.spec.template], $scope.imagesByDockerReference, imageStreamImageRefByDockerReference, context);
}));
},
// failure
Expand All @@ -170,19 +163,8 @@ angular.module('openshiftConsole')
}
);

// TODO we should add this back in and show the pod template on this page
// function extractPodTemplates() {
// angular.forEach($scope.deployments, function(deployment, deploymentId){
// $scope.podTemplates[deploymentId] = deployment.spec.template;
// });
// }

watches.push(DataService.watch("replicationcontrollers", context, function(deployments, action, deployment) {
var deploymentConfigName = $routeParams.deploymentconfig;

// TODO we should add this back in and show the pod template on this page
// extractPodTemplates();
// ImageStreamResolver.fetchReferencedImageStreamImages($scope.podTemplates, $scope.imagesByDockerReference, $scope.imageStreamImageRefByDockerReference, $scope);
$scope.emptyMessage = "No deployments to show";
if (!action) {
var deploymentsByDeploymentConfig = DeploymentsService.associateDeploymentsToDeploymentConfig(deployments.by("metadata.name"));
Expand Down Expand Up @@ -241,12 +223,12 @@ angular.module('openshiftConsole')
updateHPAWarnings();
});

watches.push(DataService.watch("imagestreams", context, function(imageStreams) {
$scope.imageStreams = imageStreams.by("metadata.name");
ImageStreamResolver.buildDockerRefMapForImageStreams($scope.imageStreams, $scope.imageStreamImageRefByDockerReference);
watches.push(DataService.watch("imagestreams", context, function(imageStreamData) {
var imageStreams = imageStreamData.by("metadata.name");
ImageStreamResolver.buildDockerRefMapForImageStreams(imageStreams, imageStreamImageRefByDockerReference);
// If the dep config has been loaded already
if ($scope.deploymentConfig) {
ImageStreamResolver.fetchReferencedImageStreamImages([$scope.deploymentConfig.spec.template], $scope.imagesByDockerReference, $scope.imageStreamImageRefByDockerReference, context);
ImageStreamResolver.fetchReferencedImageStreamImages([$scope.deploymentConfig.spec.template], $scope.imagesByDockerReference, imageStreamImageRefByDockerReference, context);
}
Logger.log("imagestreams (subscribe)", $scope.imageStreams);
}));
Expand Down
20 changes: 12 additions & 8 deletions app/scripts/controllers/replicaSet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ angular.module('openshiftConsole')
break;
}

// lets us determine if a particular container's docker image reference belongs to an imageStream
var imageStreamImageRefByDockerReference = {};

$scope.projectName = $routeParams.project;
$scope.kind = kind;
// Either a ReplicaSet or a ReplicaSetController
Expand All @@ -51,9 +54,7 @@ angular.module('openshiftConsole')
$scope.deploymentConfig = null;
$scope.deploymentConfigMissing = false;
$scope.deployments = {};
$scope.imageStreams = {};
$scope.imagesByDockerReference = {};
$scope.imageStreamImageRefByDockerReference = {}; // lets us determine if a particular container's docker image reference belongs to an imageStream
$scope.builds = {};
$scope.alerts = {};
$scope.renderOptions = $scope.renderOptions || {};
Expand Down Expand Up @@ -226,14 +227,18 @@ angular.module('openshiftConsole')
// Get the image stream image for the replica set or replication
// controller we're showing to fill out the pod template details.
var getImageStreamImage = function() {
if (_.isEmpty(imageStreamImageRefByDockerReference)) {
return;
}

var podTemplate = _.get($scope, 'deployment.spec.template');
if (!podTemplate) {
return;
}

ImageStreamResolver.fetchReferencedImageStreamImages([ podTemplate ],
$scope.imagesByDockerReference,
$scope.imageStreamImageRefByDockerReference,
imageStreamImageRefByDockerReference,
context);
};

Expand All @@ -245,7 +250,6 @@ angular.module('openshiftConsole')
setLogVars(deployment);
updateDC(deployment);
updateHPAWarnings();
getImageStreamImage();

$scope.breadcrumbs = BreadcrumbsService.getBreadcrumbs({ object: deployment });

Expand Down Expand Up @@ -354,11 +358,11 @@ angular.module('openshiftConsole')
}));

// Sets up subscription for imageStreams
watches.push(DataService.watch("imagestreams", context, function(imageStreams) {
$scope.imageStreams = imageStreams.by("metadata.name");
ImageStreamResolver.buildDockerRefMapForImageStreams($scope.imageStreams, $scope.imageStreamImageRefByDockerReference);
watches.push(DataService.watch("imagestreams", context, function(imageStreamData) {
var imageStreams = imageStreamData.by('metadata.name');
ImageStreamResolver.buildDockerRefMapForImageStreams(imageStreams, imageStreamImageRefByDockerReference);
getImageStreamImage();
Logger.log("imagestreams (subscribe)", $scope.imageStreams);
Logger.log("imagestreams (subscribe)", imageStreams);
}));

watches.push(DataService.watch("builds", context, function(builds) {
Expand Down
Loading