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

Commit 9cc6022

Browse files
przemeklallmdaly
authored andcommitted
CMK release - version v1.3.0.
1 parent 5766b4c commit 9cc6022

24 files changed

+41
-41
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.2.2
19+
version=v1.3.0
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
@@ -72,7 +72,7 @@ Options:
7272
--cmk-cmd-list=<list> Comma seperated list of CMK sub-commands to run
7373
on each host
7474
[default: init,reconcile,install,discover,nodereport].
75-
--cmk-img=<img> CMK Docker image [default: cmk:v1.2.2].
75+
--cmk-img=<img> CMK Docker image [default: cmk:v1.3.0].
7676
--cmk-img-pol=<pol> Image pull policy for the CMK Docker image
7777
[default: IfNotPresent].
7878
--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.2.2` branch neither locally nor remotely
122-
- get previous version string from `Makefile` (`version=v1.2.2`) and check
121+
- check whether there is no `cmk-release-v1.3.0` branch neither locally nor remotely
122+
- get previous version string from `Makefile` (`version=v1.3.0`) and check
123123

124124
If all above checks pass, script will:
125-
- create local branch `cmk-release-v1.2.2`
126-
- replace old release string (`v1.2.2`) with new one (`v1.2.2`) in all repo files
127-
- commit changes with message `CMK release - version v1.2.2.`
125+
- create local branch `cmk-release-v1.3.0`
126+
- replace old release string (`v1.3.0`) with new one (`v1.3.0`) in all repo files
127+
- commit changes with message `CMK release - version v1.3.0.`
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.2.2.` string
136-
- `v1.2.2` will become tag value
135+
- check latest commit message for `CMK release - version v1.3.0.` string
136+
- `v1.3.0` 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
@@ -48,7 +48,7 @@
4848
--cmk-cmd-list=<list> Comma seperated list of CMK sub-commands to run
4949
on each host
5050
[default: init,reconcile,install,discover,nodereport].
51-
--cmk-img=<img> CMK Docker image [default: cmk:v1.2.2].
51+
--cmk-img=<img> CMK Docker image [default: cmk:v1.3.0].
5252
--cmk-img-pol=<pol> Image pull policy for the CMK Docker image
5353
[default: IfNotPresent].
5454
--conf-dir=<dir> CMK configuration directory [default: /etc/cmk].
@@ -92,7 +92,7 @@
9292
def main():
9393
setup_logging()
9494

