CMK release - version v1.4.1.

intel · Mar 19, 2020 · 1c83e5a · 1c83e5a
1 parent 118cf6e
commit 1c83e5a
Show file tree

Hide file tree

Showing 33 changed files with 225 additions and 225 deletions.
diff --git a/.release/prepare_release.py b/.release/prepare_release.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # Copyright (c) 2017 Intel Corporation
 #

diff --git a/Makefile b/Makefile
@@ -16,7 +16,7 @@
 
 all: docker
 
-version=v1.4.0
+version=v1.4.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.4.0].
+  --cmk-img=<img>              CMK Docker image [default: cmk:v1.4.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.4.0` branch neither locally nor remotely
- - get previous version string from `Makefile` (`version=v1.4.0`) and check
+ - check whether there is no `cmk-release-v1.4.1` branch neither locally nor remotely
+ - get previous version string from `Makefile` (`version=v1.4.1`) and check
 
 If all above checks pass, script will:
- - create local branch `cmk-release-v1.4.0`
- - replace old release string (`v1.4.0`) with new one (`v1.4.0`) in all repo files
- - commit changes with message `CMK release - version v1.4.0.`
+ - create local branch `cmk-release-v1.4.1`
+ - replace old release string (`v1.4.1`) with new one (`v1.4.1`) in all repo files
+ - commit changes with message `CMK release - version v1.4.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.4.0.` string
-- `v1.4.0` will become tag value
+- check latest commit message for `CMK release - version v1.4.1.` string
+- `v1.4.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
@@ -50,7 +50,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.4.0].
+  --cmk-img=<img>              CMK Docker image [default: cmk:v1.4.1].
   --cmk-img-pol=<pol>          Image pull policy for the CMK Docker image
                                [default: IfNotPresent].
   --conf-dir=<dir>             CMK configuration directory [default: /etc/cmk].
@@ -98,7 +98,7 @@
 def main():
     setup_logging()
 
-    args = docopt(__doc__, version="CMK v1.4.0")
+    args = docopt(__doc__, version="CMK v1.4.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
@@ -55,7 +55,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.4.0].
+  --cmk-img=<img>              CMK Docker image [default: cmk:v1.4.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/architecture.html b/docs/html/docs/architecture.html
diff --git a/docs/html/docs/build.html b/docs/html/docs/build.html
diff --git a/docs/html/docs/cli.html b/docs/html/docs/cli.html
diff --git a/docs/html/docs/config.html b/docs/html/docs/config.html
diff --git a/docs/html/docs/operator.html b/docs/html/docs/operator.html
diff --git a/docs/html/docs/user.html b/docs/html/docs/user.html
diff --git a/docs/html/index.html b/docs/html/index.html
diff --git a/docs/operator.md b/docs/operator.md
@@ -150,7 +150,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.4.0`. It is expected that the
+- In all the pod templates used in this section, the name of container image used is `cmk:v1.4.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/).
 
@@ -455,7 +455,7 @@ spec:
     env:
     - name: CMK_PROC_FS
       value: "/host/proc"
-    image: cmk:v1.4.0
+    image: cmk:v1.4.1
     imagePullPolicy: "Never"
     name: cmk-isolate-infra
     volumeMounts:
@@ -508,7 +508,7 @@ spec:
     - "/bin/bash"
     - "-c"
     env:
-    image: cmk:v1.4.0
+    image: cmk:v1.4.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.4.0
+    image: cmk:v1.4.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.4.0
+    image: cmk:v1.4.1
     name: cmk-cluster-init-pod
   restartPolicy: Never
diff --git a/resources/pods/cmk-discover-pod.yaml b/resources/pods/cmk-discover-pod.yaml
@@ -32,7 +32,7 @@ spec:
       valueFrom:
         fieldRef:
           fieldPath: spec.nodeName
