Skip to content

Commit

Permalink
Update group SHA tag name (docker-archive#837)
Browse files Browse the repository at this point in the history 
Signed-off-by: Steven Kaufer <[email protected]>
  • Loading branch information
@kaufers
kaufers authored and David Chung committed Jan 18, 2018
1 parent bb7fafa commit 35f95ad
Show file tree
Hide file tree
Showing 15 changed files with 158 additions and 157 deletions.
2 changes: 1 addition & 1 deletion docs/cmd/infrakit/util/init/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
10 changes: 5 additions & 5 deletions docs/controller/ingress/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand Down
24 changes: 12 additions & 12 deletions docs/playbooks/intro/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions docs/plugin/flavor/combo/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions docs/plugin/flavor/vanilla/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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.
tags into the configuration of this instance.
2 changes: 1 addition & 1 deletion docs/plugin/group.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Group plugin API

<!-- SOURCE-CHECKSUM pkg/spi/group/* 751c01c0e77e5398ea98531405c2d40044fc3002 -->
<!-- SOURCE-CHECKSUM pkg/spi/group/* 72f7eeb23400d0ab8affff2bd04b9f3cf016e2ac -->

## API

Expand Down
Loading

0 comments on commit 35f95ad

Please sign in to comment.