Swift 4.0.2 support, CloudEnv migration and Kubernetes Support #40

KyeMaloy97 · 2017-11-22T18:23:45Z

Updated Dockerfile and Travis to Swift 4.0.2, removed Character references in code
Removed SwiftJSON support as Kitura 2 no longer uses it, standard JSONEncoder is now used instead.
Added support for Armada instead of Kracken @ShihabMehboob
Updated the config.sh to add support for Kubernetes @ShihabMehboob
Added some credential JSON files

This PR is instead of the two smaller ones, #37 and #38 , as these two smaller PRs had some code that was shared, especially in the Server side of the application. Passing on Linux on Travis as of this, waiting for Mac to complete building and testing.

Cloudenv migration and Swift 4.0.2 support (Removed SwiftyJSON). The issue402 branch will have all the changes needed for 4.0.2 and CloudEnv support, and will be merged into master at a later point.

sandmman

Looks Good!

christiancompton · 2017-11-27T13:07:56Z

config.sh

-	cf api https://api.ng.bluemix.net
-	cf login
-	cf ic login
+	bx login --sso -a api.eu-gb.bluemix.net


--sso applies only to internal users who are using federated ID - fine for our testing purposes, but must be removed.

Is there a reason why eu-gb is now default?

I would like the api defintion here, and the registry definitions to be dynamic - change it at the top of the file.

christiancompton · 2017-11-27T13:10:18Z

config.sh

 	    populate-db	<imageName>			Populates database with initial data
-	    delete <imageName>				Delete the group container and deletes created service if possible
+	    delete <imageName>				Delete the created service and cluster if possible
 	    all <imageName>                 		Combines all necessary commands to deploy an app to IBM Cloud in a Docker container.


The help commands need to be updated - all prompts me for multiple args, and I do not know what the second one is.

There are a couple of changes needed in the Kubernetes scripts.

christiancompton · 2017-11-27T13:28:28Z

config.sh

