CMK release - version v1.3.1.

intel · Jan 17, 2019 · fc0b20f · fc0b20f
1 parent 77f784d
commit fc0b20f
Show file tree

Hide file tree

Showing 24 changed files with 44 additions and 44 deletions.
diff --git a/Makefile b/Makefile
@@ -16,7 +16,7 @@
 
 all: docker
 
-version=v1.3.0
+version=v1.3.1
 
 # TODO: This target should be changed, when e2e tests will be ready and test
 # entrypoint will be defined.

diff --git a/README.md b/README.md
@@ -72,7 +72,7 @@ Options:
   --cmk-cmd-list=<list>        Comma seperated list of CMK sub-commands to run
                                on each host
                                [default: init,reconcile,install,discover,nodereport].
-  --cmk-img=<img>              CMK Docker image [default: cmk:v1.3.0].
+  --cmk-img=<img>              CMK Docker image [default: cmk:v1.3.1].
   --cmk-img-pol=<pol>          Image pull policy for the CMK Docker image
                                [default: IfNotPresent].
   --conf-dir=<dir>             CMK configuration directory [default: /etc/cmk].

diff --git a/RELEASE.md b/RELEASE.md
@@ -120,21 +120,21 @@ Running Vagrant locally syncs your repository directory into `/cmk` using by def
  - check whether current branch is `master` and if it's "clean"
  - fetch origin
  - check whether `CMK_RELEASE_VER` is set, follows proper pattern and there in no existing tag with it's value
- - check whether there is no `cmk-release-v1.3.0` branch neither locally nor remotely
- - get previous version string from `Makefile` (`version=v1.3.0`) and check
+ - check whether there is no `cmk-release-v1.3.1` branch neither locally nor remotely
+ - get previous version string from `Makefile` (`version=v1.3.1`) and check
 
 If all above checks pass, script will:
- - create local branch `cmk-release-v1.3.0`
- - replace old release string (`v1.3.0`) with new one (`v1.3.0`) in all repo files
- - commit changes with message `CMK release - version v1.3.0.`
+ - create local branch `cmk-release-v1.3.1`
+ - replace old release string (`v1.3.1`) with new one (`v1.3.1`) in all repo files
+ - commit changes with message `CMK release - version v1.3.1.`
  - push branch to origin
  - checkout to `master` branch.
 
 **What will happen after PR gets to `master` branch**
 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.
 
 **What will `make_release.py` do :**
-- check latest commit message for `CMK release - version v1.3.0.` string
-- `v1.3.0` will become tag value
+- check latest commit message for `CMK release - version v1.3.1.` string
+- `v1.3.1` will become tag value
 - generate change log
 - create release with change log based on tag found in commit message
diff --git a/cmk.py b/cmk.py
@@ -48,7 +48,7 @@
   --cmk-cmd-list=<list>        Comma seperated list of CMK sub-commands to run
                                on each host
                                [default: init,reconcile,install,discover,nodereport].
-  --cmk-img=<img>              CMK Docker image [default: cmk:v1.3.0].
+  --cmk-img=<img>              CMK Docker image [default: cmk:v1.3.1].
   --cmk-img-pol=<pol>          Image pull policy for the CMK Docker image
                                [default: IfNotPresent].
   --conf-dir=<dir>             CMK configuration directory [default: /etc/cmk].
@@ -92,7 +92,7 @@
 def main():
     setup_logging()
 
