diff --git a/docs/cmd/infrakit/util/init/README.md b/docs/cmd/infrakit/util/init/README.md index fafb59bde..7b8e268b0 100644 --- a/docs/cmd/infrakit/util/init/README.md +++ b/docs/cmd/infrakit/util/init/README.md @@ -67,7 +67,7 @@ echo "The cluster size is 5" The output will be the shell script that the first node of the group `managers` should execute. You can pipe this to `sh` and the node that runs this script will become the first node of the cluster. Note that there are other requirements on the first node -in terms of its configuration and labels (must have a label `infrakit.config_sha=bootstrap`) +in terms of its configuration and labels (must have a label `infrakit.config.hash=bootstrap`) such that it's not possible to run this on your mac and expect it to be the first node of a cluster in AWS. This is meant to be for bootstrapping in the cloud environment where the cluster will be. diff --git a/docs/controller/ingress/README.md b/docs/controller/ingress/README.md index 1f4748797..3571cacd6 100644 --- a/docs/controller/ingress/README.md +++ b/docs/controller/ingress/README.md @@ -164,11 +164,11 @@ Available Commands: ``` $ infrakit group/workers describe ID LOGICAL TAGS -1509939754854003011 - infrakit.config_sha=ruf47dnc2pc5p7c7ed7vzybrfmxnb3rc,infrakit.group=workers,project=infrakit,tier=web -1509939754854379446 - infrakit.config_sha=ruf47dnc2pc5p7c7ed7vzybrfmxnb3rc,infrakit.group=workers,project=infrakit,tier=web -1509939754854683999 - infrakit.config_sha=ruf47dnc2pc5p7c7ed7vzybrfmxnb3rc,infrakit.group=workers,project=infrakit,tier=web -1509939754853268194 - infrakit.config_sha=ruf47dnc2pc5p7c7ed7vzybrfmxnb3rc,infrakit.group=workers,project=infrakit,tier=web -1509939754853647059 - infrakit.config_sha=ruf47dnc2pc5p7c7ed7vzybrfmxnb3rc,infrakit.group=workers,project=infrakit,tier=web +1509939754854003011 - infrakit.config.hash=ruf47dnc2pc5p7c7ed7vzybrfmxnb3rc,infrakit.group=workers,project=infrakit,tier=web +1509939754854379446 - infrakit.config.hash=ruf47dnc2pc5p7c7ed7vzybrfmxnb3rc,infrakit.group=workers,project=infrakit,tier=web +1509939754854683999 - infrakit.config.hash=ruf47dnc2pc5p7c7ed7vzybrfmxnb3rc,infrakit.group=workers,project=infrakit,tier=web +1509939754853268194 - infrakit.config.hash=ruf47dnc2pc5p7c7ed7vzybrfmxnb3rc,infrakit.group=workers,project=infrakit,tier=web +1509939754853647059 - infrakit.config.hash=ruf47dnc2pc5p7c7ed7vzybrfmxnb3rc,infrakit.group=workers,project=infrakit,tier=web ``` diff --git a/docs/playbooks/intro/README.md b/docs/playbooks/intro/README.md index 8c99f1603..2d9effec8 100644 --- a/docs/playbooks/intro/README.md +++ b/docs/playbooks/intro/README.md @@ -347,9 +347,9 @@ ID mygroup Davids-MacBook-Pro-4:~ davidchung$ infrakit group describe mygroup ID LOGICAL TAGS -47605058 - infrakit-do-version=1,infrakit.config_sha=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial -47605059 - infrakit-do-version=1,infrakit.config_sha=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial -47605060 - infrakit-do-version=1,infrakit.config_sha=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial +47605058 - infrakit-do-version=1,infrakit.config.hash=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial +47605059 - infrakit-do-version=1,infrakit.config.hash=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial +47605060 - infrakit-do-version=1,infrakit.config.hash=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial ``` You can kill a node and see the group recover: @@ -359,16 +359,16 @@ $ infrakit instance-digitalocean destroy 47605058 destroyed 47605058 $ infrakit group describe mygroup ID LOGICAL TAGS -47605059 - infrakit-do-version=1,infrakit.config_sha=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial -47605060 - infrakit-do-version=1,infrakit.config_sha=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial +47605059 - infrakit-do-version=1,infrakit.config.hash=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial +47605060 - infrakit-do-version=1,infrakit.config.hash=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial # .... after 10-20 seconds $ infrakit group describe mygroup ID LOGICAL TAGS -47605059 - infrakit-do-version=1,infrakit.config_sha=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial -47605060 - infrakit-do-version=1,infrakit.config_sha=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial -47606009 - infrakit-do-version=1,infrakit.config_sha=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial +47605059 - infrakit-do-version=1,infrakit.config.hash=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial +47605060 - infrakit-do-version=1,infrakit.config.hash=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial +47606009 - infrakit-do-version=1,infrakit.config.hash=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial ``` ## Scale up/down the group @@ -433,10 +433,10 @@ After a bit, check the group: ```shell $ infrakit group describe mygroup ID LOGICAL TAGS -47605060 - infrakit-do-version=1,infrakit.config_sha=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial -47606009 - infrakit-do-version=1,infrakit.config_sha=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial -47606041 - infrakit-do-version=1,infrakit.config_sha=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial -47606318 - infrakit-do-version=1,infrakit.config_sha=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial +47605060 - infrakit-do-version=1,infrakit.config.hash=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial +47606009 - infrakit-do-version=1,infrakit.config.hash=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial +47606041 - infrakit-do-version=1,infrakit.config.hash=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial +47606318 - infrakit-do-version=1,infrakit.config.hash=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial ``` ## Destroy the Group diff --git a/docs/plugin/flavor/combo/README.md b/docs/plugin/flavor/combo/README.md index 169aab5dd..744c05459 100644 --- a/docs/plugin/flavor/combo/README.md +++ b/docs/plugin/flavor/combo/README.md @@ -94,8 +94,8 @@ ID combo $ build/infrakit group describe combo ID LOGICAL TAGS -1505887656884092558 - infrakit.config_sha=k4kacxuwykbyba6ydi36w6tjwj2c3plw,infrakit.group=combo,v1=tag one,v2=tag two -1505887656884528218 - infrakit.config_sha=k4kacxuwykbyba6ydi36w6tjwj2c3plw,infrakit.group=combo,v1=tag one,v2=tag two +1505887656884092558 - infrakit.config.hash=k4kacxuwykbyba6ydi36w6tjwj2c3plw,infrakit.group=combo,v1=tag one,v2=tag two +1505887656884528218 - infrakit.config.hash=k4kacxuwykbyba6ydi36w6tjwj2c3plw,infrakit.group=combo,v1=tag one,v2=tag two ``` Note that now two instances are created and each instance has the tags from @@ -116,12 +116,12 @@ $ build/infrakit simulator/compute describe -pry Properties: Note: custom field Tags: - infrakit.config_sha: k4kacxuwykbyba6ydi36w6tjwj2c3plw + infrakit.config.hash: k4kacxuwykbyba6ydi36w6tjwj2c3plw infrakit.group: combo v1: tag one v2: tag two Tags: - infrakit.config_sha: k4kacxuwykbyba6ydi36w6tjwj2c3plw + infrakit.config.hash: k4kacxuwykbyba6ydi36w6tjwj2c3plw infrakit.group: combo v1: tag one v2: tag two @@ -136,12 +136,12 @@ $ build/infrakit simulator/compute describe -pry Properties: Note: custom field Tags: - infrakit.config_sha: k4kacxuwykbyba6ydi36w6tjwj2c3plw + infrakit.config.hash: k4kacxuwykbyba6ydi36w6tjwj2c3plw infrakit.group: combo v1: tag one v2: tag two Tags: - infrakit.config_sha: k4kacxuwykbyba6ydi36w6tjwj2c3plw + infrakit.config.hash: k4kacxuwykbyba6ydi36w6tjwj2c3plw infrakit.group: combo v1: tag one v2: tag two @@ -161,12 +161,12 @@ Note that the `Init` are also chained together in sequence: Properties: Note: custom field Tags: - infrakit.config_sha: k4kacxuwykbyba6ydi36w6tjwj2c3plw + infrakit.config.hash: k4kacxuwykbyba6ydi36w6tjwj2c3plw infrakit.group: combo v1: tag one v2: tag two Tags: - infrakit.config_sha: k4kacxuwykbyba6ydi36w6tjwj2c3plw + infrakit.config.hash: k4kacxuwykbyba6ydi36w6tjwj2c3plw infrakit.group: combo v1: tag one v2: tag two diff --git a/docs/plugin/flavor/vanilla/README.md b/docs/plugin/flavor/vanilla/README.md index a63031ec1..6a8253357 100644 --- a/docs/plugin/flavor/vanilla/README.md +++ b/docs/plugin/flavor/vanilla/README.md @@ -163,7 +163,7 @@ ID vanilla $ build/infrakit group describe vanilla ID LOGICAL TAGS -1505889013394060520 - infrakit.config_sha=rvhmljoz72va6rrmbypwsxahwkb6g6sq,infrakit.group=vanilla,project=infrakit,tier=web +1505889013394060520 - infrakit.config.hash=rvhmljoz72va6rrmbypwsxahwkb6g6sq,infrakit.group=vanilla,project=infrakit,tier=web ``` Checking on the actual instance: @@ -182,16 +182,16 @@ $ build/infrakit simulator/compute describe -pry Properties: Note: custom field Tags: - infrakit.config_sha: rvhmljoz72va6rrmbypwsxahwkb6g6sq + infrakit.config.hash: rvhmljoz72va6rrmbypwsxahwkb6g6sq infrakit.group: vanilla project: infrakit tier: web Tags: - infrakit.config_sha: rvhmljoz72va6rrmbypwsxahwkb6g6sq + infrakit.config.hash: rvhmljoz72va6rrmbypwsxahwkb6g6sq infrakit.group: vanilla project: infrakit tier: web ``` Note that the vanilla flavor (`french_vanilla`) has injected the init and -tags into the configuration of this instance. \ No newline at end of file +tags into the configuration of this instance. diff --git a/docs/plugin/group.md b/docs/plugin/group.md index 2172b8ed4..44d898aca 100644 --- a/docs/plugin/group.md +++ b/docs/plugin/group.md @@ -1,6 +1,6 @@ # Group plugin API - + ## API diff --git a/docs/tutorial/README.md b/docs/tutorial/README.md index 17f3aea2b..42cd99e6d 100644 --- a/docs/tutorial/README.md +++ b/docs/tutorial/README.md @@ -499,11 +499,11 @@ To show the instances in this group: ```shell $ infrakit group/workers describe ID LOGICAL TAGS -1506521294112164848 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers -1506521294112934083 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers -1506521294113965200 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers -1506521294108257066 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers -1506521294108791344 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers +1506521294112164848 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers +1506521294112934083 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers +1506521294113965200 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers +1506521294108257066 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers +1506521294108791344 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers ``` Note that we now have 5 instances in this group as specified. Doing a @@ -536,14 +536,14 @@ $ infrakit group/workers scale Group workers at 8 instances $ infrakit group/workers describe ID LOGICAL TAGS -1506521644119689998 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers -1506521644120385464 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers -1506521644121107015 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers -1506521644121475146 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers -1506521644119306272 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers -1506521644118947079 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers -1506521644120035107 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers -1506521644120738724 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers +1506521644119689998 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers +1506521644120385464 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers +1506521644121107015 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers +1506521644121475146 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers +1506521644119306272 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers +1506521644118947079 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers +1506521644120035107 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers +1506521644120738724 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers ``` We can use the Instance plugin to remove some instances: @@ -561,14 +561,14 @@ $ infrakit group/workers scale Group workers at 8 instances $ infrakit group/workers describe ID LOGICAL TAGS -1506521644119306272 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers -1506521644119689998 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers -1506521644120385464 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers -1506521644121107015 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers -1506521644121475146 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers -1506521644120738724 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers -1506521824108334555 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers -1506521824108717234 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers +1506521644119306272 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers +1506521644119689998 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers +1506521644120385464 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers +1506521644121107015 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers +1506521644121475146 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers +1506521644120738724 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers +1506521824108334555 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers +1506521824108717234 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers ``` We can scale down the group: @@ -578,8 +578,8 @@ $ infrakit group/workers scale 2 Group workers at 8 instances, scale to 2 $ infrakit group/workers describe ID LOGICAL TAGS -1506521824108334555 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers -1506521824108717234 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers +1506521824108334555 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers +1506521824108717234 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=oskdoyfaewtrrmwlychnja3ejwz574ue,infrakit.group=workers ``` @@ -660,11 +660,11 @@ Let's check: ```shell $ infrakit group/workers describe ID LOGICAL TAGS -1506522342940736322 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=d2m6ncxw5kprf7j35tpl32pcygskuegh,infrakit.group=workers -1506522362939812225 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=d2m6ncxw5kprf7j35tpl32pcygskuegh,infrakit.group=workers -1506522362940587401 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=d2m6ncxw5kprf7j35tpl32pcygskuegh,infrakit.group=workers -1506522352940180493 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=d2m6ncxw5kprf7j35tpl32pcygskuegh,infrakit.group=workers -1506522362940219804 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=d2m6ncxw5kprf7j35tpl32pcygskuegh,infrakit.group=workers +1506522342940736322 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=d2m6ncxw5kprf7j35tpl32pcygskuegh,infrakit.group=workers +1506522362939812225 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=d2m6ncxw5kprf7j35tpl32pcygskuegh,infrakit.group=workers +1506522362940587401 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=d2m6ncxw5kprf7j35tpl32pcygskuegh,infrakit.group=workers +1506522352940180493 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=d2m6ncxw5kprf7j35tpl32pcygskuegh,infrakit.group=workers +1506522362940219804 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=d2m6ncxw5kprf7j35tpl32pcygskuegh,infrakit.group=workers ``` We see that we have come back to 5 instances in this group (as specified in `group2.yml`). diff --git a/docs/tutorial/multi.md b/docs/tutorial/multi.md index 5aa269630..c6a7d4b54 100644 --- a/docs/tutorial/multi.md +++ b/docs/tutorial/multi.md @@ -143,16 +143,16 @@ Now we have a new group `group/workers`: ```shell $ infrakit group/workers describe ID LOGICAL TAGS -1506528402034960841 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers -1506528402036560109 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers -1506528402038196749 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers -1506528402039391770 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers -1506528402041415151 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers -1506528402042777184 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers -1506528402044321191 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers -1506528402045768137 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers -1506528402049931166 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers -1506528402051590289 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers +1506528402034960841 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers +1506528402036560109 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers +1506528402038196749 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers +1506528402039391770 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers +1506528402041415151 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers +1506528402042777184 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers +1506528402044321191 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers +1506528402045768137 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers +1506528402049931166 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers +1506528402051590289 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers ``` And we can see that they are from different zones: @@ -160,11 +160,11 @@ And we can see that they are from different zones: ```shell $ infrakit us-east-1a/compute describe ID LOGICAL TAGS -1506528402034960841 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers -1506528402038196749 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers -1506528402039391770 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers -1506528402044321191 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers -1506528402045768137 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers +1506528402034960841 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers +1506528402038196749 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers +1506528402039391770 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers +1506528402044321191 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers +1506528402045768137 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers ``` and in `us-east-1b`: @@ -172,11 +172,11 @@ and in `us-east-1b`: ```shell $ infrakit us-east-1b/compute describe ID LOGICAL TAGS -1506528402036560109 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers -1506528402041415151 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers -1506528402042777184 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers -1506528402049931166 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers -1506528402051590289 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers +1506528402036560109 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers +1506528402041415151 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers +1506528402042777184 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers +1506528402049931166 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers +1506528402051590289 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers ``` Scaling down the group will remove the instances evenly: @@ -186,12 +186,12 @@ $ infrakit group/workers scale 4 Group workers at 10 instances, scale to 4 $ infrakit us-east-1b/compute describe ID LOGICAL TAGS -1506528402051590289 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers -1506528402049931166 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers +1506528402051590289 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers +1506528402049931166 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers $ infrakit us-east-1a/compute describe ID LOGICAL TAGS -1506528402044321191 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers -1506528402045768137 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers +1506528402044321191 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers +1506528402045768137 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=6ukklp23vulgg343jobm4as6ndyo4a5r,infrakit.group=workers ``` Destroying the group will remove all instances across the two zones: @@ -349,11 +349,11 @@ Now checkt the group: ```shell $ infrakit group/workers describe ID LOGICAL TAGS -1506529768374681221 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers -1506529768376553466 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers -1506529768377518027 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers -1506529768383265310 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers -1506529768385038942 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers +1506529768374681221 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers +1506529768376553466 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers +1506529768377518027 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers +1506529768383265310 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers +1506529768385038942 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers ``` And from the different instance plugins: @@ -361,9 +361,9 @@ And from the different instance plugins: ```shell $ infrakit spot/compute describe ID LOGICAL TAGS -1506529768374681221 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers -1506529768376553466 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers -1506529768377518027 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers +1506529768374681221 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers +1506529768376553466 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers +1506529768377518027 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers ``` and ondemand instances @@ -371,8 +371,8 @@ and ondemand instances ```shell $ infrakit ondemand/compute describe ID LOGICAL TAGS -1506529768383265310 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers -1506529768385038942 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers +1506529768383265310 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers +1506529768385038942 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers ``` So we see that the first 3 instances were provisioned with spot instances which will @@ -391,9 +391,9 @@ We see that 3 spot instances remain: ```shell $ infrakit spot/compute describe ID LOGICAL TAGS -1506529768374681221 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers -1506529768376553466 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers -1506529768377518027 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers +1506529768374681221 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers +1506529768376553466 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers +1506529768377518027 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers ``` while more on-demand instances are found: @@ -401,13 +401,13 @@ while more on-demand instances are found: ```shell $ infrakit ondemand/compute describe ID LOGICAL TAGS -1506529768385038942 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers -1506529988381197479 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers -1506529988381729041 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers -1506529988382941302 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers -1506529988384036924 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers -1506529988384666030 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers -1506529768383265310 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers +1506529768385038942 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers +1506529988381197479 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers +1506529988381729041 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers +1506529988382941302 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers +1506529988384036924 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers +1506529988384666030 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers +1506529768383265310 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers ``` Now scaling down: @@ -417,10 +417,10 @@ $ infrakit group/workers scale 4 Group workers at 10 instances, scale to 4 $ infrakit ondemand/compute describe ID LOGICAL TAGS -1506529988381729041 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers -1506529988382941302 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers -1506529988384036924 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers -1506529988384666030 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config_sha=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers +1506529988381729041 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers +1506529988382941302 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers +1506529988384036924 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers +1506529988384666030 - custom.tag1=tutorial,custom.tag2=single-instance,custom.tag3=by-group,infrakit.config.hash=kyexlihytvcnhjgod4ebi4mf3prsuebu,infrakit.group=workers $ infrakit spot/compute describe ID LOGICAL TAGS ``` diff --git a/pkg/plugin/flavor/swarm/README.md b/pkg/plugin/flavor/swarm/README.md index bbd925d17..325702aaf 100644 --- a/pkg/plugin/flavor/swarm/README.md +++ b/pkg/plugin/flavor/swarm/README.md @@ -101,7 +101,7 @@ the Swarm requires: a. exposing the Docker remote API for the InfraKit plugin to access join tokens b. running InfraKit on the manager nodes to access join tokens via the Docker socket - + We recommend approach (b) for anything but demonstration purposes unless the Docker daemon socket is [secured](https://docs.docker.com/engine/security/https/). For simplicity, **this example does not secure Docker socket**. @@ -163,7 +163,7 @@ INFO[11-03|14:34:31] PID file created module=run path=/U INFO[11-03|14:34:31] Server started module=run discovery=/Users/me/.infrakit/plugins/instance-vagrant fn=github.com/docker/infrakit/pkg/run.run.func1 Plugins started. Do something like: infrakit manager commit file:///Users/me/projects/src/github.com/docker/infrakit/examples/flavor/swarm/groups-fast.json - + ``` @@ -176,9 +176,9 @@ a full Docker install, can be found in `groups.json`. ```shell ~/projects/src/github.com/docker/infrakit$ infrakit manager commit file:///Users/davidchung/projects/src/github.com/docker/infrakit/examples/flavor/swarm/groups-fast.json INFO[0000] Found manager group is leader = true -INFO[0000] Found manager as group at /Users/davidchung/.infrakit/plugins/group +INFO[0000] Found manager as group at /Users/davidchung/.infrakit/plugins/group INFO[0000] Using file:///Users/davidchung/projects/src/github.com/docker/infrakit/examples/flavor/swarm/groups-fast.json for reading template - + Group swarm-workers with plugin group plan: Managing 3 instances Group swarm-managers with plugin group plan: Managing 3 instances ``` @@ -199,22 +199,22 @@ You will see the sequential interactions of the plugins. Here's an example: ```shell ==> group-stateless.log <== -time="2017-01-31T16:38:22-08:00" level=debug msg="Received response HTTP/1.1 200 OK\r\nContent-Length: 1288\r\nContent-Type: text/plain; charset=utf-8\r\nDate: Wed, 01 Feb 2017 00:38:22 GMT\r\n\r\n{\"jsonrpc\":\"2.0\",\"result\":{\"Type\":\"manager\",\"Spec\":{\"Properties\":{\"Box\":\"ubuntu/trusty64\"},\"Tags\":{\"infrakit-link\":\"HmjVIS7jEMNMu3mU\",\"infrakit-link-context\":\"swarm/t9vg5zqmdtw8ovhniwifszwbw/manager\",\"infrakit.config_sha\":\"UBS6BBMA84vUjjtMceeraQGP_eQ=\",\"infrakit.group\":\"swarm-managers\",\"swarm-id\":\"t9vg5zqmdtw8ovhniwifszwbw\"},\"Init\":\"#!/bin/sh\\nset -o errexit\\nset -o nounset\\nset -o xtrace\\n\\n\\n\\n# Tested on Ubuntu/trusty\\n\\napt-get update -y\\napt-get upgrade -y\\nwget -qO- https://get.docker.com/ | sh\\n\\n# Tell Docker to listen on port 4243 for remote API access. This is optional.\\necho DOCKER_OPTS=\\\\\\\"-H tcp://0.0.0.0:4243 -H unix:///var/run/docker.sock\\\\\\\" \\u003e\\u003e /etc/default/docker\\n\\n# Restart Docker to let port listening take effect.\\nservice docker restart\\n\\n\\nmkdir -p /etc/docker\\ncat \\u003c\\u003c EOF \\u003e /etc/docker/daemon.json\\n{\\n \\\"labels\\\": [\\n \\\"infrakit-link=HmjVIS7jEMNMu3mU\\\",\\n \\\"infrakit-link-context=swarm/t9vg5zqmdtw8ovhniwifszwbw/manager\\\"\\n]\\n}\\nEOF\\n\\n\\nkill -s HUP $(cat /var/run/docker.pid)\\nsleep 5\\n\\n\\n\\n \\n \\n\\n \\n docker swarm join 192.168.2.200:4243 --token SWMTKN-1-69316t20viiyh4bwwg8ae2rx6p6obqojfnnxbwfo4dbn3b0npx-68n9c4khokso84f3unn53c15h\\n\\n\\n\\n\\n\",\"LogicalID\":\"192.168.2.202\",\"Attachments\":null}},\"id\":204406773822125757}\n" -time="2017-01-31T16:38:22-08:00" level=debug msg="Received response HTTP/1.1 200 OK\r\nContent-Length: 1289\r\nContent-Type: text/plain; charset=utf-8\r\nDate: Wed, 01 Feb 2017 00:38:22 GMT\r\n\r\n{\"jsonrpc\":\"2.0\",\"result\":{\"Type\":\"manager\",\"Spec\":{\"Properties\":{\"Box\":\"ubuntu/trusty64\"},\"Tags\":{\"infrakit-link\":\"gOII3YTODwN55QNZ\",\"infrakit-link-context\":\"swarm/t9vg5zqmdtw8ovhniwifszwbw/manager\",\"infrakit.config_sha\":\"UBS6BBMA84vUjjtMceeraQGP_eQ=\",\"infrakit.group\":\"swarm-managers\",\"swarm-id\":\"t9vg5zqmdtw8ovhniwifszwbw\"},\"Init\":\"#!/bin/sh\\nset -o errexit\\nset -o nounset\\nset -o xtrace\\n\\n\\n\\n# Tested on Ubuntu/trusty\\n\\napt-get update -y\\napt-get upgrade -y\\nwget -qO- https://get.docker.com/ | sh\\n\\n# Tell Docker to listen on port 4243 for remote API access. This is optional.\\necho DOCKER_OPTS=\\\\\\\"-H tcp://0.0.0.0:4243 -H unix:///var/run/docker.sock\\\\\\\" \\u003e\\u003e /etc/default/docker\\n\\n# Restart Docker to let port listening take effect.\\nservice docker restart\\n\\n\\nmkdir -p /etc/docker\\ncat \\u003c\\u003c EOF \\u003e /etc/docker/daemon.json\\n{\\n \\\"labels\\\": [\\n \\\"infrakit-link=gOII3YTODwN55QNZ\\\",\\n \\\"infrakit-link-context=swarm/t9vg5zqmdtw8ovhniwifszwbw/manager\\\"\\n]\\n}\\nEOF\\n\\n\\nkill -s HUP $(cat /var/run/docker.pid)\\nsleep 5\\n\\n\\n\\n \\n \\n\\n \\n docker swarm join 192.168.2.200:4243 --token SWMTKN-1-69316t20viiyh4bwwg8ae2rx6p6obqojfnnxbwfo4dbn3b0npx-68n9c4khokso84f3unn53c15h\\n\\n\\n\\n\\n\",\"LogicalID\":\"192.168.2.201\",\"Attachments\":null}},\"id\":5501896949660804411}\n" -time="2017-01-31T16:38:22-08:00" level=debug msg="Sending request POST / HTTP/1.1\r\nHost: a\r\nContent-Type: application/json\r\n\r\n{\"jsonrpc\":\"2.0\",\"method\":\"Instance.Provision\",\"params\":{\"Type\":\"\",\"Spec\":{\"Properties\":{\"Box\":\"ubuntu/trusty64\"},\"Tags\":{\"infrakit-link\":\"HmjVIS7jEMNMu3mU\",\"infrakit-link-context\":\"swarm/t9vg5zqmdtw8ovhniwifszwbw/manager\",\"infrakit.config_sha\":\"UBS6BBMA84vUjjtMceeraQGP_eQ=\",\"infrakit.group\":\"swarm-managers\",\"swarm-id\":\"t9vg5zqmdtw8ovhniwifszwbw\"},\"Init\":\"#!/bin/sh\\nset -o errexit\\nset -o nounset\\nset -o xtrace\\n\\n\\n\\n# Tested on Ubuntu/trusty\\n\\napt-get update -y\\napt-get upgrade -y\\nwget -qO- https://get.docker.com/ | sh\\n\\n# Tell Docker to listen on port 4243 for remote API access. This is optional.\\necho DOCKER_OPTS=\\\\\\\"-H tcp://0.0.0.0:4243 -H unix:///var/run/docker.sock\\\\\\\" \\u003e\\u003e /etc/default/docker\\n\\n# Restart Docker to let port listening take effect.\\nservice docker restart\\n\\n\\nmkdir -p /etc/docker\\ncat \\u003c\\u003c EOF \\u003e /etc/docker/daemon.json\\n{\\n \\\"labels\\\": [\\n \\\"infrakit-link=HmjVIS7jEMNMu3mU\\\",\\n \\\"infrakit-link-context=swarm/t9vg5zqmdtw8ovhniwifszwbw/manager\\\"\\n]\\n}\\nEOF\\n\\n\\nkill -s HUP $(cat /var/run/docker.pid)\\nsleep 5\\n\\n\\n\\n \\n \\n\\n \\n docker swarm join 192.168.2.200:4243 --token SWMTKN-1-69316t20viiyh4bwwg8ae2rx6p6obqojfnnxbwfo4dbn3b0npx-68n9c4khokso84f3unn53c15h\\n\\n\\n\\n\\n\",\"LogicalID\":\"192.168.2.202\",\"Attachments\":null}},\"id\":3237913983924951943}" -time="2017-01-31T16:38:22-08:00" level=debug msg="Sending request POST / HTTP/1.1\r\nHost: a\r\nContent-Type: application/json\r\n\r\n{\"jsonrpc\":\"2.0\",\"method\":\"Instance.Provision\",\"params\":{\"Type\":\"\",\"Spec\":{\"Properties\":{\"Box\":\"ubuntu/trusty64\"},\"Tags\":{\"infrakit-link\":\"gOII3YTODwN55QNZ\",\"infrakit-link-context\":\"swarm/t9vg5zqmdtw8ovhniwifszwbw/manager\",\"infrakit.config_sha\":\"UBS6BBMA84vUjjtMceeraQGP_eQ=\",\"infrakit.group\":\"swarm-managers\",\"swarm-id\":\"t9vg5zqmdtw8ovhniwifszwbw\"},\"Init\":\"#!/bin/sh\\nset -o errexit\\nset -o nounset\\nset -o xtrace\\n\\n\\n\\n# Tested on Ubuntu/trusty\\n\\napt-get update -y\\napt-get upgrade -y\\nwget -qO- https://get.docker.com/ | sh\\n\\n# Tell Docker to listen on port 4243 for remote API access. This is optional.\\necho DOCKER_OPTS=\\\\\\\"-H tcp://0.0.0.0:4243 -H unix:///var/run/docker.sock\\\\\\\" \\u003e\\u003e /etc/default/docker\\n\\n# Restart Docker to let port listening take effect.\\nservice docker restart\\n\\n\\nmkdir -p /etc/docker\\ncat \\u003c\\u003c EOF \\u003e /etc/docker/daemon.json\\n{\\n \\\"labels\\\": [\\n \\\"infrakit-link=gOII3YTODwN55QNZ\\\",\\n \\\"infrakit-link-context=swarm/t9vg5zqmdtw8ovhniwifszwbw/manager\\\"\\n]\\n}\\nEOF\\n\\n\\nkill -s HUP $(cat /var/run/docker.pid)\\nsleep 5\\n\\n\\n\\n \\n \\n\\n \\n docker swarm join 192.168.2.200:4243 --token SWMTKN-1-69316t20viiyh4bwwg8ae2rx6p6obqojfnnxbwfo4dbn3b0npx-68n9c4khokso84f3unn53c15h\\n\\n\\n\\n\\n\",\"LogicalID\":\"192.168.2.201\",\"Attachments\":null}},\"id\":823635831294852014}" +time="2017-01-31T16:38:22-08:00" level=debug msg="Received response HTTP/1.1 200 OK\r\nContent-Length: 1288\r\nContent-Type: text/plain; charset=utf-8\r\nDate: Wed, 01 Feb 2017 00:38:22 GMT\r\n\r\n{\"jsonrpc\":\"2.0\",\"result\":{\"Type\":\"manager\",\"Spec\":{\"Properties\":{\"Box\":\"ubuntu/trusty64\"},\"Tags\":{\"infrakit-link\":\"HmjVIS7jEMNMu3mU\",\"infrakit-link-context\":\"swarm/t9vg5zqmdtw8ovhniwifszwbw/manager\",\"infrakit.config.hash\":\"UBS6BBMA84vUjjtMceeraQGP_eQ=\",\"infrakit.group\":\"swarm-managers\",\"infrakit.cluster.id\":\"t9vg5zqmdtw8ovhniwifszwbw\"},\"Init\":\"#!/bin/sh\\nset -o errexit\\nset -o nounset\\nset -o xtrace\\n\\n\\n\\n# Tested on Ubuntu/trusty\\n\\napt-get update -y\\napt-get upgrade -y\\nwget -qO- https://get.docker.com/ | sh\\n\\n# Tell Docker to listen on port 4243 for remote API access. This is optional.\\necho DOCKER_OPTS=\\\\\\\"-H tcp://0.0.0.0:4243 -H unix:///var/run/docker.sock\\\\\\\" \\u003e\\u003e /etc/default/docker\\n\\n# Restart Docker to let port listening take effect.\\nservice docker restart\\n\\n\\nmkdir -p /etc/docker\\ncat \\u003c\\u003c EOF \\u003e /etc/docker/daemon.json\\n{\\n \\\"labels\\\": [\\n \\\"infrakit-link=HmjVIS7jEMNMu3mU\\\",\\n \\\"infrakit-link-context=swarm/t9vg5zqmdtw8ovhniwifszwbw/manager\\\"\\n]\\n}\\nEOF\\n\\n\\nkill -s HUP $(cat /var/run/docker.pid)\\nsleep 5\\n\\n\\n\\n \\n \\n\\n \\n docker swarm join 192.168.2.200:4243 --token SWMTKN-1-69316t20viiyh4bwwg8ae2rx6p6obqojfnnxbwfo4dbn3b0npx-68n9c4khokso84f3unn53c15h\\n\\n\\n\\n\\n\",\"LogicalID\":\"192.168.2.202\",\"Attachments\":null}},\"id\":204406773822125757}\n" +time="2017-01-31T16:38:22-08:00" level=debug msg="Received response HTTP/1.1 200 OK\r\nContent-Length: 1289\r\nContent-Type: text/plain; charset=utf-8\r\nDate: Wed, 01 Feb 2017 00:38:22 GMT\r\n\r\n{\"jsonrpc\":\"2.0\",\"result\":{\"Type\":\"manager\",\"Spec\":{\"Properties\":{\"Box\":\"ubuntu/trusty64\"},\"Tags\":{\"infrakit-link\":\"gOII3YTODwN55QNZ\",\"infrakit-link-context\":\"swarm/t9vg5zqmdtw8ovhniwifszwbw/manager\",\"infrakit.config.hash\":\"UBS6BBMA84vUjjtMceeraQGP_eQ=\",\"infrakit.group\":\"swarm-managers\",\"infrakit.cluster.id\":\"t9vg5zqmdtw8ovhniwifszwbw\"},\"Init\":\"#!/bin/sh\\nset -o errexit\\nset -o nounset\\nset -o xtrace\\n\\n\\n\\n# Tested on Ubuntu/trusty\\n\\napt-get update -y\\napt-get upgrade -y\\nwget -qO- https://get.docker.com/ | sh\\n\\n# Tell Docker to listen on port 4243 for remote API access. This is optional.\\necho DOCKER_OPTS=\\\\\\\"-H tcp://0.0.0.0:4243 -H unix:///var/run/docker.sock\\\\\\\" \\u003e\\u003e /etc/default/docker\\n\\n# Restart Docker to let port listening take effect.\\nservice docker restart\\n\\n\\nmkdir -p /etc/docker\\ncat \\u003c\\u003c EOF \\u003e /etc/docker/daemon.json\\n{\\n \\\"labels\\\": [\\n \\\"infrakit-link=gOII3YTODwN55QNZ\\\",\\n \\\"infrakit-link-context=swarm/t9vg5zqmdtw8ovhniwifszwbw/manager\\\"\\n]\\n}\\nEOF\\n\\n\\nkill -s HUP $(cat /var/run/docker.pid)\\nsleep 5\\n\\n\\n\\n \\n \\n\\n \\n docker swarm join 192.168.2.200:4243 --token SWMTKN-1-69316t20viiyh4bwwg8ae2rx6p6obqojfnnxbwfo4dbn3b0npx-68n9c4khokso84f3unn53c15h\\n\\n\\n\\n\\n\",\"LogicalID\":\"192.168.2.201\",\"Attachments\":null}},\"id\":5501896949660804411}\n" +time="2017-01-31T16:38:22-08:00" level=debug msg="Sending request POST / HTTP/1.1\r\nHost: a\r\nContent-Type: application/json\r\n\r\n{\"jsonrpc\":\"2.0\",\"method\":\"Instance.Provision\",\"params\":{\"Type\":\"\",\"Spec\":{\"Properties\":{\"Box\":\"ubuntu/trusty64\"},\"Tags\":{\"infrakit-link\":\"HmjVIS7jEMNMu3mU\",\"infrakit-link-context\":\"swarm/t9vg5zqmdtw8ovhniwifszwbw/manager\",\"infrakit.config.hash\":\"UBS6BBMA84vUjjtMceeraQGP_eQ=\",\"infrakit.group\":\"swarm-managers\",\"infrakit.cluster.id\":\"t9vg5zqmdtw8ovhniwifszwbw\"},\"Init\":\"#!/bin/sh\\nset -o errexit\\nset -o nounset\\nset -o xtrace\\n\\n\\n\\n# Tested on Ubuntu/trusty\\n\\napt-get update -y\\napt-get upgrade -y\\nwget -qO- https://get.docker.com/ | sh\\n\\n# Tell Docker to listen on port 4243 for remote API access. This is optional.\\necho DOCKER_OPTS=\\\\\\\"-H tcp://0.0.0.0:4243 -H unix:///var/run/docker.sock\\\\\\\" \\u003e\\u003e /etc/default/docker\\n\\n# Restart Docker to let port listening take effect.\\nservice docker restart\\n\\n\\nmkdir -p /etc/docker\\ncat \\u003c\\u003c EOF \\u003e /etc/docker/daemon.json\\n{\\n \\\"labels\\\": [\\n \\\"infrakit-link=HmjVIS7jEMNMu3mU\\\",\\n \\\"infrakit-link-context=swarm/t9vg5zqmdtw8ovhniwifszwbw/manager\\\"\\n]\\n}\\nEOF\\n\\n\\nkill -s HUP $(cat /var/run/docker.pid)\\nsleep 5\\n\\n\\n\\n \\n \\n\\n \\n docker swarm join 192.168.2.200:4243 --token SWMTKN-1-69316t20viiyh4bwwg8ae2rx6p6obqojfnnxbwfo4dbn3b0npx-68n9c4khokso84f3unn53c15h\\n\\n\\n\\n\\n\",\"LogicalID\":\"192.168.2.202\",\"Attachments\":null}},\"id\":3237913983924951943}" +time="2017-01-31T16:38:22-08:00" level=debug msg="Sending request POST / HTTP/1.1\r\nHost: a\r\nContent-Type: application/json\r\n\r\n{\"jsonrpc\":\"2.0\",\"method\":\"Instance.Provision\",\"params\":{\"Type\":\"\",\"Spec\":{\"Properties\":{\"Box\":\"ubuntu/trusty64\"},\"Tags\":{\"infrakit-link\":\"gOII3YTODwN55QNZ\",\"infrakit-link-context\":\"swarm/t9vg5zqmdtw8ovhniwifszwbw/manager\",\"infrakit.config.hash\":\"UBS6BBMA84vUjjtMceeraQGP_eQ=\",\"infrakit.group\":\"swarm-managers\",\"infrakit.cluster.id\":\"t9vg5zqmdtw8ovhniwifszwbw\"},\"Init\":\"#!/bin/sh\\nset -o errexit\\nset -o nounset\\nset -o xtrace\\n\\n\\n\\n# Tested on Ubuntu/trusty\\n\\napt-get update -y\\napt-get upgrade -y\\nwget -qO- https://get.docker.com/ | sh\\n\\n# Tell Docker to listen on port 4243 for remote API access. This is optional.\\necho DOCKER_OPTS=\\\\\\\"-H tcp://0.0.0.0:4243 -H unix:///var/run/docker.sock\\\\\\\" \\u003e\\u003e /etc/default/docker\\n\\n# Restart Docker to let port listening take effect.\\nservice docker restart\\n\\n\\nmkdir -p /etc/docker\\ncat \\u003c\\u003c EOF \\u003e /etc/docker/daemon.json\\n{\\n \\\"labels\\\": [\\n \\\"infrakit-link=gOII3YTODwN55QNZ\\\",\\n \\\"infrakit-link-context=swarm/t9vg5zqmdtw8ovhniwifszwbw/manager\\\"\\n]\\n}\\nEOF\\n\\n\\nkill -s HUP $(cat /var/run/docker.pid)\\nsleep 5\\n\\n\\n\\n \\n \\n\\n \\n docker swarm join 192.168.2.200:4243 --token SWMTKN-1-69316t20viiyh4bwwg8ae2rx6p6obqojfnnxbwfo4dbn3b0npx-68n9c4khokso84f3unn53c15h\\n\\n\\n\\n\\n\",\"LogicalID\":\"192.168.2.201\",\"Attachments\":null}},\"id\":823635831294852014}" ==> instance-vagrant.log <== -time="2017-01-31T16:38:22-08:00" level=debug msg="Received request POST / HTTP/1.1\r\nHost: a\r\nAccept-Encoding: gzip\r\nContent-Length: 1311\r\nContent-Type: application/json\r\nUser-Agent: Go-http-client/1.1\r\n\r\n{\"jsonrpc\":\"2.0\",\"method\":\"Instance.Provision\",\"params\":{\"Type\":\"\",\"Spec\":{\"Properties\":{\"Box\":\"ubuntu/trusty64\"},\"Tags\":{\"infrakit-link\":\"HmjVIS7jEMNMu3mU\",\"infrakit-link-context\":\"swarm/t9vg5zqmdtw8ovhniwifszwbw/manager\",\"infrakit.config_sha\":\"UBS6BBMA84vUjjtMceeraQGP_eQ=\",\"infrakit.group\":\"swarm-managers\",\"swarm-id\":\"t9vg5zqmdtw8ovhniwifszwbw\"},\"Init\":\"#!/bin/sh\\nset -o errexit\\nset -o nounset\\nset -o xtrace\\n\\n\\n\\n# Tested on Ubuntu/trusty\\n\\napt-get update -y\\napt-get upgrade -y\\nwget -qO- https://get.docker.com/ | sh\\n\\n# Tell Docker to listen on port 4243 for remote API access. This is optional.\\necho DOCKER_OPTS=\\\\\\\"-H tcp://0.0.0.0:4243 -H unix:///var/run/docker.sock\\\\\\\" \\u003e\\u003e /etc/default/docker\\n\\n# Restart Docker to let port listening take effect.\\nservice docker restart\\n\\n\\nmkdir -p /etc/docker\\ncat \\u003c\\u003c EOF \\u003e /etc/docker/daemon.json\\n{\\n \\\"labels\\\": [\\n \\\"infrakit-link=HmjVIS7jEMNMu3mU\\\",\\n \\\"infrakit-link-context=swarm/t9vg5zqmdtw8ovhniwifszwbw/manager\\\"\\n]\\n}\\nEOF\\n\\n\\nkill -s HUP $(cat /var/run/docker.pid)\\nsleep 5\\n\\n\\n\\n \\n \\n\\n \\n docker swarm join 192.168.2.200:4243 --token SWMTKN-1-69316t20viiyh4bwwg8ae2rx6p6obqojfnnxbwfo4dbn3b0npx-68n9c4khokso84f3unn53c15h\\n\\n\\n\\n\\n\",\"LogicalID\":\"192.168.2.202\",\"Attachments\":null}},\"id\":3237913983924951943}" -time="2017-01-31T16:38:22-08:00" level=debug msg="Received request POST / HTTP/1.1\r\nHost: a\r\nAccept-Encoding: gzip\r\nContent-Length: 1310\r\nContent-Type: application/json\r\nUser-Agent: Go-http-client/1.1\r\n\r\n{\"jsonrpc\":\"2.0\",\"method\":\"Instance.Provision\",\"params\":{\"Type\":\"\",\"Spec\":{\"Properties\":{\"Box\":\"ubuntu/trusty64\"},\"Tags\":{\"infrakit-link\":\"gOII3YTODwN55QNZ\",\"infrakit-link-context\":\"swarm/t9vg5zqmdtw8ovhniwifszwbw/manager\",\"infrakit.config_sha\":\"UBS6BBMA84vUjjtMceeraQGP_eQ=\",\"infrakit.group\":\"swarm-managers\",\"swarm-id\":\"t9vg5zqmdtw8ovhniwifszwbw\"},\"Init\":\"#!/bin/sh\\nset -o errexit\\nset -o nounset\\nset -o xtrace\\n\\n\\n\\n# Tested on Ubuntu/trusty\\n\\napt-get update -y\\napt-get upgrade -y\\nwget -qO- https://get.docker.com/ | sh\\n\\n# Tell Docker to listen on port 4243 for remote API access. This is optional.\\necho DOCKER_OPTS=\\\\\\\"-H tcp://0.0.0.0:4243 -H unix:///var/run/docker.sock\\\\\\\" \\u003e\\u003e /etc/default/docker\\n\\n# Restart Docker to let port listening take effect.\\nservice docker restart\\n\\n\\nmkdir -p /etc/docker\\ncat \\u003c\\u003c EOF \\u003e /etc/docker/daemon.json\\n{\\n \\\"labels\\\": [\\n \\\"infrakit-link=gOII3YTODwN55QNZ\\\",\\n \\\"infrakit-link-context=swarm/t9vg5zqmdtw8ovhniwifszwbw/manager\\\"\\n]\\n}\\nEOF\\n\\n\\nkill -s HUP $(cat /var/run/docker.pid)\\nsleep 5\\n\\n\\n\\n \\n \\n\\n \\n docker swarm join 192.168.2.200:4243 --token SWMTKN-1-69316t20viiyh4bwwg8ae2rx6p6obqojfnnxbwfo4dbn3b0npx-68n9c4khokso84f3unn53c15h\\n\\n\\n\\n\\n\",\"LogicalID\":\"192.168.2.201\",\"Attachments\":null}},\"id\":823635831294852014}" -time="2017-01-31T16:38:25-08:00" level=info msg="Vagrant STDOUT: Bringing machine 'default' up with 'virtualbox' provider...\n" -time="2017-01-31T16:38:25-08:00" level=info msg="Vagrant STDOUT: Bringing machine 'default' up with 'virtualbox' provider...\n" -time="2017-01-31T16:38:25-08:00" level=info msg="Vagrant STDOUT: ==> default: Importing base box 'ubuntu/trusty64'...\n" -time="2017-01-31T16:38:25-08:00" level=info msg="Vagrant STDOUT: ==> default: Importing base box 'ubuntu/trusty64'...\n" -time="2017-01-31T16:38:40-08:00" level=info msg="Vagrant STDOUT: \r\x1b[KProgress: 90%\r\x1b[K==> default: Matching MAC address for NAT networking...\n" -time="2017-01-31T16:38:40-08:00" level=info msg="Vagrant STDOUT: \r\x1b[KProgress: 90%\r\x1b[K==> default: Matching MAC address for NAT networking...\n" -time="2017-01-31T16:38:40-08:00" level=info msg="Vagrant STDOUT: ==> default: Checking if box 'ubuntu/trusty64' is up to date...\n" -time="2017-01-31T16:38:40-08:00" level=info msg="Vagrant STDOUT: ==> default: Checking if box 'ubuntu/trusty64' is up to date...\n" +time="2017-01-31T16:38:22-08:00" level=debug msg="Received request POST / HTTP/1.1\r\nHost: a\r\nAccept-Encoding: gzip\r\nContent-Length: 1311\r\nContent-Type: application/json\r\nUser-Agent: Go-http-client/1.1\r\n\r\n{\"jsonrpc\":\"2.0\",\"method\":\"Instance.Provision\",\"params\":{\"Type\":\"\",\"Spec\":{\"Properties\":{\"Box\":\"ubuntu/trusty64\"},\"Tags\":{\"infrakit-link\":\"HmjVIS7jEMNMu3mU\",\"infrakit-link-context\":\"swarm/t9vg5zqmdtw8ovhniwifszwbw/manager\",\"infrakit.config.hash\":\"UBS6BBMA84vUjjtMceeraQGP_eQ=\",\"infrakit.group\":\"swarm-managers\",\"infrakit.cluster.id\":\"t9vg5zqmdtw8ovhniwifszwbw\"},\"Init\":\"#!/bin/sh\\nset -o errexit\\nset -o nounset\\nset -o xtrace\\n\\n\\n\\n# Tested on Ubuntu/trusty\\n\\napt-get update -y\\napt-get upgrade -y\\nwget -qO- https://get.docker.com/ | sh\\n\\n# Tell Docker to listen on port 4243 for remote API access. This is optional.\\necho DOCKER_OPTS=\\\\\\\"-H tcp://0.0.0.0:4243 -H unix:///var/run/docker.sock\\\\\\\" \\u003e\\u003e /etc/default/docker\\n\\n# Restart Docker to let port listening take effect.\\nservice docker restart\\n\\n\\nmkdir -p /etc/docker\\ncat \\u003c\\u003c EOF \\u003e /etc/docker/daemon.json\\n{\\n \\\"labels\\\": [\\n \\\"infrakit-link=HmjVIS7jEMNMu3mU\\\",\\n \\\"infrakit-link-context=swarm/t9vg5zqmdtw8ovhniwifszwbw/manager\\\"\\n]\\n}\\nEOF\\n\\n\\nkill -s HUP $(cat /var/run/docker.pid)\\nsleep 5\\n\\n\\n\\n \\n \\n\\n \\n docker swarm join 192.168.2.200:4243 --token SWMTKN-1-69316t20viiyh4bwwg8ae2rx6p6obqojfnnxbwfo4dbn3b0npx-68n9c4khokso84f3unn53c15h\\n\\n\\n\\n\\n\",\"LogicalID\":\"192.168.2.202\",\"Attachments\":null}},\"id\":3237913983924951943}" +time="2017-01-31T16:38:22-08:00" level=debug msg="Received request POST / HTTP/1.1\r\nHost: a\r\nAccept-Encoding: gzip\r\nContent-Length: 1310\r\nContent-Type: application/json\r\nUser-Agent: Go-http-client/1.1\r\n\r\n{\"jsonrpc\":\"2.0\",\"method\":\"Instance.Provision\",\"params\":{\"Type\":\"\",\"Spec\":{\"Properties\":{\"Box\":\"ubuntu/trusty64\"},\"Tags\":{\"infrakit-link\":\"gOII3YTODwN55QNZ\",\"infrakit-link-context\":\"swarm/t9vg5zqmdtw8ovhniwifszwbw/manager\",\"infrakit.config.hash\":\"UBS6BBMA84vUjjtMceeraQGP_eQ=\",\"infrakit.group\":\"swarm-managers\",\"infrakit.cluster.id\":\"t9vg5zqmdtw8ovhniwifszwbw\"},\"Init\":\"#!/bin/sh\\nset -o errexit\\nset -o nounset\\nset -o xtrace\\n\\n\\n\\n# Tested on Ubuntu/trusty\\n\\napt-get update -y\\napt-get upgrade -y\\nwget -qO- https://get.docker.com/ | sh\\n\\n# Tell Docker to listen on port 4243 for remote API access. This is optional.\\necho DOCKER_OPTS=\\\\\\\"-H tcp://0.0.0.0:4243 -H unix:///var/run/docker.sock\\\\\\\" \\u003e\\u003e /etc/default/docker\\n\\n# Restart Docker to let port listening take effect.\\nservice docker restart\\n\\n\\nmkdir -p /etc/docker\\ncat \\u003c\\u003c EOF \\u003e /etc/docker/daemon.json\\n{\\n \\\"labels\\\": [\\n \\\"infrakit-link=gOII3YTODwN55QNZ\\\",\\n \\\"infrakit-link-context=swarm/t9vg5zqmdtw8ovhniwifszwbw/manager\\\"\\n]\\n}\\nEOF\\n\\n\\nkill -s HUP $(cat /var/run/docker.pid)\\nsleep 5\\n\\n\\n\\n \\n \\n\\n \\n docker swarm join 192.168.2.200:4243 --token SWMTKN-1-69316t20viiyh4bwwg8ae2rx6p6obqojfnnxbwfo4dbn3b0npx-68n9c4khokso84f3unn53c15h\\n\\n\\n\\n\\n\",\"LogicalID\":\"192.168.2.201\",\"Attachments\":null}},\"id\":823635831294852014}" +time="2017-01-31T16:38:25-08:00" level=info msg="Vagrant STDOUT: Bringing machine 'default' up with 'virtualbox' provider...\n" +time="2017-01-31T16:38:25-08:00" level=info msg="Vagrant STDOUT: Bringing machine 'default' up with 'virtualbox' provider...\n" +time="2017-01-31T16:38:25-08:00" level=info msg="Vagrant STDOUT: ==> default: Importing base box 'ubuntu/trusty64'...\n" +time="2017-01-31T16:38:25-08:00" level=info msg="Vagrant STDOUT: ==> default: Importing base box 'ubuntu/trusty64'...\n" +time="2017-01-31T16:38:40-08:00" level=info msg="Vagrant STDOUT: \r\x1b[KProgress: 90%\r\x1b[K==> default: Matching MAC address for NAT networking...\n" +time="2017-01-31T16:38:40-08:00" level=info msg="Vagrant STDOUT: \r\x1b[KProgress: 90%\r\x1b[K==> default: Matching MAC address for NAT networking...\n" +time="2017-01-31T16:38:40-08:00" level=info msg="Vagrant STDOUT: ==> default: Checking if box 'ubuntu/trusty64' is up to date...\n" +time="2017-01-31T16:38:40-08:00" level=info msg="Vagrant STDOUT: ==> default: Checking if box 'ubuntu/trusty64' is up to date...\n" ``` @@ -250,15 +250,15 @@ Or use Infrakit `group describe` to see the instances: ```shell ~/projects/src/github.com/docker/infrakit$ infrakit group describe swarm-managers ID LOGICAL TAGS -infrakit-240440289 192.168.2.201 infrakit-link-context=swarm/37phvxcyelv8js1lyqi76hnau/manager,infrakit-link=nbix0txooYIoyiUQ,infrakit.config_sha=mt39WMxI1MX4mFIg03moQjy4OjA=,infrakit.group=swarm-managers,swarm-id=37phvxcyelv8js1lyqi76hnau -infrakit-428836874 192.168.2.202 infrakit-link-context=swarm/37phvxcyelv8js1lyqi76hnau/manager,infrakit-link=dmVwcQ7w49aTj6K7,infrakit.config_sha=mt39WMxI1MX4mFIg03moQjy4OjA=,infrakit.group=swarm-managers,swarm-id=37phvxcyelv8js1lyqi76hnau -infrakit-541061527 192.168.2.200 infrakit-link-context=swarm/?/manager,infrakit-link=wz5NEiBoC02DtO4q,infrakit.config_sha=mt39WMxI1MX4mFIg03moQjy4OjA=,infrakit.group=swarm-managers,swarm-id=? +infrakit-240440289 192.168.2.201 infrakit-link-context=swarm/37phvxcyelv8js1lyqi76hnau/manager,infrakit-link=nbix0txooYIoyiUQ,infrakit.config.hash=mt39WMxI1MX4mFIg03moQjy4OjA=,infrakit.group=swarm-managers,infrakit.cluster.id=37phvxcyelv8js1lyqi76hnau +infrakit-428836874 192.168.2.202 infrakit-link-context=swarm/37phvxcyelv8js1lyqi76hnau/manager,infrakit-link=dmVwcQ7w49aTj6K7,infrakit.config.hash=mt39WMxI1MX4mFIg03moQjy4OjA=,infrakit.group=swarm-managers,infrakit.cluster.id=37phvxcyelv8js1lyqi76hnau +infrakit-541061527 192.168.2.200 infrakit-link-context=swarm/?/manager,infrakit-link=wz5NEiBoC02DtO4q,infrakit.config.hash=mt39WMxI1MX4mFIg03moQjy4OjA=,infrakit.group=swarm-managers,infrakit.cluster.id=? ~/projects/src/github.com/docker/infrakit$ infrakit group describe swarm-workers ID LOGICAL TAGS -infrakit-177710302 - infrakit-link-context=swarm/37phvxcyelv8js1lyqi76hnau/worker,infrakit-link=Q9Pu1jBVSbwMF8mz,infrakit.config_sha=TbwYlrX9Efh6_wIrLKG6B7Zd24s=,infrakit.group=swarm-workers,swarm-id= -infrakit-266730661 - infrakit-link-context=swarm/37phvxcyelv8js1lyqi76hnau/worker,infrakit-link=BQe9jpmy5cx24XVd,infrakit.config_sha=TbwYlrX9Efh6_wIrLKG6B7Zd24s=,infrakit.group=swarm-workers,swarm-id= -infrakit-782909388 - infrakit-link-context=swarm/37phvxcyelv8js1lyqi76hnau/worker,infrakit-link=jjAgxzSlQrpEVLo3,infrakit.config_sha=TbwYlrX9Efh6_wIrLKG6B7Zd24s=,infrakit.group=swarm-workers,swarm-id= -~/projects/src/github.com/docker/infrakit$ +infrakit-177710302 - infrakit-link-context=swarm/37phvxcyelv8js1lyqi76hnau/worker,infrakit-link=Q9Pu1jBVSbwMF8mz,infrakit.config.hash=TbwYlrX9Efh6_wIrLKG6B7Zd24s=,infrakit.group=swarm-workers,infrakit.cluster.id= +infrakit-266730661 - infrakit-link-context=swarm/37phvxcyelv8js1lyqi76hnau/worker,infrakit-link=BQe9jpmy5cx24XVd,infrakit.config.hash=TbwYlrX9Efh6_wIrLKG6B7Zd24s=,infrakit.group=swarm-workers,infrakit.cluster.id= +infrakit-782909388 - infrakit-link-context=swarm/37phvxcyelv8js1lyqi76hnau/worker,infrakit-link=jjAgxzSlQrpEVLo3,infrakit.config.hash=TbwYlrX9Efh6_wIrLKG6B7Zd24s=,infrakit.group=swarm-workers,infrakit.cluster.id= +~/projects/src/github.com/docker/infrakit$ ``` We can clean up vms after this brief demo: diff --git a/pkg/provider/aws/README.md b/pkg/provider/aws/README.md index 036977053..d5c7c2235 100644 --- a/pkg/provider/aws/README.md +++ b/pkg/provider/aws/README.md @@ -114,16 +114,16 @@ Committed aws-example: Managing 1 instances In the console running the Group plugin, we will see input like the following: ``` -INFO[1219] Committing group aws-example (pretend=false) +INFO[1219] Committing group aws-example (pretend=false) INFO[1219] Adding 1 instances to group to reach desired 1 -INFO[1219] Created instance i-ba0412a2 with tags map[infrakit.config_sha:dUBtWGmkptbGg29ecBgv1VJYzys= infrakit.group:aws-example] +INFO[1219] Created instance i-ba0412a2 with tags map[infrakit.config.hash:dUBtWGmkptbGg29ecBgv1VJYzys= infrakit.group:aws-example] ``` Additionally, the CLI will report the newly-created instance: ```console $ build/infrakit group-stateless inspect aws-example ID LOGICAL TAGS -i-ba0412a2 172.31.41.13 Name=infrakit-example,infrakit.config_sha=dUBtWGmkptbGg29ecBgv1VJYzys=,infrakit.group=aws-example +i-ba0412a2 172.31.41.13 Name=infrakit-example,infrakit.config.hash=dUBtWGmkptbGg29ecBgv1VJYzys=,infrakit.group=aws-example ``` Retrieve the IP address of the host from the AWS console, and use SSH to verify that our shell code ran: diff --git a/pkg/provider/docker/README.md b/pkg/provider/docker/README.md index fa9d7aa48..2b2d64d86 100644 --- a/pkg/provider/docker/README.md +++ b/pkg/provider/docker/README.md @@ -84,7 +84,7 @@ Additionally, the CLI will report the newly-created instance: ```console $ build/infrakit group describe docker-example ID LOGICAL TAGS -90e6f3de4918 elusive_leaky Name=infrakit-example,infrakit.config_sha=dUBtWGmkptbGg29ecBgv1VJYzys=,infrakit.group=docker-example +90e6f3de4918 elusive_leaky Name=infrakit-example,infrakit.config.hash=dUBtWGmkptbGg29ecBgv1VJYzys=,infrakit.group=docker-example ``` Retrieve the name of the container and connect to it with an exec diff --git a/pkg/provider/terraform/instance/cattle_demo.md b/pkg/provider/terraform/instance/cattle_demo.md index 99a075d29..f47114df5 100644 --- a/pkg/provider/terraform/instance/cattle_demo.md +++ b/pkg/provider/terraform/instance/cattle_demo.md @@ -83,18 +83,18 @@ $ build/infrakit group commit example/instance/terraform/aws-two-tier/group.json Committed terraform_demo ``` The group plugin starts to create new instances to match the specification. -In the AWS console using `infrakit-terraform-demo` as tag filter, we find +In the AWS console using `infrakit-terraform-demo` as tag filter, we find these instances ![instances](images/1.png) ## 5. List members ```shell $ build/infrakit group describe terraform_demo ID LOGICAL TAGS -instance-1475601644 - Name=instance-1475601644,Tier=web,infrakit.config_sha=BmjtnDnrqBvGHm05Nin3Vb66NaA=,infrakit.group=terraform_demo,provisioner=infrakit-terraform-demo -instance-1475601645 - Name=instance-1475601645,Tier=web,infrakit.config_sha=BmjtnDnrqBvGHm05Nin3Vb66NaA=,infrakit.group=terraform_demo,provisioner=infrakit-terraform-demo -instance-1475601634 - Name=instance-1475601634,Tier=web,infrakit.config_sha=BmjtnDnrqBvGHm05Nin3Vb66NaA=,infrakit.group=terraform_demo,provisioner=infrakit-terraform-demo -instance-1475601635 - Name=instance-1475601635,Tier=web,infrakit.config_sha=BmjtnDnrqBvGHm05Nin3Vb66NaA=,infrakit.group=terraform_demo,provisioner=infrakit-terraform-demo -instance-1475601636 - Name=instance-1475601636,Tier=web,infrakit.config_sha=BmjtnDnrqBvGHm05Nin3Vb66NaA=,infrakit.group=terraform_demo,provisioner=infrakit-terraform-demo +instance-1475601644 - Name=instance-1475601644,Tier=web,infrakit.config.hash=BmjtnDnrqBvGHm05Nin3Vb66NaA=,infrakit.group=terraform_demo,provisioner=infrakit-terraform-demo +instance-1475601645 - Name=instance-1475601645,Tier=web,infrakit.config.hash=BmjtnDnrqBvGHm05Nin3Vb66NaA=,infrakit.group=terraform_demo,provisioner=infrakit-terraform-demo +instance-1475601634 - Name=instance-1475601634,Tier=web,infrakit.config.hash=BmjtnDnrqBvGHm05Nin3Vb66NaA=,infrakit.group=terraform_demo,provisioner=infrakit-terraform-demo +instance-1475601635 - Name=instance-1475601635,Tier=web,infrakit.config.hash=BmjtnDnrqBvGHm05Nin3Vb66NaA=,infrakit.group=terraform_demo,provisioner=infrakit-terraform-demo +instance-1475601636 - Name=instance-1475601636,Tier=web,infrakit.config.hash=BmjtnDnrqBvGHm05Nin3Vb66NaA=,infrakit.group=terraform_demo,provisioner=infrakit-terraform-demo ``` ## 6. Update the config @@ -120,14 +120,14 @@ The commit will proceed in the background, and after a short period the group wi ```shell $ build/infrakit group describe terraform_demo ID LOGICAL TAGS -instance-1475602365 - Name=instance-1475602365,Tier=web,infrakit.config_sha=NP0kIk4bVoojdRZsRGC0XKTrrUs=,infrakit.group=terraform_demo,provisioner=infrakit-terraform-demo -instance-1475602374 - Name=instance-1475602374,Tier=web,infrakit.config_sha=NP0kIk4bVoojdRZsRGC0XKTrrUs=,infrakit.group=terraform_demo,provisioner=infrakit-terraform-demo -instance-1475602314 - Name=instance-1475602314,Tier=web,infrakit.config_sha=NP0kIk4bVoojdRZsRGC0XKTrrUs=,infrakit.group=terraform_demo,provisioner=infrakit-terraform-demo -instance-1475602324 - Name=instance-1475602324,Tier=web,infrakit.config_sha=NP0kIk4bVoojdRZsRGC0XKTrrUs=,infrakit.group=terraform_demo,provisioner=infrakit-terraform-demo -instance-1475602334 - Name=instance-1475602334,Tier=web,infrakit.config_sha=NP0kIk4bVoojdRZsRGC0XKTrrUs=,infrakit.group=terraform_demo,provisioner=infrakit-terraform-demo -instance-1475602344 - Name=instance-1475602344,Tier=web,infrakit.config_sha=NP0kIk4bVoojdRZsRGC0XKTrrUs=,infrakit.group=terraform_demo,provisioner=infrakit-terraform-demo -instance-1475602354 - Name=instance-1475602354,Tier=web,infrakit.config_sha=NP0kIk4bVoojdRZsRGC0XKTrrUs=,infrakit.group=terraform_demo,provisioner=infrakit-terraform-demo -instance-1475602364 - Name=instance-1475602364,Tier=web,infrakit.config_sha=NP0kIk4bVoojdRZsRGC0XKTrrUs=,infrakit.group=terraform_demo,provisioner=infrakit-terraform-demo +instance-1475602365 - Name=instance-1475602365,Tier=web,infrakit.config.hash=NP0kIk4bVoojdRZsRGC0XKTrrUs=,infrakit.group=terraform_demo,provisioner=infrakit-terraform-demo +instance-1475602374 - Name=instance-1475602374,Tier=web,infrakit.config.hash=NP0kIk4bVoojdRZsRGC0XKTrrUs=,infrakit.group=terraform_demo,provisioner=infrakit-terraform-demo +instance-1475602314 - Name=instance-1475602314,Tier=web,infrakit.config.hash=NP0kIk4bVoojdRZsRGC0XKTrrUs=,infrakit.group=terraform_demo,provisioner=infrakit-terraform-demo +instance-1475602324 - Name=instance-1475602324,Tier=web,infrakit.config.hash=NP0kIk4bVoojdRZsRGC0XKTrrUs=,infrakit.group=terraform_demo,provisioner=infrakit-terraform-demo +instance-1475602334 - Name=instance-1475602334,Tier=web,infrakit.config.hash=NP0kIk4bVoojdRZsRGC0XKTrrUs=,infrakit.group=terraform_demo,provisioner=infrakit-terraform-demo +instance-1475602344 - Name=instance-1475602344,Tier=web,infrakit.config.hash=NP0kIk4bVoojdRZsRGC0XKTrrUs=,infrakit.group=terraform_demo,provisioner=infrakit-terraform-demo +instance-1475602354 - Name=instance-1475602354,Tier=web,infrakit.config.hash=NP0kIk4bVoojdRZsRGC0XKTrrUs=,infrakit.group=terraform_demo,provisioner=infrakit-terraform-demo +instance-1475602364 - Name=instance-1475602364,Tier=web,infrakit.config.hash=NP0kIk4bVoojdRZsRGC0XKTrrUs=,infrakit.group=terraform_demo,provisioner=infrakit-terraform-demo ``` Note the new SHA of the instances. diff --git a/pkg/provider/terraform/instance/show.go b/pkg/provider/terraform/instance/show.go index 6a82ef183..7644e0058 100644 --- a/pkg/provider/terraform/instance/show.go +++ b/pkg/provider/terraform/instance/show.go @@ -71,10 +71,10 @@ var mapRegex = regexp.MustCompile("^([^.]+)\\.%") // ssh_key_ids.0 = 123456 // tags.# = 5 // tags.1516831048 = infrakit.group:workers -// tags.3434794676 = infrakit.config_sha:tubmesopo6lrsfnl5otajlpvwd23v46j +// tags.3434794676 = infrakit.config.hash:tubmesopo6lrsfnl5otajlpvwd23v46j // tags.356689043 = name:instance-1499827079 // tags.3639269190 = infrakit-link-context:swarm::c80s4c4kq0kgjs64ojxzvsdjz::worker -// tags.838324444 = swarm-id:c80s4c4kq0kgjs64ojxzvsdjz +// tags.838324444 = infrakit.cluster.id:c80s4c4kq0kgjs64ojxzvsdjz // user_metadata = set -o errexit // set -o nounset // set -o xtrace diff --git a/pkg/provider/terraform/instance/show_test.go b/pkg/provider/terraform/instance/show_test.go index 6146d53f3..ab4df98fe 100644 --- a/pkg/provider/terraform/instance/show_test.go +++ b/pkg/provider/terraform/instance/show_test.go @@ -8,6 +8,7 @@ import ( "strings" "testing" + "github.com/docker/infrakit/pkg/spi/flavor" "github.com/docker/infrakit/pkg/spi/group" "github.com/stretchr/testify/require" @@ -475,10 +476,10 @@ ibm_compute_vm_instance.instance-1499827079: ssh_key_ids.0 = 123456 tags.# = 5 tags.1516831048 = infrakit.group:workers - tags.3434794676 = infrakit.config_sha:tubmesopo6lrsfnl5otajlpvwd23v46j + tags.3434794676 = infrakit.config.hash:tubmesopo6lrsfnl5otajlpvwd23v46j tags.356689043 = name:instance-1499827079 tags.3639269190 = infrakit-link-context:swarm::c80s4c4kq0kgjs64ojxzvsdjz::worker - tags.838324444 = swarm-id:c80s4c4kq0kgjs64ojxzvsdjz + tags.838324444 = infrakit.cluster.id:c80s4c4kq0kgjs64ojxzvsdjz user_metadata = set -o errexit set -o nounset set -o xtrace @@ -521,7 +522,7 @@ func TestTerraformShowParseResultTagsList(t *testing.T) { group.ConfigSHATag + ":tubmesopo6lrsfnl5otajlpvwd23v46j", "name:instance-1499827079", "infrakit-link-context:swarm::c80s4c4kq0kgjs64ojxzvsdjz::worker", - "swarm-id:c80s4c4kq0kgjs64ojxzvsdjz", + flavor.ClusterIDTag + ":c80s4c4kq0kgjs64ojxzvsdjz", }, "user_metadata": "set -o errexit\nset -o nounset\nset -o xtrace\napt-get -y update\nFOO=BAR\necho $FOO", "z_prop": "z_val", @@ -558,7 +559,7 @@ func TestTerraformShowParseResultTagsListWithFilters(t *testing.T) { group.ConfigSHATag + ":tubmesopo6lrsfnl5otajlpvwd23v46j", "name:instance-1499827079", "infrakit-link-context:swarm::c80s4c4kq0kgjs64ojxzvsdjz::worker", - "swarm-id:c80s4c4kq0kgjs64ojxzvsdjz", + flavor.ClusterIDTag + ":c80s4c4kq0kgjs64ojxzvsdjz", }, } require.Equal(t, expected, found[TResourceType("ibm_compute_vm_instance")][TResourceName("instance-1499827079")]) diff --git a/pkg/spi/group/spi.go b/pkg/spi/group/spi.go index 751c01c0e..72f7eeb23 100644 --- a/pkg/spi/group/spi.go +++ b/pkg/spi/group/spi.go @@ -10,7 +10,7 @@ const ( // GroupTag is the name of the tag that contains the group name GroupTag = "infrakit.group" // ConfigSHATag is the name of the tag that contains the group SHA hash - ConfigSHATag = "infrakit.config_sha" + ConfigSHATag = "infrakit.config.hash" ) // InterfaceSpec is the current name and version of the Group API.