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

Commit fc0b20f

Browse files
przemeklallmdaly
authored andcommitted
CMK release - version v1.3.1.
1 parent 77f784d commit fc0b20f

24 files changed

+44
-44
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.3.0
19+
version=v1.3.1
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.3.0].
75+
--cmk-img=<img> CMK Docker image [default: cmk:v1.3.1].
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
@@ -120,21 +120,21 @@ Running Vagrant locally syncs your repository directory into `/cmk` using by def
120120
- check whether current branch is `master` and if it's "clean"
121121
- fetch origin
122122
- check whether `CMK_RELEASE_VER` is set, follows proper pattern and there in no existing tag with it's value
123-
- check whether there is no `cmk-release-v1.3.0` branch neither locally nor remotely
124-
- get previous version string from `Makefile` (`version=v1.3.0`) and check
123+
- check whether there is no `cmk-release-v1.3.1` branch neither locally nor remotely
124+
- get previous version string from `Makefile` (`version=v1.3.1`) and check
125125

126126
If all above checks pass, script will:
127-
- create local branch `cmk-release-v1.3.0`
128-
- replace old release string (`v1.3.0`) with new one (`v1.3.0`) in all repo files
129-
- commit changes with message `CMK release - version v1.3.0.`
127+
- create local branch `cmk-release-v1.3.1`
128+
- replace old release string (`v1.3.1`) with new one (`v1.3.1`) in all repo files
129+
- commit changes with message `CMK release - version v1.3.1.`
130130
- push branch to origin
131131
- checkout to `master` branch.
132132

133133
**What will happen after PR gets to `master` branch**
134134
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.
135135

136136
**What will `make_release.py` do :**
137-
- check latest commit message for `CMK release - version v1.3.0.` string
138-
- `v1.3.0` will become tag value
137+
- check latest commit message for `CMK release - version v1.3.1.` string
138+
- `v1.3.1` will become tag value
139139
- generate change log
140140
- 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.3.0].
51+
--cmk-img=<img> CMK Docker image [default: cmk:v1.3.1].
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.3.0")
95+
args = docopt(__doc__, version="CMK v1.3.1")
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.3.0].
56+
--cmk-img=<img> CMK Docker image [default: cmk:v1.3.1].
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.3.0].
114+
--cmk-img=&lt;img&gt; CMK Docker image [default: cmk:v1.3.1].
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: 6 additions & 6 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.3.0</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.1</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.3.0</span>
490+
<span class="pl-ent">image</span>: <span class="pl-s">cmk:v1.3.1</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.3.0
545+
image: cmk:v1.3.1
546546
imagePullPolicy: "Never"
547547
name: cmk-isolate-infra
548548
resources:
@@ -553,15 +553,15 @@ <h3>
553553
<ul>
554554
<li>Run <code>kubectl create -f &lt;file-name&gt;</code>, where <code>&lt;file-name&gt;</code> is the name of the Pod manifest file with nodeName field
555555
substituted as mentioned in the previous section.</li>
556-
<li>Run <code>kubectl get pod cmk-isolate-pod -o json | jq .metadata.annotations</code> and verify that annotation has been
556+
<li>Run <code>kubectl get pod cmk-isolate-pod -o json | jq .metadata.annotations</code> and verify that annotation has been
557557
added:</li>
558558
</ul>
559559
<pre><code>{
560560
"cmk.intel.com/resources-injected": "true"
561561
}
562562
</code></pre>
563563
<ul>
564-
<li>Run <code>kubectl get pod cmk-isolate-pod -o json | jq .spec.volumes</code> and verify that extra volumes have been
564+
<li>Run <code>kubectl get pod cmk-isolate-pod -o json | jq .spec.volumes</code> and verify that extra volumes have been
565565
injected:</li>
566566
</ul>
567567
<pre><code>[
@@ -596,7 +596,7 @@ <h3>
596596
]
597597
</code></pre>
598598
<ul>
599-
<li>Run <code>kubectl get pod cmk-isolate-pod -o json | jq .spec.containers[0].env</code> and verify that
599+
<li>Run <code>kubectl get pod cmk-isolate-pod -o json | jq .spec.containers[0].env</code> and verify that
600600
env variables have been added to the container spec:</li>
601601
</ul>
602602
<pre><code>[

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.3.0
137+
image: cmk:v1.3.1
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.3.0].
152+
--cmk-img=&lt;img&gt; CMK Docker image [default: cmk:v1.3.1].
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.3.0`. 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.1`. 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.3.0
443+
image: cmk:v1.3.1
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.3.0
496+
image: cmk:v1.3.1
497497
imagePullPolicy: "Never"
498498
name: cmk-isolate-infra
499499
resources:

0 commit comments

Comments
 (0)