95-
args = docopt(__doc__, version="CMK v1.2.2")
95+
args = docopt(__doc__, version="CMK v1.3.0")
9696
if args["cluster-init"]:
9797
clusterinit.cluster_init(args["--host-list"], args["--all-hosts"],
9898
args["--cmk-cmd-list"], args["--cmk-img"],

docs/cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Options:
5353
--cmk-cmd-list=<list> Comma seperated list of CMK sub-commands to run
5454
on each host
5555
[default: init,reconcile,install,discover,nodereport].
56-
--cmk-img=<img> CMK Docker image [default: cmk:v1.2.2].
56+
--cmk-img=<img> CMK Docker image [default: cmk:v1.3.0].
5757
--cmk-img-pol=<pol> Image pull policy for the CMK Docker image
5858
[default: IfNotPresent].
5959
--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
@@ -111,7 +111,7 @@ <h2>
111111
--cmk-cmd-list=&lt;list&gt; Comma seperated list of CMK sub-commands to run
112112
on each host
113113
[default: init,reconcile,install,discover,nodereport].
114-
--cmk-img=&lt;img&gt; CMK Docker image [default: cmk:v1.2.2].
114+
--cmk-img=&lt;img&gt; CMK Docker image [default: cmk:v1.3.0].
115115
--cmk-img-pol=&lt;pol&gt; Image pull policy for the CMK Docker image
116116
[default: IfNotPresent].
117117
--conf-dir=&lt;dir&gt; CMK configuration directory [default: /etc/cmk].

docs/html/docs/operator.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ <h3>
222222
<li>The subcommands described below should be run in the same order.</li>
223223
<li>The documentation in this section assumes that the <code>CMK</code> configuration directory is <code>/etc/cmk</code> and the <code>cmk</code>
224224
binary is installed on the host under <code>/opt/bin</code>.</li>
225-
<li>In all the pod templates used in this section, the name of container image used is <code>cmk:v1.2.2</code>. It is expected that the
225+
<li>In all the pod templates used in this section, the name of container image used is <code>cmk:v1.3.0</code>. It is expected that the
226226
<code>cmk</code> container image is built and cached locally in the host. The <code>image</code> field will require modification if the
227227
container image is hosted remotely (e.g., in <a href="https://hub.docker.com/" rel="nofollow">https://hub.docker.com/</a>).</li>
228228
</ul>
@@ -487,7 +487,7 @@ <h2>
487487
<span class="pl-ent">env</span>:
488488
- <span class="pl-ent">name</span>: <span class="pl-s">CMK_PROC_FS</span>
489489
<span class="pl-ent">value</span>: <span class="pl-s"><span class="pl-pds">"</span>/host/proc<span class="pl-pds">"</span></span>
490-
<span class="pl-ent">image</span>: <span class="pl-s">cmk:v1.2.2</span>
490+
<span class="pl-ent">image</span>: <span class="pl-s">cmk:v1.3.0</span>
491491
<span class="pl-ent">imagePullPolicy</span>: <span class="pl-s"><span class="pl-pds">"</span>Never<span class="pl-pds">"</span></span>
492492
<span class="pl-ent">name</span>: <span class="pl-s">cmk-isolate-infra</span>
493493
<span class="pl-ent">volumeMounts</span>:
@@ -542,7 +542,7 @@ <h3>
542542
- "/bin/bash"
543543
- "-c"
544544
env:
545-
image: cmk:v1.2.2
545+
image: cmk:v1.3.0
546546
imagePullPolicy: "Never"
547547
name: cmk-isolate-infra
548548
resources:

docs/html/docs/user.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ <h3>
134134
- "/bin/bash"
135135
- "-c"
136136
env:
137-
image: cmk:v1.2.2
137+
image: cmk:v1.3.0
138138
imagePullPolicy: "Never"
139139
name: cmk-isolate-infra
140140
resources:

docs/html/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ <h2>
149149
--cmk-cmd-list=&lt;list&gt; Comma seperated list of CMK sub-commands to run
150150
on each host
151151
[default: init,reconcile,install,discover,nodereport].
152-
--cmk-img=&lt;img&gt; CMK Docker image [default: cmk:v1.2.2].
152+
--cmk-img=&lt;img&gt; CMK Docker image [default: cmk:v1.3.0].
153153
--cmk-img-pol=&lt;pol&gt; Image pull policy for the CMK Docker image
154154
[default: IfNotPresent].
155155
--conf-dir=&lt;dir&gt; CMK configuration directory [default: /etc/cmk].

docs/operator.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ for some reason.
141141
- The subcommands described below should be run in the same order.
142142
- The documentation in this section assumes that the `CMK` configuration directory is `/etc/cmk` and the `cmk`
143143
binary is installed on the host under `/opt/bin`.
144-
- In all the pod templates used in this section, the name of container image used is `cmk:v1.2.2`. It is expected that the
144+
- In all the pod templates used in this section, the name of container image used is `cmk:v1.3.0`. It is expected that the
145145
`cmk` container image is built and cached locally in the host. The `image` field will require modification if the
146146
container image is hosted remotely (e.g., in https://hub.docker.com/).
147147

@@ -440,7 +440,7 @@ spec:
440440
env:
441441
- name: CMK_PROC_FS
442442
value: "/host/proc"
443-
image: cmk:v1.2.2
443+
image: cmk:v1.3.0
444444
imagePullPolicy: "Never"
445445
name: cmk-isolate-infra
446446
volumeMounts:
@@ -493,7 +493,7 @@ spec:
493493
- "/bin/bash"
494494
- "-c"
495495
env:
496-
image: cmk:v1.2.2
496+
image: cmk:v1.3.0
497497
imagePullPolicy: "Never"
498498
name: cmk-isolate-infra
499499
resources:

docs/user.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ spec:
8383
- "/bin/bash"
8484
- "-c"
8585
env:
86-
image: cmk:v1.2.2
86+
image: cmk:v1.3.0
8787
imagePullPolicy: "Never"
8888
name: cmk-isolate-infra
8989
resources:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ spec:
2828
command:
2929
- "/bin/bash"
3030
- "-c"
31-
image: cmk:v1.2.2
31+
image: cmk:v1.3.0
3232
name: cmk-cluster-init-pod
3333
restartPolicy: Never

resources/pods/cmk-discover-pod.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
valueFrom:
3232
fieldRef:
3333
fieldPath: spec.nodeName
34-
image: cmk:v1.2.2
34+
image: cmk:v1.3.0
3535
name: cmk-discover-pod
3636
volumeMounts:
3737
- mountPath: "/etc/cmk"

resources/pods/cmk-init-pod.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
- name: NUM_SHARED_CORES
3636
# Change this to modify the value passed to `--num-shared-cores` flag.
3737
value: '1'
38-
image: cmk:v1.2.2
38+
image: cmk:v1.3.0
3939
name: cmk-init-pod
4040
volumeMounts:
4141
- mountPath: "/etc/cmk"

resources/pods/cmk-install-pod.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626
command:
2727
- "/bin/bash"
2828
- "-c"
29-
image: cmk:v1.2.2
29+
image: cmk:v1.3.0
3030
name: cmk-install-pod
3131
volumeMounts:
3232
- mountPath: "/opt/bin"

resources/pods/cmk-isolate-pod-no-webhook.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
restartPolicy: Never
3030
containers:
3131
- name: cmk-isolate-exclusive
32-
image: cmk:v1.2.2
32+
image: cmk:v1.3.0
3333
command:
3434
- "/bin/bash"
3535
- "-c"
@@ -52,7 +52,7 @@ spec:
5252
- mountPath: "/etc/cmk"
5353
name: cmk-conf-dir
5454
- name: cmk-isolate-shared
55-
image: cmk:v1.2.2
55+
image: cmk:v1.3.0
5656
command:
5757
- "/bin/bash"
5858
- "-c"
@@ -70,7 +70,7 @@ spec:
7070
- mountPath: "/etc/cmk"
7171
name: cmk-conf-dir
7272
- name: cmk-isolate-infra
73-
image: cmk:v1.2.2
73+
image: cmk:v1.3.0
7474
command:
7575
- "/bin/bash"
7676
- "-c"

resources/pods/cmk-isolate-pod.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
restartPolicy: Never
3030
containers:
3131
- name: cmk-isolate-exclusive
32-
image: cmk:v1.2.2
32+
image: cmk:v1.3.0
3333
command:
3434
- "/bin/bash"
3535
- "-c"
@@ -41,14 +41,14 @@ spec:
4141
limits:
4242
cmk.intel.com/exclusive-cores: '1'
4343
- name: cmk-isolate-shared
44-
image: cmk:v1.2.2
44+
image: cmk:v1.3.0
4545
command:
4646
- "/bin/bash"
4747
- "-c"
4848
args:
4949
- "/opt/bin/cmk isolate --conf-dir=/etc/cmk --pool=shared echo -- Hello World Shared!!!"
5050
- name: cmk-isolate-infra
51-
image: cmk:v1.2.2
51+
image: cmk:v1.3.0
5252
command:
5353
- "/bin/bash"
5454
- "-c"

resources/pods/cmk-legacy-isolate-pod.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ spec:
3939
env:
4040
- name: CMK_PROC_FS
4141
value: "/host/proc"
42-
image: cmk:v1.2.2
42+
image: cmk:v1.3.0
4343
name: cmk-isolate-exclusive
4444
resources:
4545
requests:
@@ -60,7 +60,7 @@ spec:
6060
env:
6161
- name: CMK_PROC_FS
6262
value: "/host/proc"
63-
image: cmk:v1.2.2
63+
image: cmk:v1.3.0
6464
name: cmk-isolate-shared
6565
volumeMounts:
6666
- mountPath: "/host/proc"
@@ -78,7 +78,7 @@ spec:
7878
env:
7979
- name: CMK_PROC_FS
8080
value: "/host/proc"
81-
image: cmk:v1.2.2
81+
image: cmk:v1.3.0
8282
name: cmk-isolate-infra
8383
volumeMounts:
8484
- mountPath: "/host/proc"

resources/pods/cmk-nodereport-daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ spec:
4848
valueFrom:
4949
fieldRef:
5050
fieldPath: spec.nodeName
51-
image: cmk:v1.2.2
51+
image: cmk:v1.3.0
5252
name: cmk-nodereport
5353
volumeMounts:
5454
- mountPath: "/host/proc"

resources/pods/cmk-reconcile-daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ spec:
4848
valueFrom:
4949
fieldRef:
5050
fieldPath: spec.nodeName
51-
image: cmk:v1.2.2
51+
image: cmk:v1.3.0
5252
name: cmk-reconcile
5353
volumeMounts:
5454
- mountPath: "/host/proc"

resources/pods/cmk-uninstall-all-daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ spec:
4646
valueFrom:
4747
fieldRef:
4848
fieldPath: spec.nodeName
49-
image: cmk:v1.2.2
49+
image: cmk:v1.3.0
5050
name: cmk-uninstall-all-nodes
5151
volumeMounts:
5252
- mountPath: "/etc/cmk"

resources/pods/cmk-uninstall-pod.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ spec:
4343
valueFrom:
4444
fieldRef:
4545
fieldPath: spec.nodeName
46-
image: cmk:v1.2.2
46+
image: cmk:v1.3.0
4747
name: cmk-uninstall-pod
4848
volumeMounts:
4949
- mountPath: "/etc/cmk"

resources/webhook/cmk-webhook-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spec:
3737
command:
3838
- "/bin/bash"
3939
- "-c"
40-
image: cmk:v1.2.2
40+
image: cmk:v1.3.0
4141
name: cmk-webhook
4242
volumeMounts:
4343
- mountPath: /etc/webhook

tests/integration/test_cmk_help.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def test_cmk_help():
5151
--cmk-cmd-list=<list> Comma seperated list of CMK sub-commands to run
5252
on each host
5353
[default: init,reconcile,install,discover,nodereport].
54-
--cmk-img=<img> CMK Docker image [default: cmk:v1.2.2].
54+
--cmk-img=<img> CMK Docker image [default: cmk:v1.3.0].
5555
--cmk-img-pol=<pol> Image pull policy for the CMK Docker image
5656
[default: IfNotPresent].
5757
--conf-dir=<dir> CMK configuration directory [default: /etc/cmk].

0 commit comments

Comments
 (0)