-    image: cmk:v1.4.0
+    image: cmk:v1.4.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
@@ -36,7 +36,7 @@ spec:
     - name: NUM_SHARED_CORES
       # Change this to modify the value passed to `--num-shared-cores` flag.
       value: '1'
-    image: cmk:v1.4.0
+    image: cmk:v1.4.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
@@ -27,7 +27,7 @@ spec:
     command:
     - "/bin/bash"
     - "-c"
-    image: cmk:v1.4.0
+    image: cmk:v1.4.1
     name: cmk-install-pod
     volumeMounts:
     - mountPath: "/opt/bin"

diff --git a/resources/pods/cmk-isolate-excl-non-isolcpus-pod-no-webhook.yaml b/resources/pods/cmk-isolate-excl-non-isolcpus-pod-no-webhook.yaml
@@ -29,7 +29,7 @@ spec:
   restartPolicy: Never
   containers:
   - name: cmk-isolate-exclusive-non-isolcpus
-    image: cmk:v1.4.0
+    image: cmk:v1.4.1
     command:
     - "/bin/bash"
     - "-c"

diff --git a/resources/pods/cmk-isolate-excl-non-isolcpus-pod.yaml b/resources/pods/cmk-isolate-excl-non-isolcpus-pod.yaml
@@ -29,7 +29,7 @@ spec:
   restartPolicy: Never
   containers:
   - name: cmk-isolate-exclusive-non-isolcpus
-    image: cmk:v1.4.0
+    image: cmk:v1.4.1
     command:
     - "/bin/bash"
     - "-c"

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.4.0
+    image: cmk:v1.4.1
     command:
     - "/bin/bash"
     - "-c"
@@ -52,7 +52,7 @@ spec:
     - mountPath: "/etc/cmk"
       name: cmk-conf-dir
   - name: cmk-isolate-shared
-    image: cmk:v1.4.0
+    image: cmk:v1.4.1
     command:
     - "/bin/bash"
     - "-c"
@@ -70,7 +70,7 @@ spec:
     - mountPath: "/etc/cmk"
       name: cmk-conf-dir
   - name: cmk-isolate-infra
-    image: cmk:v1.4.0
+    image: cmk:v1.4.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.4.0
+    image: cmk:v1.4.1
     command:
     - "/bin/bash"
     - "-c"
@@ -41,14 +41,14 @@ spec:
       limits:
         cmk.intel.com/exclusive-cores: '1'
   - name: cmk-isolate-shared
-    image: cmk:v1.4.0
+    image: cmk:v1.4.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.4.0
+    image: cmk:v1.4.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.4.0
+    image: cmk:v1.4.1
     name: cmk-isolate-exclusive
     resources:
       requests:
@@ -60,7 +60,7 @@ spec:
     env:
     - name: CMK_PROC_FS
       value: "/host/proc"
-    image: cmk:v1.4.0
+    image: cmk:v1.4.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.4.0
+    image: cmk:v1.4.1
     name: cmk-isolate-infra
     volumeMounts:
     - mountPath: "/host/proc"

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

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

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

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

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

diff --git a/resources/pods/cmk-uninstall-all-daemonset.yaml b/resources/pods/cmk-uninstall-all-daemonset.yaml
@@ -50,7 +50,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
-        image: cmk:v1.4.0
+        image: cmk:v1.4.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.4.0
+    image: cmk:v1.4.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.4.0
+        image: cmk:v1.4.1
         name: cmk-webhook
         volumeMounts:
         - mountPath: /etc/webhook

diff --git a/tests/integration/test_cmk_help.py b/tests/integration/test_cmk_help.py
@@ -53,7 +53,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.4.0].
+  --cmk-img=<img>              CMK Docker image [default: cmk:v1.4.1].
   --cmk-img-pol=<pol>          Image pull policy for the CMK Docker image
                                [default: IfNotPresent].
   --conf-dir=<dir>             CMK configuration directory [default: /etc/cmk].