@@ -36,31 +38,53 @@ install-tools () {
 	brew tap cloudfoundry/tap
 	brew install cf-cli


Isn't this irrelevant given the bx cli migration?

We should install bx cli here.

christiancompton · 2017-11-27T13:35:50Z

config.sh

-		return
-	fi
-	docker build -t $1 --force-rm .
+	docker build -t registry.eu-gb.bluemix.net/$NAME_SPACE/todolist-couchdb .


This should be dynamic using the registry definition at the top of the file

christiancompton · 2017-11-27T13:36:02Z

config.sh

-	docker tag $1 $REGISTRY_URL/$namespace/$1
-	docker push $REGISTRY_URL/$namespace/$1
+    bx cr login
+	docker push registry.eu-gb.bluemix.net/$NAME_SPACE/todolist-couchdb


This should be dynamic using the registry definition at the top of the file

christiancompton · 2017-11-27T13:36:11Z

config.sh

-	cd ..
-	rm -rf $BRIDGE_APP_NAME
+deployContainer () {
+    kubectl run todo-deployment --image=registry.eu-gb.bluemix.net/$NAME_SPACE/todolist-couchdb


This should be dynamic using the registry definition at the top of the file

christiancompton · 2017-11-27T13:39:07Z

config.sh

@@ -36,31 +38,53 @@ install-tools () {
 	brew tap cloudfoundry/tap
 	brew install cf-cli
 	cf install-plugin https://static-ice.ng.bluemix.net/ibm-containers-mac


christiancompton · 2017-11-27T17:31:20Z

config.sh

@@ -53,7 +53,7 @@ config-cli () {

 login () {
 	echo "Setting api and login tools."
-	bx login --sso -a api.eu-gb.bluemix.net
+	bx login -a $LOGIN_URL


One problem with the migration to resource groups is that the Org/Space targeting is no longer interactive.

This can be resolved by adding bx target --cf below this line.

christiancompton

It is unclear - are imagename and "instance name" the same? They are being used interchangeably.

ShihabMehboob · 2017-12-04T14:47:35Z

The script now works end-to-end (tested multiple times), yet there may still be a small issue in the setup function where creating a new cluster takes time to deploy, a wait time of 5 minutes has been placed to account for this but the deployment may not finish in that time and the script could fail as a result. With internal testing, it will also fail if a cluster already exists as only one is allowed per user. The set -e command has been added to end the execution of the script if it fails, however this may need to be removed as the setup function often fails due to the cluster deployment taking too long, or discovering that a cluster already exists.

christiancompton · 2017-12-05T02:50:22Z

Nice Work @ShihabMehboob! A few more points to address:

The sleep/cluster creation is too unreliable - extract the cluster-create & similar lines to be a separate function, not invoked by the all command.
In the readme, describe this as a prerequisite for using the all and individual commands, including the command to verify that the worker nodes have deployed successfully and can be used.
@sandmman found this problem: The script uses the cluster name as the service/deployment name inside the cluster. But the service/deployment names should be lowercase and without -s, which clusters often have.

The script still does not work for me - the export is not functioning as expected. I suspect that it is because the export command is hardcoded to use the par01 data center. Can you validate that this works if you change the endpoint to be one other than eu-gb? I think if you change the corresponding values at the top, you will experience the same problems.

One final change:

The constraint about US-SOUTH environment is no longer valid - we should use that as our default endpoint since far more users use that geography.

ShihabMehboob · 2017-12-05T12:41:17Z

Addressed all the points and tested again, works fine. The region has been changed to US-SOUTH as well now. Amended the export command to get the datacenter from the passed in cluster, and isolated the setup function with a short excerpt in the readme about it being a prerequisite.

christiancompton · 2017-12-05T23:34:08Z

This script does not work for brand new users in its current form - setup() currently assumes that the bluemix command line, container registry, etc. are installed, but we do that in the install_tools command - which would be run after setup.

Since this presents a problem, let's do the following:

add setup back into the all method
Removing the arbitrary sleep value
requisite readme changes - prereqs and steps
In prereq section, link to the containers UI IBM Cloud page, and say that existing clusters can be used by the script, and warn users that it can take a while to be operational
add a check to see if a cluster by that name already exists, and if not, create one if bx cs / cluster-get <NAME> / then / echo "Cluster not found, attempting to create new cluster..." / bx cs cluster-create <NAME> / fi
after the logic above, add a variation of the following polling mechanism:

until bx cs cluster-get NAME | grep normal
do
    sleep 60
    bx cs cluster-get NAME
    echo "Cluster still provisioning..."
done

echo "Cluster deployed successfully"

I have already validated that these commands will work, even if the bx cli is set to another locale (pt_BR & ko_KR).

christiancompton · 2017-12-21T21:44:09Z

@ShihabMehboob I now see the deployment is now operational, and the app no longer crashes.

To access the app, the NodePort must be exposed in order for the IP to be retrieved. i.e. kubectl expose deployment --type=NodePort. This may impact the run command currently in the script.

This should make an end to end test possible - all(), populate(), & delete(). Once this flow is verified, the PR can be merged.

sandmman · 2018-01-16T01:14:30Z

@ShihabMehboob I heard this was fully working now?! Don't forget to remove the values in config/my-cloudant-credentials.json. I noticed they got inserted in a recent commit.

CLAassistant · 2018-01-24T12:16:19Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
3 out of 4 committers have signed the CLA.

✅ ShihabMehboob
✅ christiancompton
✅ KyeMaloy97
❌ Aaron Liberatore

Aaron Liberatore seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

ShihabMehboob and others added 14 commits November 9, 2017 11:26

Migrating from CloudConfiguration to CloudEnvironment

6a46919

Migration to Armada initial steps

56c5c13

Added config folder

7b2df95

Amend config.sh file to migrate to Armada

e3908a6

Updated push docker method

825f56e

Updates to Armada

1bc4ba1

Updated for Swift 4.0.2

bb64c4f

Update from Kraken to Armada

3aeb17d

Migration to Armada

3819034

Merge branch 'master' into cloudenv_migration

ec9619a

Changed dashes to underscores

d92d08e

Updated Dockerfile to 4.0.2

78431f0

Merge pull request #39 from IBM-Swift/cloudenv_migration

742b68e

Cloudenv migration and Swift 4.0.2 support (Removed SwiftyJSON). The issue402 branch will have all the changes needed for 4.0.2 and CloudEnv support, and will be merged into master at a later point.

Updated to remove SwiftyJSON, uses standard JSON library.

88f6bd3

KyeMaloy97 requested a review from sandmman November 22, 2017 18:23

Update .travis.yml

1104ef2

sandmman previously approved these changes Nov 22, 2017

View reviewed changes

Update mappings.json

46a0bde

KyeMaloy97 mentioned this pull request Nov 23, 2017

Migrating from CloudConfiguration to CloudEnvironment #37

Closed

christiancompton requested changes Nov 27, 2017

View reviewed changes

christiancompton reviewed Nov 27, 2017

View reviewed changes

ShihabMehboob added 2 commits November 27, 2017 15:23

Updated bash script and readme

7234d9d

Update region in bash script

bfedd92

christiancompton reviewed Nov 27, 2017

View reviewed changes

Bash script amendments

5d3fdc5

ShihabMehboob and others added 8 commits December 6, 2017 12:47

Resolved setup process

180f5f5

Namespace fix

397e0ed

Merge branch 'master' into issue.swift402

f4f3eb3

Minor fixes

19da9fd

Lite account warning

e401ec3

Resolved binding error

e53e188

Update dependencies

3f278e7

Update Package.swift

70b9a39

christiancompton mentioned this pull request Dec 18, 2017

Explain how to deploy to Bluemix Container Service (k8s) #34

Open

ShihabMehboob added 2 commits December 20, 2017 16:38

Adjustments to namespace and docker name used

26dda1f

Adjustments to namespace and docker name used

e80444f

ShihabMehboob and others added 7 commits December 22, 2017 12:59

Restructured parts of the script

0e7e322

Script updates

8370f18

Updates to script

8596fa3

Updates to script

dcf4e4c

Script updates

f8d06dd

Resolved docker image issue

0d05a43

port 8080

1a7eaa0

ShihabMehboob added 2 commits January 16, 2018 11:09

Removed credentials

0fc3912

Changes to the script to allow access via a URL

6570fc7

ShihabMehboob added 2 commits January 29, 2018 16:58

Script updates

329478e

Resolved data issues

c227cb1

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Swift 4.0.2 support, CloudEnv migration and Kubernetes Support #40

Swift 4.0.2 support, CloudEnv migration and Kubernetes Support #40

KyeMaloy97 commented Nov 22, 2017

sandmman left a comment

christiancompton Nov 27, 2017

christiancompton Nov 27, 2017

christiancompton Nov 27, 2017

christiancompton Nov 27, 2017

christiancompton Nov 27, 2017

christiancompton Nov 27, 2017

christiancompton Nov 27, 2017

christiancompton Nov 27, 2017

christiancompton Nov 27, 2017

christiancompton Nov 27, 2017

christiancompton Nov 27, 2017

christiancompton left a comment

ShihabMehboob commented Dec 4, 2017 •

edited

Loading

christiancompton commented Dec 5, 2017 •

edited by ShihabMehboob

Loading

ShihabMehboob commented Dec 5, 2017

christiancompton commented Dec 5, 2017 •

edited by ShihabMehboob

Loading

christiancompton commented Dec 21, 2017 •

edited

Loading

sandmman commented Jan 16, 2018

CLAassistant commented Jan 24, 2018 •

edited

Loading

		@@ -36,31 +38,53 @@ install-tools () {
		brew tap cloudfoundry/tap
		brew install cf-cli

Swift 4.0.2 support, CloudEnv migration and Kubernetes Support #40

Are you sure you want to change the base?

Swift 4.0.2 support, CloudEnv migration and Kubernetes Support #40

Conversation

KyeMaloy97 commented Nov 22, 2017

sandmman left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

christiancompton left a comment

Choose a reason for hiding this comment

ShihabMehboob commented Dec 4, 2017 • edited Loading

christiancompton commented Dec 5, 2017 • edited by ShihabMehboob Loading

ShihabMehboob commented Dec 5, 2017

christiancompton commented Dec 5, 2017 • edited by ShihabMehboob Loading

christiancompton commented Dec 21, 2017 • edited Loading

sandmman commented Jan 16, 2018

CLAassistant commented Jan 24, 2018 • edited Loading

ShihabMehboob commented Dec 4, 2017 •

edited

Loading

christiancompton commented Dec 5, 2017 •

edited by ShihabMehboob

Loading

christiancompton commented Dec 5, 2017 •

edited by ShihabMehboob

Loading

christiancompton commented Dec 21, 2017 •

edited

Loading

CLAassistant commented Jan 24, 2018 •

edited

Loading