Skip to content

Commit f2c3ffe

Browse files
authored
update charts/kustomize to use new release version (#1662)
* update charts/kustomize to use new release version Signed-off-by: Michael Kalantar <[email protected]> * spelling Signed-off-by: Michael Kalantar <[email protected]> --------- Signed-off-by: Michael Kalantar <[email protected]>
1 parent d3e00a2 commit f2c3ffe

File tree

13 files changed

+60
-29
lines changed

13 files changed

+60
-29
lines changed

.github/wordlist.txt

+1
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ setName
129129
setUser
130130
trackToRoute
131131
toJson
132+
verifyUserExperience
132133
versionname
133134
WriteMetric
134135
contentType

.github/workflows/verifyuserexperience.yaml

+16-16
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ jobs:
3030
3131
- name: Install controller
3232
run: |
33-
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 0.18 --set logLevel=trace
33+
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 1.1 --set logLevel=trace
3434
kubectl rollout status --watch --timeout=60s statefulset/iter8
3535
3636
- name: Start performance test
3737
run: |
3838
helm upgrade --install \
39-
--repo https://iter8-tools.github.io/iter8 --version 0.18 httpbin-test iter8 \
39+
--repo https://iter8-tools.github.io/iter8 --version 1.1 httpbin-test iter8 \
4040
--set "tasks={http}" \
4141
--set http.url="http://httpbin.default/get" \
4242
--set logLevel=trace
@@ -77,13 +77,13 @@ jobs:
7777
7878
- name: Install controller
7979
run: |
80-
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 0.18 --set logLevel=trace
80+
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 1.1 --set logLevel=trace
8181
kubectl rollout status --watch --timeout=60s statefulset/iter8
8282
8383
- name: Start performance test
8484
run: |
8585
helm upgrade --install \
86-
--repo https://iter8-tools.github.io/iter8 --version 0.18 httpbin-test iter8 \
86+
--repo https://iter8-tools.github.io/iter8 --version 1.1 httpbin-test iter8 \
8787
--set "tasks={http}" \
8888
--set http.url="http://httpbin.default/post" \
8989
--set http.payloadStr=hello \
@@ -126,13 +126,13 @@ jobs:
126126
127127
- name: Install controller
128128
run: |
129-
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 0.18 --set logLevel=trace
129+
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 1.1 --set logLevel=trace
130130
kubectl rollout status --watch --timeout=60s statefulset/iter8
131131
132132
- name: Start performance test
133133
run: |
134134
helm upgrade --install \
135-
--repo https://iter8-tools.github.io/iter8 --version 0.18 httpbin-test iter8 \
135+
--repo https://iter8-tools.github.io/iter8 --version 1.1 httpbin-test iter8 \
136136
--set "tasks={http}" \
137137
--set http.endpoints.get.url=http://httpbin.default/get \
138138
--set http.endpoints.getAnything.url=http://httpbin.default/anything \
@@ -184,13 +184,13 @@ jobs:
184184
185185
- name: Install controller
186186
run: |
187-
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 0.18 --set logLevel=trace
187+
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 1.1 --set logLevel=trace
188188
kubectl rollout status --watch --timeout=60s statefulset/iter8
189189
190190
- name: Start performance test
191191
run: |
192192
helm upgrade --install \
193-
--repo https://iter8-tools.github.io/iter8 --version 0.18 routeguide-test iter8 \
193+
--repo https://iter8-tools.github.io/iter8 --version 1.1 routeguide-test iter8 \
194194
--set "tasks={ready,grpc}" \
195195
--set ready.deploy=routeguide \
196196
--set ready.service=routeguide \
@@ -245,13 +245,13 @@ jobs:
245245
246246
- name: Install controller
247247
run: |
248-
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 0.18 --set logLevel=trace
248+
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 1.1 --set logLevel=trace
249249
kubectl rollout status --watch --timeout=60s statefulset/iter8
250250
251251
- name: Start performance test
252252
run: |
253253
helm upgrade --install \
254-
--repo https://iter8-tools.github.io/iter8 --version 0.18 routeguide-test iter8 \
254+
--repo https://iter8-tools.github.io/iter8 --version 1.1 routeguide-test iter8 \
255255
--set "tasks={ready,grpc}" \
256256
--set ready.deploy=routeguide \
257257
--set ready.service=routeguide \
@@ -300,13 +300,13 @@ jobs:
300300
301301
- name: Install controller
302302
run: |
303-
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 0.18 --set logLevel=trace
303+
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 1.1 --set logLevel=trace
304304
kubectl rollout status --watch --timeout=60s statefulset/iter8
305305
306306
- name: Start performance test
307307
run: |
308308
helm upgrade --install \
309-
--repo https://iter8-tools.github.io/iter8 --version 0.18 hello-test iter8 \
309+
--repo https://iter8-tools.github.io/iter8 --version 1.1 hello-test iter8 \
310310
--set "tasks={grpc}" \
311311
--set grpc.host="hello.default:50051" \
312312
--set grpc.call="helloworld.Greeter.SayHello" \
@@ -344,7 +344,7 @@ jobs:
344344
# allowing ready task to be tested
345345
- name: Install controller
346346
run: |
347-
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 0.18 --set logLevel=trace
347+
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 1.1 --set logLevel=trace
348348
kubectl rollout status --watch --timeout=60s statefulset/iter8
349349
350350
- name: Create httpbin application
@@ -356,7 +356,7 @@ jobs:
356356
- name: k launch with readiness checks
357357
run: |
358358
helm upgrade --install \
359-
--repo https://iter8-tools.github.io/iter8 --version 0.18 httpbin-test iter8 \
359+
--repo https://iter8-tools.github.io/iter8 --version 1.1 httpbin-test iter8 \
360360
--set "tasks={ready,http}" \
361361
--set ready.deploy="httpbin" \
362362
--set ready.service="httpbin" \
@@ -396,7 +396,7 @@ jobs:
396396
# allowing ready task to be tested
397397
- name: Install controller
398398
run: |
399-
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 0.18 --set logLevel=trace
399+
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 1.1 --set logLevel=trace
400400
kubectl rollout status --watch --timeout=60s statefulset/iter8
401401
402402
- name: Create httpbin application
@@ -412,7 +412,7 @@ jobs:
412412
- name: k launch with readiness checks and namespace
413413
run: |
414414
helm upgrade --install -n experiments \
415-
--repo https://iter8-tools.github.io/iter8 --version 0.18 httpbin-test iter8 \
415+
--repo https://iter8-tools.github.io/iter8 --version 1.1 httpbin-test iter8 \
416416
--set "tasks={ready,http}" \
417417
--set ready.deploy="httpbin" \
418418
--set ready.service="httpbin" \

bump-version-hints.md

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
These instructions are a guide to making a new major or minor (not patch) release. The challenge is that charts refer to the image version. But this version is only created when the release is published. Consequently the following sequence of steps is needed:
2+
3+
1. Modify only golang code (no version bump)
4+
1. Do not change `MajorMinor` or `Version` in `base/util.go`
5+
6+
Make new major/minor release
7+
8+
2. Bump version references in `/charts` changes and bump `/charts/iter8` chart version (no changes to `/testdata`) and bump Kustomize files and bump verifyUserExperience workflow
9+
1. The charts are modified to use the new image
10+
2. The chart versions should be bumped to match the major/minor version (this is required for the `iter8` chart) but is desirable for all
11+
12+
Merging the chart changes triggers a automatic chart releases
13+
14+
3. Version bump golang and `/testdata` and other workflows
15+
1. Bump `MajorMinor` or `Version` in `base/util.go`
16+
2. Bump explicit version references in remaining workflows
17+
3. Bump Dockerfile
18+
5. Changes to `/testdata` is only a version bump in charts (`iter8.tools/version`)
19+
20+
Make a release (new patch version)
21+
22+
***
23+
24+
At this point the documentation can be updated to refer to the new version.
25+
Some things to change in the docs
26+
27+
* `iter8.tools/version` in Kubernetes manifests samples
28+
* `--version` for any `helm upgrade` and `helm template` commands
29+
* `deleteiter8controller.md` and `installiter8controller.md`
30+
* Reference to `values.yaml`

charts/controller/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: controller
3-
version: 0.18.5
3+
version: 1.1.0
44
description: Iter8 controller controller
55
type: application
66
keywords:
@@ -16,4 +16,4 @@ maintainers:
1616
- name: Iter8
1717
1818
icon: https://github.com/iter8-tools/iter8/raw/master/mkdocs/docs/images/favicon.png
19-
appVersion: v0.18
19+
appVersion: v1.1

charts/controller/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### Controller image
2-
image: iter8/iter8:0.18
2+
image: iter8/iter8:1.1
33
replicas: 1
44

55
### default resync time for controller

charts/iter8/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: iter8
3-
version: 0.18.0
3+
version: 1.1.0
44
description: Iter8 experiment chart
55
type: application
66
home: https://iter8.tools

charts/iter8/values.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
### iter8Image default iter8 image used for running Kubernetes experiments
2-
iter8Image: iter8/iter8:0.18
2+
iter8Image: iter8/iter8:1.1
33

44
### majorMinor is the minor version of Iter8
5-
majorMinor: v0.18
5+
majorMinor: v1.1
66

77
logLevel: info
88

charts/release/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: release
3-
version: 0.18.5
3+
version: 1.1.0
44
description: Iter8 supported application release
55
type: application
66
keywords:
@@ -18,4 +18,4 @@ maintainers:
1818
- name: Iter8
1919
2020
icon: https://github.com/iter8-tools/iter8/raw/master/mkdocs/docs/images/favicon.png
21-
appVersion: v0.18
21+
appVersion: v1.1

charts/release/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# iter8Version is the minor version of Iter8
22
# should be specified as the value of the iter8.tools/version label on all routemaps
3-
iter8Version: v0.18
3+
iter8Version: v1.1
44

55
# default Istio Gateway name
66
istioGateway: my-gateway

kustomize/controller/clusterScoped/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ patches:
3232
value: |
3333
clusterScoped: true
3434
defaultResync: 15m
35-
image: iter8/iter8:0.18
35+
image: iter8/iter8:1.1
3636
logLevel: info
3737
resourceTypes:
3838
cm:

kustomize/controller/namespaceScoped/configmap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
data:
66
config.yaml: |
77
defaultResync: 15m
8-
image: iter8/iter8:0.18
8+
image: iter8/iter8:1.1
99
logLevel: info
1010
resourceTypes:
1111
cm:

kustomize/controller/namespaceScoped/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ resources:
99

1010
commonLabels:
1111
app.kubernetes.io/name: controller
12-
app.kubernetes.io/version: v0.18
12+
app.kubernetes.io/version: v1.1

kustomize/controller/namespaceScoped/statefulset.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
serviceAccountName: iter8
1717
containers:
1818
- name: iter8-controller
19-
image: iter8/iter8:0.18
19+
image: iter8/iter8:1.1
2020
imagePullPolicy: Always
2121
command: ["/bin/iter8"]
2222
args: ["controllers", "-l", "info"]

0 commit comments

Comments
 (0)