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

Commit b973586

Browse files
author
Michał Stachowski
committed
CMK release - version v1.2.0-rc1.
1 parent fdc7760 commit b973586

19 files changed

+28
-28
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
all: docker
1818

19-
version=v1.1.0
19+
version=v1.2.0-rc1
2020

2121
# TODO: This target should be changed, when e2e tests will be ready and test
2222
# entrypoint will be defined.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Options:
6969
--cmk-cmd-list=<list> Comma seperated list of CMK sub-commands to run on
7070
each host
7171
[default: init,reconcile,install,discover,nodereport].
72-
--cmk-img=<img> CMK Docker image [default: cmk:v1.1.0].
72+
--cmk-img=<img> CMK Docker image [default: cmk:v1.2.0-rc1].
7373
--cmk-img-pol=<pol> Image pull policy for the CMK Docker image
7474
[default: IfNotPresent].
7575
--conf-dir=<dir> CMK configuration directory [default: /etc/cmk].

RELEASE.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,21 +118,21 @@ Running Vagrant locally syncs your repository directory into `/cmk` using by def
118118
- check whether current branch is `master` and if it's "clean"
119119
- fetch origin
120120
- check whether `CMK_RELEASE_VER` is set, follows proper pattern and there in no existing tag with it's value
121-
- check whether there is no `cmk-release-v1.1.0` branch neither locally nor remotely
122-
- get previous version string from `Makefile` (`version=v1.1.0`) and check
121+
- check whether there is no `cmk-release-v1.2.0-rc1` branch neither locally nor remotely
122+
- get previous version string from `Makefile` (`version=v1.2.0-rc1`) and check
123123

124124
If all above checks pass, script will:
125-
- create local branch `cmk-release-v1.1.0`
126-
- replace old release string (`v1.1.0`) with new one (`v1.1.0`) in all repo files
127-
- commit changes with message `CMK release - version v1.1.0.`
125+
- create local branch `cmk-release-v1.2.0-rc1`
126+
- replace old release string (`v1.2.0-rc1`) with new one (`v1.2.0-rc1`) in all repo files
127+
- commit changes with message `CMK release - version v1.2.0-rc1.`
128128
- push branch to origin
129129
- checkout to `master` branch.
130130

131131
**What will happen after PR gets to `master` branch**
132132
After PR is "Rebased and merged" into `master` branch, Jenkins CI/CD will start VM based on `.release/Vagrantfile` and execute `.release/make_release.py` inside the VM.
133133

134134
**What will `make_release.py` do :**
135-
- check latest commit message for `CMK release - version v1.1.0.` string
136-
- `v1.1.0` will become tag value
135+
- check latest commit message for `CMK release - version v1.2.0-rc1.` string
136+
- `v1.2.0-rc1` will become tag value
137137
- generate change log
138138
- create release with change log based on tag found in commit message

cmk.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
--cmk-cmd-list=<list> Comma seperated list of CMK sub-commands to run on
4545
each host
4646
[default: init,reconcile,install,discover,nodereport].
47-
--cmk-img=<img> CMK Docker image [default: cmk:v1.1.0].
47+
--cmk-img=<img> CMK Docker image [default: cmk:v1.2.0-rc1].
4848
--cmk-img-pol=<pol> Image pull policy for the CMK Docker image
4949
[default: IfNotPresent].
5050
--conf-dir=<dir> CMK configuration directory [default: /etc/cmk].
@@ -85,7 +85,7 @@
8585
def main():
8686
setup_logging()
8787

88-
args = docopt(__doc__, version="CMK v1.1.0")
88+
args = docopt(__doc__, version="CMK v1.2.0-rc1")
8989
if args["cluster-init"]:
9090
clusterinit.cluster_init(args["--host-list"], args["--all-hosts"],
9191
args["--cmk-cmd-list"], args["--cmk-img"],

docs/cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Options:
4949
--cmk-cmd-list=<list> Comma seperated list of CMK sub-commands to run on
5050
each host
5151
[default: init,reconcile,install,discover,nodereport].
52-
--cmk-img=<img> CMK Docker image [default: cmk:v1.1.0].
52+
--cmk-img=<img> CMK Docker image [default: cmk:v1.2.0-rc1].
5353
--cmk-img-pol=<pol> Image pull policy for the CMK Docker image
5454
[default: IfNotPresent].
5555
--conf-dir=<dir> CMK configuration directory [default: /etc/cmk].

docs/html/docs/cli.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ <h2>
8888
--cmk-cmd-list=&lt;list&gt; Comma seperated list of CMK sub-commands to run on
8989
each host
9090
[default: init,reconcile,install,discover,nodereport].
91-
--cmk-img=&lt;img&gt; CMK Docker image [default: cmk:v1.1.0].
91+
--cmk-img=&lt;img&gt; CMK Docker image [default: cmk:v1.2.0-rc1].
9292
--cmk-img-pol=&lt;pol&gt; Image pull policy for the CMK Docker image
9393
[default: IfNotPresent].
9494
--conf-dir=&lt;dir&gt; CMK configuration directory [default: /etc/cmk].

docs/html/docs/operator.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ <h3>
187187
<li>The subcommands described below should be run in the same order.</li>
188188
<li>The documentation in this section assumes that the <code>CMK</code> configuration directory is <code>/etc/cmk</code> and the <code>cmk</code>
189189
binary is installed on the host under <code>/opt/bin</code>.</li>
190-
<li>In all the pod templates used in this section, the name of container image used is <code>cmk:v1.1.0</code>. It is expected that the
190+
<li>In all the pod templates used in this section, the name of container image used is <code>cmk:v1.2.0-rc1</code>. It is expected that the
191191
<code>cmk</code> container image is built and cached locally in the host. The <code>image</code> field will require modification if the
192192
container image is hosted remotely (e.g., in <a href="https://hub.docker.com/">https://hub.docker.com/</a>).</li>
193193
</ul>

docs/html/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ <h2>
127127
--cmk-cmd-list=&lt;list&gt; Comma seperated list of CMK sub-commands to run on
128128
each host
129129
[default: init,reconcile,install,discover,nodereport].
130-
--cmk-img=&lt;img&gt; CMK Docker image [default: cmk:v1.1.0].
130+
--cmk-img=&lt;img&gt; CMK Docker image [default: cmk:v1.2.0-rc1].
131131
--cmk-img-pol=&lt;pol&gt; Image pull policy for the CMK Docker image
132132
[default: IfNotPresent].
133133
--conf-dir=&lt;dir&gt; CMK configuration directory [default: /etc/cmk].

docs/operator.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ for some reason.
125125
- The subcommands described below should be run in the same order.
126126
- The documentation in this section assumes that the `CMK` configuration directory is `/etc/cmk` and the `cmk`
127127
binary is installed on the host under `/opt/bin`.
128-
- In all the pod templates used in this section, the name of container image used is `cmk:v1.1.0`. It is expected that the
128+
- In all the pod templates used in this section, the name of container image used is `cmk:v1.2.0-rc1`. It is expected that the
129129
`cmk` container image is built and cached locally in the host. The `image` field will require modification if the
130130
container image is hosted remotely (e.g., in https://hub.docker.com/).
131131

resources/pods/cmk-cluster-init-pod.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ spec:
2727
command:
2828
- "/bin/bash"
2929
- "-c"
30-
image: cmk:v1.1.0
30+
image: cmk:v1.2.0-rc1
3131
name: cmk-cluster-init-pod
3232
restartPolicy: Never

0 commit comments

Comments
 (0)