Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							02f94eeb0e 
							
						 
					 
					
						
						
							
							Updated k8s scripts  
						
						
						
						
					 
					
						2018-04-16 19:28:12 +02:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							ee113b2118 
							
						 
					 
					
						
						
							
							fixed error on deploy k8s (image names)  
						
						
						
						
					 
					
						2018-04-04 16:25:13 +02:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							5b38d2bf98 
							
						 
					 
					
						
						
							
							Updated k8s file to use only ocelotapigw image  
						
						
						
						
					 
					
						2018-04-03 18:01:38 +02:00 
						 
				 
			
				
					
						
							
							
								David Britch 
							
						 
					 
					
						
						
						
						
							
						
						
							e519fbde43 
							
						 
					 
					
						
						
							
							Merge branch 'bff' into xamarin-settings  
						
						
						
						
					 
					
						2018-03-29 13:52:03 +01:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							0e119eac86 
							
						 
					 
					
						
						
							
							Merge branch 'xamarin-oidcclient' into bff  
						
						... 
						
						
						
						# Conflicts:
#	.dockerignore
#	docker-compose.override.yml
#	docker-compose.yml
#	eShopOnContainers-ServicesAndWebApps.sln
#	k8s/deploy.ps1
#	k8s/deployments.yaml
#	k8s/frontend.yaml
#	src/Services/Identity/Identity.API/Data/ConfigurationDbContextSeed.cs
#	src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs 
						
						
					 
					
						2018-03-23 12:37:12 +01:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							a91850a190 
							
						 
					 
					
						
						
							
							XamarinCallback config in k8s  
						
						
						
						
					 
					
						2018-03-21 18:27:53 +01:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomàs 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							52efbfd3e7 
							
						 
					 
					
						
						
							
							Merge pull request  #525  from SychevIgor/aksversion  
						
						... 
						
						
						
						aks cluster version in a script 
						
						
					 
					
						2018-03-18 12:03:03 +01:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							d9fb7e713c 
							
						 
					 
					
						
						
							
							Error on ocelot config for k8s  
						
						
						
						
					 
					
						2018-03-15 16:13:23 +01:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							72843eb6bb 
							
						 
					 
					
						
						
							
							Missing aggregrators services in k8s config *oops*  
						
						
						
						
					 
					
						2018-03-15 15:49:24 +01:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							5bb67596b9 
							
						 
					 
					
						
						
							
							k8s config updated  
						
						
						
						
					 
					
						2018-03-14 18:25:26 +01:00 
						 
				 
			
				
					
						
							
							
								Sychev Igor 
							
						 
					 
					
						
						
						
						
							
						
						
							df0a2f04be 
							
						 
					 
					
						
						
							
							make servicebus deployment more accurate and self descriptable  
						
						
						
						
					 
					
						2018-03-04 21:55:25 +03:00 
						 
				 
			
				
					
						
							
							
								Sychev Igor 
							
						 
					 
					
						
						
						
						
							
						
						
							34770da738 
							
						 
					 
					
						
						
							
							aks cluster version  
						
						
						
						
					 
					
						2018-03-04 14:11:33 +03:00 
						 
				 
			
				
					
						
							
							
								Liam Barnett 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f33cc304d4 
							
						 
					 
					
						
						
							
							Corrected details for the 'configFile' param  
						
						... 
						
						
						
						Corrected all details related to the 'configFile' parameter. The current documents refer to a .JSON file which does not exist, the script expects a .YAML file (conf_local.yaml' or 'conf_cloud.yaml). 
