CMK release - version v1.2.0-rc1.

intel · Sep 22, 2017 · b973586 · b973586
1 parent fdc7760
commit b973586
Show file tree

Hide file tree

Showing 19 changed files with 28 additions and 28 deletions.
diff --git a/Makefile b/Makefile
@@ -16,7 +16,7 @@
 
 all: docker
 
-version=v1.1.0
+version=v1.2.0-rc1
 
 # 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
@@ -69,7 +69,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.1.0].
+  --cmk-img=<img>       CMK Docker image [default: cmk:v1.2.0-rc1].
   --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
@@ -118,21 +118,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.1.0` branch neither locally nor remotely
- - get previous version string from `Makefile` (`version=v1.1.0`) and check
+ - check whether there is no `cmk-release-v1.2.0-rc1` branch neither locally nor remotely
+ - get previous version string from `Makefile` (`version=v1.2.0-rc1`) and check
 
 If all above checks pass, script will:
- - create local branch `cmk-release-v1.1.0`
- - replace old release string (`v1.1.0`) with new one (`v1.1.0`) in all repo files
- - commit changes with message `CMK release - version v1.1.0.`
+ - create local branch `cmk-release-v1.2.0-rc1`
+ - replace old release string (`v1.2.0-rc1`) with new one (`v1.2.0-rc1`) in all repo files
+ - commit changes with message `CMK release - version v1.2.0-rc1.`
  - 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.1.0.` string
-- `v1.1.0` will become tag value
+- check latest commit message for `CMK release - version v1.2.0-rc1.` string
+- `v1.2.0-rc1` 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
@@ -44,7 +44,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.1.0].
+  --cmk-img=<img>       CMK Docker image [default: cmk:v1.2.0-rc1].
   --cmk-img-pol=<pol>   Image pull policy for the CMK Docker image
                         [default: IfNotPresent].
   --conf-dir=<dir>      CMK configuration directory [default: /etc/cmk].
@@ -85,7 +85,7 @@
 def main():
     setup_logging()
 
-    args = docopt(__doc__, version="CMK v1.1.0")
+    args = docopt(__doc__, version="CMK v1.2.0-rc1")
     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
@@ -49,7 +49,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.1.0].
+  --cmk-img=<img>       CMK Docker image [default: cmk:v1.2.0-rc1].
   --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
@@ -88,7 +88,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.1.0].
+  --cmk-img=&lt;img&gt;       CMK Docker image [default: cmk:v1.2.0-rc1].
   --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
@@ -187,7 +187,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.1.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.2.0-rc1</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/">https://hub.docker.com/</a>).</li>
 </ul>

diff --git a/docs/html/index.html b/docs/html/index.html
@@ -127,7 +127,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.1.0].
+  --cmk-img=&lt;img&gt;       CMK Docker image [default: cmk:v1.2.0-rc1].
   --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
@@ -125,7 +125,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.1.0`. It is expected that the
+- 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
 `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/).
 

diff --git a/resources/pods/cmk-cluster-init-pod.yaml b/resources/pods/cmk-cluster-init-pod.yaml
@@ -27,6 +27,6 @@ spec:
     command:
     - "/bin/bash"
     - "-c"
-    image: cmk:v1.1.0
+    image: cmk:v1.2.0-rc1
     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.1.0
+    image: cmk:v1.2.0-rc1
     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_CP_CORES
       # Change this to modify the value passed to `--num-cp-cores` flag.
       value: '1'
-    image: cmk:v1.1.0
+    image: cmk:v1.2.0-rc1
     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.1.0
+    image: cmk:v1.2.0-rc1
     name: cmk-install-pod
     volumeMounts:
     - mountPath: "/opt/bin"

diff --git a/resources/pods/cmk-isolate-pod.yaml b/resources/pods/cmk-isolate-pod.yaml
@@ -35,7 +35,7 @@ spec:
     env:
     - name: CMK_PROC_FS
       value: "/host/proc"
-    image: cmk:v1.1.0
+    image: cmk:v1.2.0-rc1
     name: cmk-isolate-dp
     resources:
       requests:
@@ -56,7 +56,7 @@ spec:
     env:
     - name: CMK_PROC_FS
       value: "/host/proc"
-    image: cmk:v1.1.0
+    image: cmk:v1.2.0-rc1
     name: cmk-isolate-cp
     volumeMounts:
     - mountPath: "/host/proc"
@@ -74,7 +74,7 @@ spec:
     env:
     - name: CMK_PROC_FS
       value: "/host/proc"
-    image: cmk:v1.1.0
+    image: cmk:v1.2.0-rc1
     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.1.0
+        image: cmk:v1.2.0-rc1
         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.1.0
+        image: cmk:v1.2.0-rc1
         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.1.0
+        image: cmk:v1.2.0-rc1
         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
@@ -42,7 +42,7 @@ spec:
       valueFrom:
         fieldRef:
           fieldPath: spec.nodeName
-    image: cmk:v1.1.0
+    image: cmk:v1.2.0-rc1
     name: cmk-uninstall-pod
     volumeMounts:
     - mountPath: "/etc/cmk"

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