-    args = docopt(__doc__, version="CMK v1.3.0")
+    args = docopt(__doc__, version="CMK v1.3.1")
     if args["cluster-init"]:
         clusterinit.cluster_init(args["--host-list"], args["--all-hosts"],
                                  args["--cmk-cmd-list"], args["--cmk-img"],

diff --git a/docs/cli.md b/docs/cli.md
@@ -53,7 +53,7 @@ Options:
   --cmk-cmd-list=<list>        Comma seperated list of CMK sub-commands to run
                                on each host
                                [default: init,reconcile,install,discover,nodereport].
-  --cmk-img=<img>              CMK Docker image [default: cmk:v1.3.0].
+  --cmk-img=<img>              CMK Docker image [default: cmk:v1.3.1].
   --cmk-img-pol=<pol>          Image pull policy for the CMK Docker image
                                [default: IfNotPresent].
   --conf-dir=<dir>             CMK configuration directory [default: /etc/cmk].

diff --git a/docs/html/docs/cli.html b/docs/html/docs/cli.html
@@ -111,7 +111,7 @@ <h2>
   --cmk-cmd-list=&lt;list&gt;        Comma seperated list of CMK sub-commands to run
                                on each host
                                [default: init,reconcile,install,discover,nodereport].
-  --cmk-img=&lt;img&gt;              CMK Docker image [default: cmk:v1.3.0].
+  --cmk-img=&lt;img&gt;              CMK Docker image [default: cmk:v1.3.1].
   --cmk-img-pol=&lt;pol&gt;          Image pull policy for the CMK Docker image
                                [default: IfNotPresent].
   --conf-dir=&lt;dir&gt;             CMK configuration directory [default: /etc/cmk].

diff --git a/docs/html/docs/operator.html b/docs/html/docs/operator.html
@@ -222,7 +222,7 @@ <h3>
 <li>The subcommands described below should be run in the same order.</li>
 <li>The documentation in this section assumes that the <code>CMK</code> configuration directory is <code>/etc/cmk</code> and the <code>cmk</code>
 binary is installed on the host under <code>/opt/bin</code>.</li>
-<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
+<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
 <code>cmk</code> container image is built and cached locally in the host. The <code>image</code> field will require modification if the
 container image is hosted remotely (e.g., in <a href="https://hub.docker.com/" rel="nofollow">https://hub.docker.com/</a>).</li>
 </ul>
@@ -487,7 +487,7 @@ <h2>
     <span class="pl-ent">env</span>:
     - <span class="pl-ent">name</span>: <span class="pl-s">CMK_PROC_FS</span>
       <span class="pl-ent">value</span>: <span class="pl-s"><span class="pl-pds">"</span>/host/proc<span class="pl-pds">"</span></span>
-    <span class="pl-ent">image</span>: <span class="pl-s">cmk:v1.3.0</span>
+    <span class="pl-ent">image</span>: <span class="pl-s">cmk:v1.3.1</span>
     <span class="pl-ent">imagePullPolicy</span>: <span class="pl-s"><span class="pl-pds">"</span>Never<span class="pl-pds">"</span></span>
     <span class="pl-ent">name</span>: <span class="pl-s">cmk-isolate-infra</span>
     <span class="pl-ent">volumeMounts</span>:
@@ -542,7 +542,7 @@ <h3>
     - "/bin/bash"
     - "-c"
     env:
-    image: cmk:v1.3.0
+    image: cmk:v1.3.1
     imagePullPolicy: "Never"
     name: cmk-isolate-infra
     resources:
@@ -553,15 +553,15 @@ <h3>
 <ul>
 <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
 substituted as mentioned in the previous section.</li>
-<li>Run <code>kubectl get pod cmk-isolate-pod -o json | jq .metadata.annotations</code> and verify that annotation has been
+<li>Run <code>kubectl get pod cmk-isolate-pod  -o json | jq .metadata.annotations</code> and verify that annotation has been
 added:</li>
 </ul>
 <pre><code>{
   "cmk.intel.com/resources-injected": "true"
 }
 </code></pre>
 <ul>
-<li>Run <code>kubectl get pod cmk-isolate-pod -o json | jq .spec.volumes</code> and verify that extra volumes have been
+<li>Run <code>kubectl get pod cmk-isolate-pod  -o json | jq .spec.volumes</code> and verify that extra volumes have been
 injected:</li>
 </ul>
 <pre><code>[
@@ -596,7 +596,7 @@ <h3>
 ]
 </code></pre>
 <ul>
-<li>Run <code>kubectl get pod cmk-isolate-pod -o json | jq .spec.containers[0].env</code> and verify that
+<li>Run <code>kubectl get pod cmk-isolate-pod  -o json | jq .spec.containers[0].env</code> and verify that
 env variables have been added to the container spec:</li>
 </ul>
 <pre><code>[

diff --git a/docs/html/docs/user.html b/docs/html/docs/user.html
@@ -134,7 +134,7 @@ <h3>
     - "/bin/bash"
     - "-c"
     env:
-    image: cmk:v1.3.0
+    image: cmk:v1.3.1
     imagePullPolicy: "Never"
     name: cmk-isolate-infra
     resources:

diff --git a/docs/html/index.html b/docs/html/index.html
@@ -149,7 +149,7 @@ <h2>
   --cmk-cmd-list=&lt;list&gt;        Comma seperated list of CMK sub-commands to run
                                on each host
                                [default: init,reconcile,install,discover,nodereport].
-  --cmk-img=&lt;img&gt;              CMK Docker image [default: cmk:v1.3.0].
+  --cmk-img=&lt;img&gt;              CMK Docker image [default: cmk:v1.3.1].
   --cmk-img-pol=&lt;pol&gt;          Image pull policy for the CMK Docker image
                                [default: IfNotPresent].
   --conf-dir=&lt;dir&gt;             CMK configuration directory [default: /etc/cmk].

diff --git a/docs/operator.md b/docs/operator.md
@@ -141,7 +141,7 @@ for some reason.
 - The subcommands described below should be run in the same order.
 - The documentation in this section assumes that the `CMK` configuration directory is `/etc/cmk` and the `cmk`
 binary is installed on the host under `/opt/bin`.
-- 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
+- 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
 `cmk` container image is built and cached locally in the host. The `image` field will require modification if the
 container image is hosted remotely (e.g., in https://hub.docker.com/).
 
@@ -440,7 +440,7 @@ spec:
     env:
     - name: CMK_PROC_FS
       value: "/host/proc"
-    image: cmk:v1.3.0
+    image: cmk:v1.3.1
     imagePullPolicy: "Never"
     name: cmk-isolate-infra
     volumeMounts:
@@ -493,7 +493,7 @@ spec:
     - "/bin/bash"
     - "-c"
     env:
-    image: cmk:v1.3.0
+    image: cmk:v1.3.1
     imagePullPolicy: "Never"
     name: cmk-isolate-infra
     resources:

diff --git a/docs/user.md b/docs/user.md
@@ -83,7 +83,7 @@ spec:
     - "/bin/bash"
     - "-c"
     env:
-    image: cmk:v1.3.0
+    image: cmk:v1.3.1
     imagePullPolicy: "Never"
     name: cmk-isolate-infra
     resources:

diff --git a/resources/pods/cmk-cluster-init-pod.yaml b/resources/pods/cmk-cluster-init-pod.yaml
@@ -28,6 +28,6 @@ spec:
     command:
     - "/bin/bash"
     - "-c"
-    image: cmk:v1.3.0
+    image: cmk:v1.3.1
     name: cmk-cluster-init-pod
   restartPolicy: Never
diff --git a/resources/pods/cmk-discover-pod.yaml b/resources/pods/cmk-discover-pod.yaml
@@ -31,7 +31,7 @@ spec:
       valueFrom:
         fieldRef:
           fieldPath: spec.nodeName
-    image: cmk:v1.3.0
+    image: cmk:v1.3.1
     name: cmk-discover-pod
     volumeMounts:
     - mountPath: "/etc/cmk"

diff --git a/resources/pods/cmk-init-pod.yaml b/resources/pods/cmk-init-pod.yaml
@@ -35,7 +35,7 @@ spec:
     - name: NUM_SHARED_CORES
       # Change this to modify the value passed to `--num-shared-cores` flag.
       value: '1'
-    image: cmk:v1.3.0
+    image: cmk:v1.3.1
     name: cmk-init-pod
     volumeMounts:
     - mountPath: "/etc/cmk"

diff --git a/resources/pods/cmk-install-pod.yaml b/resources/pods/cmk-install-pod.yaml
@@ -26,7 +26,7 @@ spec:
     command:
     - "/bin/bash"
     - "-c"
-    image: cmk:v1.3.0
+    image: cmk:v1.3.1
     name: cmk-install-pod
     volumeMounts:
     - mountPath: "/opt/bin"

diff --git a/resources/pods/cmk-isolate-pod-no-webhook.yaml b/resources/pods/cmk-isolate-pod-no-webhook.yaml
@@ -29,7 +29,7 @@ spec:
   restartPolicy: Never
   containers:
   - name: cmk-isolate-exclusive
-    image: cmk:v1.3.0
+    image: cmk:v1.3.1
     command:
     - "/bin/bash"
     - "-c"
@@ -52,7 +52,7 @@ spec:
     - mountPath: "/etc/cmk"
       name: cmk-conf-dir
   - name: cmk-isolate-shared
-    image: cmk:v1.3.0
+    image: cmk:v1.3.1
     command:
     - "/bin/bash"
     - "-c"
@@ -70,7 +70,7 @@ spec:
     - mountPath: "/etc/cmk"
       name: cmk-conf-dir
   - name: cmk-isolate-infra
-    image: cmk:v1.3.0
+    image: cmk:v1.3.1
     command:
     - "/bin/bash"
     - "-c"

diff --git a/resources/pods/cmk-isolate-pod.yaml b/resources/pods/cmk-isolate-pod.yaml
@@ -29,7 +29,7 @@ spec:
   restartPolicy: Never
   containers:
   - name: cmk-isolate-exclusive
-    image: cmk:v1.3.0
+    image: cmk:v1.3.1
     command:
     - "/bin/bash"
     - "-c"
@@ -41,14 +41,14 @@ spec:
       limits:
         cmk.intel.com/exclusive-cores: '1'
   - name: cmk-isolate-shared
-    image: cmk:v1.3.0
+    image: cmk:v1.3.1
     command:
     - "/bin/bash"
     - "-c"
     args:
     - "/opt/bin/cmk isolate --conf-dir=/etc/cmk --pool=shared echo -- Hello World Shared!!!"
   - name: cmk-isolate-infra
-    image: cmk:v1.3.0
+    image: cmk:v1.3.1
     command:
     - "/bin/bash"
     - "-c"

diff --git a/resources/pods/cmk-legacy-isolate-pod.yaml b/resources/pods/cmk-legacy-isolate-pod.yaml
@@ -39,7 +39,7 @@ spec:
     env:
     - name: CMK_PROC_FS
       value: "/host/proc"
-    image: cmk:v1.3.0
+    image: cmk:v1.3.1
     name: cmk-isolate-exclusive
     resources:
       requests:
@@ -60,7 +60,7 @@ spec:
     env:
     - name: CMK_PROC_FS
       value: "/host/proc"
-    image: cmk:v1.3.0
+    image: cmk:v1.3.1
     name: cmk-isolate-shared
     volumeMounts:
     - mountPath: "/host/proc"
@@ -78,7 +78,7 @@ spec:
     env:
     - name: CMK_PROC_FS
       value: "/host/proc"
-    image: cmk:v1.3.0
+    image: cmk:v1.3.1
     name: cmk-isolate-infra
     volumeMounts:
     - mountPath: "/host/proc"

diff --git a/resources/pods/cmk-nodereport-daemonset.yaml b/resources/pods/cmk-nodereport-daemonset.yaml
@@ -48,7 +48,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
-        image: cmk:v1.3.0
+        image: cmk:v1.3.1
         name: cmk-nodereport
         volumeMounts:
         - mountPath: "/host/proc"

diff --git a/resources/pods/cmk-reconcile-daemonset.yaml b/resources/pods/cmk-reconcile-daemonset.yaml
@@ -48,7 +48,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
-        image: cmk:v1.3.0
+        image: cmk:v1.3.1
         name: cmk-reconcile
         volumeMounts:
         - mountPath: "/host/proc"

diff --git a/resources/pods/cmk-uninstall-all-daemonset.yaml b/resources/pods/cmk-uninstall-all-daemonset.yaml
@@ -46,7 +46,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
-        image: cmk:v1.3.0
+        image: cmk:v1.3.1
         name: cmk-uninstall-all-nodes
         volumeMounts:
         - mountPath: "/etc/cmk"

diff --git a/resources/pods/cmk-uninstall-pod.yaml b/resources/pods/cmk-uninstall-pod.yaml
@@ -43,7 +43,7 @@ spec:
       valueFrom:
         fieldRef:
           fieldPath: spec.nodeName
-    image: cmk:v1.3.0
+    image: cmk:v1.3.1
     name: cmk-uninstall-pod
     volumeMounts:
     - mountPath: "/etc/cmk"

diff --git a/resources/webhook/cmk-webhook-deployment.yaml b/resources/webhook/cmk-webhook-deployment.yaml
@@ -37,7 +37,7 @@ spec:
         command:
         - "/bin/bash"
         - "-c"
-        image: cmk:v1.3.0
+        image: cmk:v1.3.1
         name: cmk-webhook
         volumeMounts:
         - mountPath: /etc/webhook

diff --git a/tests/integration/test_cmk_help.py b/tests/integration/test_cmk_help.py
@@ -51,7 +51,7 @@ def test_cmk_help():
   --cmk-cmd-list=<list>        Comma seperated list of CMK sub-commands to run
                                on each host
                                [default: init,reconcile,install,discover,nodereport].
-  --cmk-img=<img>              CMK Docker image [default: cmk:v1.3.0].
+  --cmk-img=<img>              CMK Docker image [default: cmk:v1.3.1].
   --cmk-img-pol=<pol>          Image pull policy for the CMK Docker image
                                [default: IfNotPresent].
   --conf-dir=<dir>             CMK configuration directory [default: /etc/cmk].