Corrected the examples to refer to the 'conf_local.yaml' or 'conf_cloud.yaml' files included in this repo. 
						
						
					 
					
						2018-02-08 11:56:45 +00:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomàs 
							
						 
					 
					
						
						
						
						
							
						
						
							4615188057 
							
						 
					 
					
						
						
							
							 
						
						
						
						
					 
					
						2018-01-30 13:30:13 +01:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomàs 
							
						 
					 
					
						
						
						
						
							
						
						
							d1c5eb7a19 
							
						 
					 
					
						
						
							
							 
						
						
						
						
					 
					
						2018-01-30 13:28:32 +01:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomàs 
							
						 
					 
					
						
						
						
						
							
						
						
							c42a096ebb 
							
						 
					 
					
						
						
							
							Deleted frontend.yaml file as is no longer needed  
						
						
						
						
					 
					
						2018-01-24 17:24:03 +01:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomàs 
							
						 
					 
					
						
						
						
						
							
						
						
							b0e17c86a6 
							
						 
					 
					
						
						
							
							Updated deploy.ps1  
						
						
						
						
					 
					
						2018-01-24 17:23:23 +01:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomàs 
							
						 
					 
					
						
						
						
						
							
						
						
							9371eb1077 
							
						 
					 
					
						
						
							
							Add a endpoint returning only a 200 to be used  as a liveness probe for k8s  
						
						
						
						
					 
					
						2018-01-22 11:46:18 +01:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomàs 
							
						 
					 
					
						
						
						
						
							
						
						
							85e83e6389 
							
						 
					 
					
						
						
							
							Fixing minor bugs on k8s deployment  
						
						
						
						
					 
					
						2018-01-19 19:36:29 +01:00 
						 
				 
			
				
					
						
							
							
								Unai Zorrilla Castro 
							
						 
					 
					
						
						
						
						
							
						
						
							14bd6a475a 
							
						 
					 
					
						
						
							
							Added service for backgroundtask  
						
						
						
						
					 
					
						2018-01-19 16:29:35 +01:00 
						 
				 
			
				
					
						
							
							
								Unai Zorrilla Castro 
							
						 
					 
					
						
						
						
						
							
						
						
							12a9cabf7b 
							
						 
					 
					
						
						
							
							Added HealthCheck in backgroundtasks. Modify k8s configuration to include new backgroundtask service. Modify ServiceFabric to include new service ( service fabric is not tested at this moment)  
						
						
						
						
					 
					
						2018-01-19 16:09:55 +01:00 
						 
				 
			
				
					
						
							
							
								Karol Zadora-Przylecki 
							
						 
					 
					
						
						
						
						
							
						
						
							66c8a33cd0 
							
						 
					 
					
						
						
							
							Add comments on deploy.sh limitations  
						
						
						
						
					 
					
						2018-01-18 14:31:32 -08:00 
						 
				 
			
				
					
						
							
							
								Karol Zadora-Przylecki 
							
						 
					 
					
						
						
						
						
							
						
						
							fe0cea7b04 
							
						 
					 
					
						
						
							
							Add deploy bash script (for Mac/Linux)  
						
						
						
						
					 
					
						2018-01-18 14:25:47 -08:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomàs 
							
						 
					 
					
						
						
						
						
							
						
						
							c745c8bd4b 
							
						 
					 
					
						
						
							
							Update broken images  
						
						
						
						
					 
					
						2018-01-18 14:56:05 +01:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomàs 
							
						 
					 
					
						
						
						
						
							
						
						
							266ec51e54 
							
						 
					 
					
						
						
							
							updates to ocelot  
						
						
						
						
					 
					
						2018-01-18 14:45:46 +01:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e869b67c6d 
							
						 
					 
					
						
						
							
							Update README.CICD.k8s.md  
						
						
						
						
					 
					
						2018-01-17 12:06:37 -08:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0f571c2956 
							
						 
					 
					
						
						
							
							Update README.CICD.k8s.md  
						
						
						
						
					 
					
						2018-01-17 12:04:59 -08:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							14b0c01965 
							
						 
					 
					
						
						
							
							Update README.CICD.k8s.md  
						
						
						
						
					 
					
						2018-01-17 12:02:53 -08:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a07acf3aa1 
							
						 
					 
					
						
						
							
							Update README.CICD.k8s.md  
						
						
						
						
					 
					
						2018-01-17 12:01:42 -08:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8aab4cdf2a 
							
						 
					 
					
						
						
							
							Update README.CICD.k8s.md  
						
						
						
						
					 
					
						2018-01-17 11:59:09 -08:00 
						 
				 
			
				
					
						
							
							
								Sychev Igor 
							
						 
					 
					
						
						
						
						
							
						
						
							423cf0acf6 
							
						 
					 
					
						
						
							
							nginx image update  
						
						
						
						
					 
					
						2018-01-17 07:51:09 +02:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomàs 
							
						 
					 
					
						
						
						
						
							
						
						
							ea4e0ed6e8 
							
						 
					 
					
						
						
							
							Deploying ocelot to k8s  
						
						... 
						
						
						
						configuration to ocelot passed through a k8s volume 
						
						
					 
					
						2018-01-11 18:18:16 +01:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomàs 
							
						 
					 
					
						
						
						
						
							
						
						
							33d066389d 
							
						 
					 
					
						
						
							
							remove -buildBits paramater (no longer used)  
						
						
						
						
					 
					
						2018-01-11 11:14:25 +01:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomàs 
							
						 
					 
					
						
						
						
						
							
						
						
							eb742bb662 
							
						 
					 
					
						
						
							
							Support for ingress controller using nginx-ingress  
						
						
						
						
					 
					
						2018-01-10 12:48:23 +01:00 
						 
				 
			
				
					
						
							
							
								Sychev Igor 
							
						 
					 
					
						
						
						
						
							
						
						
							fd3afa41db 
							
						 
					 
					
						
						
							
							aks instead of acs  
						
						
						
						
					 
					
						2017-12-11 17:55:41 +03:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							dbd7636e87 
							
						 
					 
					
						
						
							
							Removed comment from k8s deploy script  
						
						
						
						
					 
					
						2017-12-11 11:59:30 +01:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							7861d5df87 
							
						 
					 
					
						
						
							
							Updated settings for k8s / SF to enable Load testing mode  
						
						... 
						
						
						
						Updated load tests 
						
						
					 
					
						2017-10-26 19:18:45 +02:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							c3e15969b9 
							
						 
					 
					
						
						
							
							Added Appinsights K8s telemetry initializer  
						
						
						
						
					 
					
						2017-10-11 18:53:26 +02:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							e8c8678082 
							
						 
					 
					
						
						
							
							Changed to new GA SQL Server container Image tag and parameters  
						
						
						
						
					 
					
						2017-10-04 13:54:34 -07:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							274ddc2016 
							
						 
					 
					
						
						
							
							Integrate HealthCheck with k8s  
						
						
						
						
					 
					
						2017-10-02 14:40:37 +02:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							bf280abbe8 
							
						 
					 
					
						
						
							
							Merge branch 'dev' of  https://github.com/dotnet-architecture/eShopOnContainers  into dev  
						
						
						
						
					 
					
						2017-09-29 11:45:33 +02:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							0f12640725 
							
						 
					 
					
						
						
							
							Fix issue k8s webstatus: webmvc healthcheck fails  
						
						... 
						
						
						
						Added Payment.api to healthcheck 
						
						
					 
					
						2017-09-29 11:45:25 +02:00 
						 
				 
			
				
					
						
							
							
								Igor Sychev 
							
						 
					 
					
						
						
						
						
							
						
						
							9bbf29fc04 
							
						 
					 
					
						
						
							
							Explicitly specifying parameters for az acs creat  
						
						... 
						
						
						
						Non-preview parameters specified 
						
						
					 
					
						2017-09-28 18:35:57 +05:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomàs 
							
						 
					 
					
						
						
						
						
							
						
						
							2ab5347b7f 
							
						 
					 
					
						
						
							
							fix errors in configmap for k8s  
						
						
						
						
					 
					
						2017-09-21 19:02:42 +02:00 
						 
				 
			
				
					
						
							
							
								Unai Zorrilla Castro 
							
						 
					 
					
						
						
						
						
							
						
						
							0e6c816a96 
							
						 
					 
					
						
						
							
							Merge branch 'dev' of  https://github.com/dotnet/eShopOnContainers  into dev  
						
						
						
						
					 
					
						2017-09-19 15:51:31 +02:00 
						 
				 
			
				
					
						
							
							
								Unai Zorrilla Castro 
							
						 
					 
					
						
						
						
						
							
						
						
							7d4ddca393 
							
						 
					 
					
						
						
							
							Added missing entries for k8s  
						
						
						
						
					 
					
						2017-09-19 15:50:51 +02:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomàs 
							
						 
					 
					
						
						
						
						
							
						
						
							93e2b9137d 
							
						 
					 
					
						
						
							
							Update k8s deployment and compose files with graceperiodmanager settings missing  
						
						
						
						
					 
					
						2017-09-19 12:47:29 +02:00 
						 
				 
			
				
					
						
							
							
								Unai Zorrilla Castro 
							
						 
					 
					
						
						
						
						
							
						
						
							309b6cc43f 
							
						 
					 
					
						
						
							
							Update k8s conf_local with GracePeriodManager mandatory settings  
						
						
						
						
					 
					
						2017-09-19 12:34:47 +02:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							4ea97e2411 
							
						 
					 
					
						
						
							
							Minor comment fixed  
						
						
						
						
					 
					
						2017-09-18 18:23:49 -07:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre 
							
						 
					 
					
						
						
						
						
							
						
						
							ed0ca3e061 
							
						 
					 
					
						
						
							
							Merge pull request  #335  from SychevIgor/SychevIgor/KubeConfigdrop  
						
						... 
						
						
						
						we don't need schema files for k8 in a repo. 
						
						
					 
					
						2017-09-18 16:10:14 -07:00