Skip to content

Commit

Permalink
update charts/kustomize to use new release version
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Kalantar <kalantar@us.ibm.com>
  • Loading branch information
kalantar committed Dec 21, 2023
1 parent d3e00a2 commit 1606831
Show file tree
Hide file tree
Showing 12 changed files with 59 additions and 29 deletions.
32 changes: 16 additions & 16 deletions .github/workflows/verifyuserexperience.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ jobs:
- name: Install controller
run: |
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 0.18 --set logLevel=trace
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 1.1 --set logLevel=trace
kubectl rollout status --watch --timeout=60s statefulset/iter8
- name: Start performance test
run: |
helm upgrade --install \
--repo https://iter8-tools.github.io/iter8 --version 0.18 httpbin-test iter8 \
--repo https://iter8-tools.github.io/iter8 --version 1.1 httpbin-test iter8 \
--set "tasks={http}" \
--set http.url="http://httpbin.default/get" \
--set logLevel=trace
Expand Down Expand Up @@ -77,13 +77,13 @@ jobs:
- name: Install controller
run: |
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 0.18 --set logLevel=trace
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 1.1 --set logLevel=trace
kubectl rollout status --watch --timeout=60s statefulset/iter8
- name: Start performance test
run: |
helm upgrade --install \
--repo https://iter8-tools.github.io/iter8 --version 0.18 httpbin-test iter8 \
--repo https://iter8-tools.github.io/iter8 --version 1.1 httpbin-test iter8 \
--set "tasks={http}" \
--set http.url="http://httpbin.default/post" \
--set http.payloadStr=hello \
Expand Down Expand Up @@ -126,13 +126,13 @@ jobs:
- name: Install controller
run: |
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 0.18 --set logLevel=trace
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 1.1 --set logLevel=trace
kubectl rollout status --watch --timeout=60s statefulset/iter8
- name: Start performance test
run: |
helm upgrade --install \
--repo https://iter8-tools.github.io/iter8 --version 0.18 httpbin-test iter8 \
--repo https://iter8-tools.github.io/iter8 --version 1.1 httpbin-test iter8 \
--set "tasks={http}" \
--set http.endpoints.get.url=http://httpbin.default/get \
--set http.endpoints.getAnything.url=http://httpbin.default/anything \
Expand Down Expand Up @@ -184,13 +184,13 @@ jobs:
- name: Install controller
run: |
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 0.18 --set logLevel=trace
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 1.1 --set logLevel=trace
kubectl rollout status --watch --timeout=60s statefulset/iter8
- name: Start performance test
run: |
helm upgrade --install \
--repo https://iter8-tools.github.io/iter8 --version 0.18 routeguide-test iter8 \
--repo https://iter8-tools.github.io/iter8 --version 1.1 routeguide-test iter8 \
--set "tasks={ready,grpc}" \
--set ready.deploy=routeguide \
--set ready.service=routeguide \
Expand Down Expand Up @@ -245,13 +245,13 @@ jobs:
- name: Install controller
run: |
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 0.18 --set logLevel=trace
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 1.1 --set logLevel=trace
kubectl rollout status --watch --timeout=60s statefulset/iter8
- name: Start performance test
run: |
helm upgrade --install \
--repo https://iter8-tools.github.io/iter8 --version 0.18 routeguide-test iter8 \
--repo https://iter8-tools.github.io/iter8 --version 1.1 routeguide-test iter8 \
--set "tasks={ready,grpc}" \
--set ready.deploy=routeguide \
--set ready.service=routeguide \
Expand Down Expand Up @@ -300,13 +300,13 @@ jobs:
- name: Install controller
run: |
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 0.18 --set logLevel=trace
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 1.1 --set logLevel=trace
kubectl rollout status --watch --timeout=60s statefulset/iter8
- name: Start performance test
run: |
helm upgrade --install \
--repo https://iter8-tools.github.io/iter8 --version 0.18 hello-test iter8 \
--repo https://iter8-tools.github.io/iter8 --version 1.1 hello-test iter8 \
--set "tasks={grpc}" \
--set grpc.host="hello.default:50051" \
--set grpc.call="helloworld.Greeter.SayHello" \
Expand Down Expand Up @@ -344,7 +344,7 @@ jobs:
# allowing ready task to be tested
- name: Install controller
run: |
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 0.18 --set logLevel=trace
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 1.1 --set logLevel=trace
kubectl rollout status --watch --timeout=60s statefulset/iter8
- name: Create httpbin application
Expand All @@ -356,7 +356,7 @@ jobs:
- name: k launch with readiness checks
run: |
helm upgrade --install \
--repo https://iter8-tools.github.io/iter8 --version 0.18 httpbin-test iter8 \
--repo https://iter8-tools.github.io/iter8 --version 1.1 httpbin-test iter8 \
--set "tasks={ready,http}" \
--set ready.deploy="httpbin" \
--set ready.service="httpbin" \
Expand Down Expand Up @@ -396,7 +396,7 @@ jobs:
# allowing ready task to be tested
- name: Install controller
run: |
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 0.18 --set logLevel=trace
helm install --repo https://iter8-tools.github.io/iter8 iter8 controller --version 1.1 --set logLevel=trace
kubectl rollout status --watch --timeout=60s statefulset/iter8
- name: Create httpbin application
Expand All @@ -412,7 +412,7 @@ jobs:
- name: k launch with readiness checks and namespace
run: |
helm upgrade --install -n experiments \
--repo https://iter8-tools.github.io/iter8 --version 0.18 httpbin-test iter8 \
--repo https://iter8-tools.github.io/iter8 --version 1.1 httpbin-test iter8 \
--set "tasks={ready,http}" \
--set ready.deploy="httpbin" \
--set ready.service="httpbin" \
Expand Down
30 changes: 30 additions & 0 deletions bump-version-hints.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
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:

