Skip to content
This repository was archived by the owner on Jan 21, 2020. It is now read-only.

Commit 35f95ad

Browse files
kaufersDavid Chung
authored and
David Chung
committed
Update group SHA tag name (#837)
Signed-off-by: Steven Kaufer <[email protected]>
1 parent bb7fafa commit 35f95ad

File tree

15 files changed

+158
-157
lines changed

15 files changed

+158
-157
lines changed

docs/cmd/infrakit/util/init/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ echo "The cluster size is 5"
6767
The output will be the shell script that the first node of the group `managers` should
6868
execute. You can pipe this to `sh` and the node that runs this script will become
6969
the first node of the cluster. Note that there are other requirements on the first node
70-
in terms of its configuration and labels (must have a label `infrakit.config_sha=bootstrap`)
70+
in terms of its configuration and labels (must have a label `infrakit.config.hash=bootstrap`)
7171
such that it's not possible to run this on your mac and expect it to be the first node of
7272
a cluster in AWS. This is meant to be for bootstrapping in the cloud environment where the
7373
cluster will be.

docs/controller/ingress/README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,11 @@ Available Commands:
164164
```
165165
$ infrakit group/workers describe
166166
ID LOGICAL TAGS
167-
1509939754854003011 - infrakit.config_sha=ruf47dnc2pc5p7c7ed7vzybrfmxnb3rc,infrakit.group=workers,project=infrakit,tier=web
168-
1509939754854379446 - infrakit.config_sha=ruf47dnc2pc5p7c7ed7vzybrfmxnb3rc,infrakit.group=workers,project=infrakit,tier=web
169-
1509939754854683999 - infrakit.config_sha=ruf47dnc2pc5p7c7ed7vzybrfmxnb3rc,infrakit.group=workers,project=infrakit,tier=web
170-
1509939754853268194 - infrakit.config_sha=ruf47dnc2pc5p7c7ed7vzybrfmxnb3rc,infrakit.group=workers,project=infrakit,tier=web
171-
1509939754853647059 - infrakit.config_sha=ruf47dnc2pc5p7c7ed7vzybrfmxnb3rc,infrakit.group=workers,project=infrakit,tier=web
167+
1509939754854003011 - infrakit.config.hash=ruf47dnc2pc5p7c7ed7vzybrfmxnb3rc,infrakit.group=workers,project=infrakit,tier=web
168+
1509939754854379446 - infrakit.config.hash=ruf47dnc2pc5p7c7ed7vzybrfmxnb3rc,infrakit.group=workers,project=infrakit,tier=web
169+
1509939754854683999 - infrakit.config.hash=ruf47dnc2pc5p7c7ed7vzybrfmxnb3rc,infrakit.group=workers,project=infrakit,tier=web
170+
1509939754853268194 - infrakit.config.hash=ruf47dnc2pc5p7c7ed7vzybrfmxnb3rc,infrakit.group=workers,project=infrakit,tier=web
171+
1509939754853647059 - infrakit.config.hash=ruf47dnc2pc5p7c7ed7vzybrfmxnb3rc,infrakit.group=workers,project=infrakit,tier=web
172172
173173
```
174174

docs/playbooks/intro/README.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -347,9 +347,9 @@ ID
347347
mygroup
348348
Davids-MacBook-Pro-4:~ davidchung$ infrakit group describe mygroup
349349
ID LOGICAL TAGS
350-
47605058 - infrakit-do-version=1,infrakit.config_sha=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial
351-
47605059 - infrakit-do-version=1,infrakit.config_sha=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial
352-
47605060 - infrakit-do-version=1,infrakit.config_sha=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial
350+
47605058 - infrakit-do-version=1,infrakit.config.hash=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial
351+
47605059 - infrakit-do-version=1,infrakit.config.hash=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial
352+
47605060 - infrakit-do-version=1,infrakit.config.hash=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial
353353
```
354354

355355
You can kill a node and see the group recover:
@@ -359,16 +359,16 @@ $ infrakit instance-digitalocean destroy 47605058
359359
destroyed 47605058
360360
$ infrakit group describe mygroup
361361
ID LOGICAL TAGS
362-
47605059 - infrakit-do-version=1,infrakit.config_sha=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial
363-
47605060 - infrakit-do-version=1,infrakit.config_sha=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial
362+
47605059 - infrakit-do-version=1,infrakit.config.hash=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial
363+
47605060 - infrakit-do-version=1,infrakit.config.hash=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial
364364

365365
# .... after 10-20 seconds
366366

367367
$ infrakit group describe mygroup
368368
ID LOGICAL TAGS
369-
47605059 - infrakit-do-version=1,infrakit.config_sha=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial
370-
47605060 - infrakit-do-version=1,infrakit.config_sha=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial
371-
47606009 - infrakit-do-version=1,infrakit.config_sha=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial
369+
47605059 - infrakit-do-version=1,infrakit.config.hash=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial
370+
47605060 - infrakit-do-version=1,infrakit.config.hash=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial
371+
47606009 - infrakit-do-version=1,infrakit.config.hash=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial
372372
```
373373

374374
## Scale up/down the group
@@ -433,10 +433,10 @@ After a bit, check the group:
433433
```shell
434434
$ infrakit group describe mygroup
435435
ID LOGICAL TAGS
436-
47605060 - infrakit-do-version=1,infrakit.config_sha=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial
437-
47606009 - infrakit-do-version=1,infrakit.config_sha=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial
438-
47606041 - infrakit-do-version=1,infrakit.config_sha=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial
439-
47606318 - infrakit-do-version=1,infrakit.config_sha=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial
436+
47605060 - infrakit-do-version=1,infrakit.config.hash=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial
437+
47606009 - infrakit-do-version=1,infrakit.config.hash=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial
438+
47606041 - infrakit-do-version=1,infrakit.config.hash=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial
439+
47606318 - infrakit-do-version=1,infrakit.config.hash=aclsbhfuk3pwoh42y55xqd7ulan6pfq4,infrakit.group=mygroup,infrakit.scope=testproject,mygroup=,project=tutorial
440440
```
441441

442442
## Destroy the Group

docs/plugin/flavor/combo/README.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ ID
9494
combo
9595
$ build/infrakit group describe combo
9696
ID LOGICAL TAGS
97-
1505887656884092558 - infrakit.config_sha=k4kacxuwykbyba6ydi36w6tjwj2c3plw,infrakit.group=combo,v1=tag one,v2=tag two
98-
1505887656884528218 - infrakit.config_sha=k4kacxuwykbyba6ydi36w6tjwj2c3plw,infrakit.group=combo,v1=tag one,v2=tag two
97+
1505887656884092558 - infrakit.config.hash=k4kacxuwykbyba6ydi36w6tjwj2c3plw,infrakit.group=combo,v1=tag one,v2=tag two
98+
1505887656884528218 - infrakit.config.hash=k4kacxuwykbyba6ydi36w6tjwj2c3plw,infrakit.group=combo,v1=tag one,v2=tag two
9999
```
100100

101101
Note that now two instances are created and each instance has the tags from
@@ -116,12 +116,12 @@ $ build/infrakit simulator/compute describe -pry
116116
Properties:
117117
Note: custom field
118118
Tags:
119-
infrakit.config_sha: k4kacxuwykbyba6ydi36w6tjwj2c3plw
119+
infrakit.config.hash: k4kacxuwykbyba6ydi36w6tjwj2c3plw
120120
infrakit.group: combo
121121
v1: tag one
122122
v2: tag two
123123
Tags:
124-
infrakit.config_sha: k4kacxuwykbyba6ydi36w6tjwj2c3plw
124+
infrakit.config.hash: k4kacxuwykbyba6ydi36w6tjwj2c3plw
125125
infrakit.group: combo
126126
v1: tag one
127127
v2: tag two
@@ -136,12 +136,12 @@ $ build/infrakit simulator/compute describe -pry
136136
Properties:
137137
Note: custom field
138138
Tags:
139-
infrakit.config_sha: k4kacxuwykbyba6ydi36w6tjwj2c3plw
139+
infrakit.config.hash: k4kacxuwykbyba6ydi36w6tjwj2c3plw
140140
infrakit.group: combo
141141
v1: tag one
142142
v2: tag two
143143
Tags:
144-
infrakit.config_sha: k4kacxuwykbyba6ydi36w6tjwj2c3plw
144+
infrakit.config.hash: k4kacxuwykbyba6ydi36w6tjwj2c3plw
145145
infrakit.group: combo
146146
v1: tag one
147147
v2: tag two
@@ -161,12 +161,12 @@ Note that the `Init` are also chained together in sequence:
161161
Properties:
162162
Note: custom field
163163
Tags:
164-
infrakit.config_sha: k4kacxuwykbyba6ydi36w6tjwj2c3plw
164+
infrakit.config.hash: k4kacxuwykbyba6ydi36w6tjwj2c3plw
165165
infrakit.group: combo
166166
v1: tag one
167167
v2: tag two
168168
Tags:
169-
infrakit.config_sha: k4kacxuwykbyba6ydi36w6tjwj2c3plw
169+
infrakit.config.hash: k4kacxuwykbyba6ydi36w6tjwj2c3plw
170170
infrakit.group: combo
171171
v1: tag one
172172
v2: tag two

docs/plugin/flavor/vanilla/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ ID
163163
vanilla
164164
$ build/infrakit group describe vanilla
165165
ID LOGICAL TAGS
166-
1505889013394060520 - infrakit.config_sha=rvhmljoz72va6rrmbypwsxahwkb6g6sq,infrakit.group=vanilla,project=infrakit,tier=web
166+
1505889013394060520 - infrakit.config.hash=rvhmljoz72va6rrmbypwsxahwkb6g6sq,infrakit.group=vanilla,project=infrakit,tier=web
167167
```
168168

169169
Checking on the actual instance:
@@ -182,16 +182,16 @@ $ build/infrakit simulator/compute describe -pry
182182
Properties:
183183
Note: custom field
184184
Tags:
185-
infrakit.config_sha: rvhmljoz72va6rrmbypwsxahwkb6g6sq
185+
infrakit.config.hash: rvhmljoz72va6rrmbypwsxahwkb6g6sq
186186
infrakit.group: vanilla
187187
project: infrakit
188188
tier: web
189189
Tags:
190-
infrakit.config_sha: rvhmljoz72va6rrmbypwsxahwkb6g6sq
190+
infrakit.config.hash: rvhmljoz72va6rrmbypwsxahwkb6g6sq
191191
infrakit.group: vanilla
192192
project: infrakit
193193
tier: web
194194
```
195195

196196
Note that the vanilla flavor (`french_vanilla`) has injected the init and
197-
tags into the configuration of this instance.
197+
tags into the configuration of this instance.

docs/plugin/group.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Group plugin API
22

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

55
## API
66

0 commit comments

Comments
 (0)