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

Commit 7850763

Browse files
pbrownlow7lmdaly
authored andcommitted
CMK release - version v1.4.0.
1 parent 0588698 commit 7850763

30 files changed

+270
-183
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.1
19+
version=v1.4.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.3.1].
75+
--cmk-img=<img> CMK Docker image [default: cmk:v1.4.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
@@ -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.1` branch neither locally nor remotely
124-
- get previous version string from `Makefile` (`version=v1.3.1`) and check
123+
- check whether there is no `cmk-release-v1.4.0` branch neither locally nor remotely
124+
- get previous version string from `Makefile` (`version=v1.4.0`) and check
125125

126126
If all above checks pass, script will:
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.`
127+
- create local branch `cmk-release-v1.4.0`
128+
- replace old release string (`v1.4.0`) with new one (`v1.4.0`) in all repo files
129+
- commit changes with message `CMK release - version v1.4.0.`
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.1.` string
138-
- `v1.3.1` will become tag value
137+
- check latest commit message for `CMK release - version v1.4.0.` string
138+
- `v1.4.0` 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.1].
51+
--cmk-img=<img> CMK Docker image [default: cmk:v1.4.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.3.1")
95+
args = docopt(__doc__, version="CMK v1.4.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.3.1].
56+
--cmk-img=<img> CMK Docker image [default: cmk:v1.4.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/architecture.html

Lines changed: 32 additions & 21 deletions
Large diffs are not rendered by default.

docs/html/docs/build.html

Lines changed: 31 additions & 20 deletions
Large diffs are not rendered by default.

docs/html/docs/cli.html

Lines changed: 32 additions & 21 deletions
Large diffs are not rendered by default.

docs/html/docs/config.html

Lines changed: 31 additions & 20 deletions
Large diffs are not rendered by default.

docs/html/docs/operator.html

Lines changed: 43 additions & 22 deletions
Large diffs are not rendered by default.

docs/html/docs/user.html

Lines changed: 32 additions & 21 deletions
Large diffs are not rendered by default.

docs/html/index.html

Lines changed: 31 additions & 20 deletions
Large diffs are not rendered by default.

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.1`. It is expected that the
144+
- 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
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

@@ -446,7 +446,7 @@ spec:
446446
env:
447447
- name: CMK_PROC_FS
448448
value: "/host/proc"
449-
image: cmk:v1.3.1
449+
image: cmk:v1.4.0
450450
imagePullPolicy: "Never"
451451
name: cmk-isolate-infra
452452
volumeMounts:
@@ -499,7 +499,7 @@ spec:
499499
- "/bin/bash"
500500
- "-c"
501501
env:
502-
image: cmk:v1.3.1
502+
image: cmk:v1.4.0
503503
imagePullPolicy: "Never"
504504
name: cmk-isolate-infra
505505
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.3.1
86+
image: cmk:v1.4.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.3.1
31+
image: cmk:v1.4.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
@@ -32,7 +32,7 @@ spec:
3232
valueFrom:
3333
fieldRef:
3434
fieldPath: spec.nodeName
35-
image: cmk:v1.3.1
35+
image: cmk:v1.4.0
3636
name: cmk-discover-pod
3737
volumeMounts:
3838
- mountPath: "/etc/cmk"

resources/pods/cmk-init-pod.yaml

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

resources/pods/cmk-install-pod.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
command:
2828
- "/bin/bash"
2929
- "-c"
30-
image: cmk:v1.3.1
30+
image: cmk:v1.4.0
3131
name: cmk-install-pod
3232
volumeMounts:
3333
- 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.3.1
32+
image: cmk:v1.4.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.3.1
55+
image: cmk:v1.4.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.3.1
73+
image: cmk:v1.4.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.3.1
32+
image: cmk:v1.4.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.3.1
44+
image: cmk:v1.4.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.3.1
51+
image: cmk:v1.4.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.3.1
42+
image: cmk:v1.4.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.3.1
63+
image: cmk:v1.4.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.3.1
81+
image: cmk:v1.4.0
8282
name: cmk-isolate-infra
8383
volumeMounts:
8484
- mountPath: "/host/proc"

resources/pods/cmk-nodereport-daemonset-legacy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ spec:
4949
valueFrom:
5050
fieldRef:
5151
fieldPath: spec.nodeName
52-
image: cmk:v1.3.1
52+
image: cmk:v1.4.0
5353
name: cmk-nodereport
5454
volumeMounts:
5555
- mountPath: "/host/proc"

resources/pods/cmk-nodereport-daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ spec:
5252
valueFrom:
5353
fieldRef:
5454
fieldPath: spec.nodeName
55-
image: cmk:v1.3.1
55+
image: cmk:v1.4.0
5656
name: cmk-nodereport
5757
volumeMounts:
5858
- mountPath: "/host/proc"

resources/pods/cmk-reconcile-daemonset-legacy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ spec:
4949
valueFrom:
5050
fieldRef:
5151
fieldPath: spec.nodeName
52-
image: cmk:v1.3.1
52+
image: cmk:v1.4.0
5353
name: cmk-reconcile
5454
volumeMounts:
5555
- mountPath: "/host/proc"

resources/pods/cmk-reconcile-daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ spec:
5252
valueFrom:
5353
fieldRef:
5454
fieldPath: spec.nodeName
55-
image: cmk:v1.3.1
55+
image: cmk:v1.4.0
5656
name: cmk-reconcile
5757
volumeMounts:
5858
- mountPath: "/host/proc"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spec:
4747
valueFrom:
4848
fieldRef:
4949
fieldPath: spec.nodeName
50-
image: cmk:v1.3.1
50+
image: cmk:v1.4.0
5151
name: cmk-uninstall-all-nodes
5252
volumeMounts:
5353
- mountPath: "/etc/cmk"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ spec:
5050
valueFrom:
5151
fieldRef:
5252
fieldPath: spec.nodeName
53-
image: cmk:v1.3.1
53+
image: cmk:v1.4.0
5454
name: cmk-uninstall-all-nodes
5555
volumeMounts:
5656
- 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.3.1
46+
image: cmk:v1.4.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.3.1
40+
image: cmk:v1.4.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.3.1].
54+
--cmk-img=<img> CMK Docker image [default: cmk:v1.4.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)