1. Modiyf only golang code (no version bump)
1. Do not change `MajorMinor` or `Version` in `base/util.go`

Make new major/minor release

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
1. The charts are modified to use the new image
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

Merging the chart changes triggers a automatic chart releases

3. Version bump golang and `/testdata` and other workflows
1. Bump `MajorMinor` or `Version` in `base/util.go`
2. Bump explicit version references in remaining workflows
3. Bump Dockerfile
5. Changes to `/testdata` is only a version bump in charts (`iter8.tools/version`)

Make a release (new patch version)

***

At this point the documentation can be updated to refer to the new version.
Some things to change in the docs

* `iter8.tools/version` in Kubernetes manifests samples
* `--version` for any `helm upgrade` and `helm template` commands
* `deleteiter8controller.md` and `installiter8controller.md`
* Reference to `values.yaml`
4 changes: 2 additions & 2 deletions charts/controller/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: controller
version: 0.18.5
version: 1.1.0
description: Iter8 controller controller
type: application
keywords:
Expand All @@ -16,4 +16,4 @@ maintainers:
- name: Iter8
email: iter8-tools@gmail.com
icon: https://github.com/iter8-tools/iter8/raw/master/mkdocs/docs/images/favicon.png
appVersion: v0.18
appVersion: v1.1
2 changes: 1 addition & 1 deletion charts/controller/values.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### Controller image
image: iter8/iter8:0.18
image: iter8/iter8:1.1
replicas: 1

### default resync time for controller
Expand Down
2 changes: 1 addition & 1 deletion charts/iter8/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: iter8
version: 0.18.0
version: 1.1.0
description: Iter8 experiment chart
type: application
home: https://iter8.tools
Expand Down
4 changes: 2 additions & 2 deletions charts/iter8/values.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
### iter8Image default iter8 image used for running Kubernetes experiments
iter8Image: iter8/iter8:0.18
iter8Image: iter8/iter8:1.1

### majorMinor is the minor version of Iter8
majorMinor: v0.18
majorMinor: v1.1

logLevel: info

Expand Down
4 changes: 2 additions & 2 deletions charts/release/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: release
version: 0.18.5
version: 1.1.0
description: Iter8 supported application release
type: application
keywords:
Expand All @@ -18,4 +18,4 @@ maintainers:
- name: Iter8
email: iter8-tools@gmail.com
icon: https://github.com/iter8-tools/iter8/raw/master/mkdocs/docs/images/favicon.png
appVersion: v0.18
appVersion: v1.1
2 changes: 1 addition & 1 deletion charts/release/values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# iter8Version is the minor version of Iter8
# should be specified as the value of the iter8.tools/version label on all routemaps
iter8Version: v0.18
iter8Version: v1.1

# default Istio Gateway name
istioGateway: my-gateway
2 changes: 1 addition & 1 deletion kustomize/controller/clusterScoped/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ patches:
value: |
clusterScoped: true
defaultResync: 15m
image: iter8/iter8:0.18
image: iter8/iter8:1.1
logLevel: info
resourceTypes:
cm:
Expand Down
2 changes: 1 addition & 1 deletion kustomize/controller/namespaceScoped/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
data:
config.yaml: |
defaultResync: 15m
image: iter8/iter8:0.18
image: iter8/iter8:1.1
logLevel: info
resourceTypes:
cm:
Expand Down
2 changes: 1 addition & 1 deletion kustomize/controller/namespaceScoped/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ resources:

commonLabels:
app.kubernetes.io/name: controller
app.kubernetes.io/version: v0.18
app.kubernetes.io/version: v1.1
2 changes: 1 addition & 1 deletion kustomize/controller/namespaceScoped/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
serviceAccountName: iter8
containers:
- name: iter8-controller
image: iter8/iter8:0.18
image: iter8/iter8:1.1
imagePullPolicy: Always
command: ["/bin/iter8"]
args: ["controllers", "-l", "info"]
Expand Down

0 comments on commit 1606831

Please sign in to comment.