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

Commit b92d994

Browse files
committed
CMK release - version v1.5.1.
1 parent 927efbe commit b92d994

33 files changed

+315
-217
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.4.1
19+
version=v1.5.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.4.1].
75+
--cmk-img=<img> CMK Docker image [default: cmk:v1.5.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.4.1` branch neither locally nor remotely
124-
- get previous version string from `Makefile` (`version=v1.4.1`) and check
123+
- check whether there is no `cmk-release-v1.5.1` branch neither locally nor remotely
124+
- get previous version string from `Makefile` (`version=v1.5.1`) and check
125125

126126
If all above checks pass, script will:
127-
- create local branch `cmk-release-v1.4.1`
128-
- replace old release string (`v1.4.1`) with new one (`v1.4.1`) in all repo files
129-
- commit changes with message `CMK release - version v1.4.1.`
127+
- create local branch `cmk-release-v1.5.1`
128+
- replace old release string (`v1.5.1`) with new one (`v1.5.1`) in all repo files
129+
- commit changes with message `CMK release - version v1.5.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.4.1.` string
138-
- `v1.4.1` will become tag value
137+
- check latest commit message for `CMK release - version v1.5.1.` string
138+
- `v1.5.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
@@ -63,7 +63,7 @@
6363
--cmk-cmd-list=<list> Comma seperated list of CMK sub-commands to run
6464
on each host
6565
[default: init,reconcile,install,discover,nodereport].
66-
--cmk-img=<img> CMK Docker image [default: cmk:v1.4.1].
66+
--cmk-img=<img> CMK Docker image [default: cmk:v1.5.1].
6767
--cmk-img-pol=<pol> Image pull policy for the CMK Docker image
6868
[default: IfNotPresent].
6969
--install-dir=<dir> CMK install directory [default: /opt/bin].
@@ -119,7 +119,7 @@
119119
def main():
120120
setup_logging()
121121

122-
args = docopt(__doc__, version="CMK v1.4.1")
122+
args = docopt(__doc__, version="CMK v1.5.1")
123123
if args["cluster-init"]:
124124
clusterinit.cluster_init(args["--host-list"], args["--all-hosts"],
125125
args["--cmk-cmd-list"], args["--cmk-img"],

docs/cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Options:
5555
--cmk-cmd-list=<list> Comma seperated list of CMK sub-commands to run
5656
on each host
5757
[default: init,reconcile,install,discover,nodereport].
58-
--cmk-img=<img> CMK Docker image [default: cmk:v1.4.1].
58+
--cmk-img=<img> CMK Docker image [default: cmk:v1.5.1].
5959
--cmk-img-pol=<pol> Image pull policy for the CMK Docker image
6060
[default: IfNotPresent].
6161
--conf-dir=<dir> CMK configuration directory [default: /etc/cmk].

docs/html/docs/architecture.html

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

docs/html/docs/build.html

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

docs/html/docs/cli.html

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

docs/html/docs/config.html

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

docs/html/docs/operator.html

Lines changed: 127 additions & 29 deletions
Large diffs are not rendered by default.

docs/html/docs/user.html

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

docs/html/index.html

Lines changed: 26 additions & 26 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
@@ -174,7 +174,7 @@ for some reason.
174174
- The subcommands described below should be run in the same order.
175175
- The documentation in this section assumes that the `CMK` configuration directory is `/etc/cmk` and the `cmk`
176176
binary is installed on the host under `/opt/bin`.
177-
- 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
177+
- In all the pod templates used in this section, the name of container image used is `cmk:v1.5.1`. It is expected that the
178178
`cmk` container image is built and cached locally in the host. The `image` field will require modification if the
179179
container image is hosted remotely (e.g., in https://hub.docker.com/).
180180

@@ -490,7 +490,7 @@ spec:
490490
env:
491491
- name: CMK_PROC_FS
492492
value: "/host/proc"
493-
image: cmk:v1.4.1
493+
image: cmk:v1.5.1
494494
imagePullPolicy: "Never"
495495
name: cmk-isolate-infra
496496
volumeMounts:
@@ -543,7 +543,7 @@ spec:
543543
- "/bin/bash"
544544
- "-c"
545545
env:
546-
image: cmk:v1.4.1
546+
image: cmk:v1.5.1
547547
imagePullPolicy: "Never"
548548
name: cmk-isolate-infra
549549
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.4.1
86+
image: cmk:v1.5.1
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,7 +28,7 @@ spec:
2828
command:
2929
- "/bin/bash"
3030
- "-c"
31-
image: cmk:v1.4.1
31+
image: cmk:v1.5.1
3232
name: cmk-cluster-init-pod
3333
securityContext:
3434
allowPrivilegeEscalation: false

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.4.1
35+
image: cmk:v1.5.1
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.4.1
39+
image: cmk:v1.5.1
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.4.1
30+
image: cmk:v1.5.1
3131
name: cmk-install-pod
3232
volumeMounts:
3333
- mountPath: "/opt/bin"

resources/pods/cmk-isolate-excl-non-isolcpus-pod-no-webhook.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
restartPolicy: Never
3030
containers:
3131
- name: cmk-isolate-exclusive-non-isolcpus
32-
image: cmk:v1.4.1
32+
image: cmk:v1.5.1
3333
command:
3434
- "/bin/bash"
3535
- "-c"

resources/pods/cmk-isolate-excl-non-isolcpus-pod.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
restartPolicy: Never
3030
containers:
3131
- name: cmk-isolate-exclusive-non-isolcpus
32-
image: cmk:v1.4.1
32+
image: cmk:v1.5.1
3333
command:
3434
- "/bin/bash"
3535
- "-c"

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.4.1
32+
image: cmk:v1.5.1
3333
command:
3434
- "/bin/bash"
3535
- "-c"
@@ -59,7 +59,7 @@ spec:
5959
drop:
6060
- all
6161
- name: cmk-isolate-shared
62-
image: cmk:v1.4.1
62+
image: cmk:v1.5.1
6363
command:
6464
- "/bin/bash"
6565
- "-c"
@@ -84,7 +84,7 @@ spec:
8484
drop:
8585
- all
8686
- name: cmk-isolate-infra
87-
image: cmk:v1.4.1
87+
image: cmk:v1.5.1
8888
command:
8989
- "/bin/bash"
9090
- "-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.4.1
32+
image: cmk:v1.5.1
3333
command:
3434
- "/bin/bash"
3535
- "-c"
@@ -48,7 +48,7 @@ spec:
4848
drop:
4949
- all
5050
- name: cmk-isolate-shared
51-
image: cmk:v1.4.1
51+
image: cmk:v1.5.1
5252
command:
5353
- "/bin/bash"
5454
- "-c"
@@ -62,7 +62,7 @@ spec:
6262
drop:
6363
- all
6464
- name: cmk-isolate-infra
65-
image: cmk:v1.4.1
65+
image: cmk:v1.5.1
6666
command:
6767
- "/bin/bash"
6868
- "-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.4.1
42+
image: cmk:v1.5.1
4343
name: cmk-isolate-exclusive
4444
resources:
4545
requests:
@@ -67,7 +67,7 @@ spec:
6767
env:
6868
- name: CMK_PROC_FS
6969
value: "/host/proc"
70-
image: cmk:v1.4.1
70+
image: cmk:v1.5.1
7171
name: cmk-isolate-shared
7272
volumeMounts:
7373
- mountPath: "/host/proc"
@@ -92,7 +92,7 @@ spec:
9292
env:
9393
- name: CMK_PROC_FS
9494
value: "/host/proc"
95-
image: cmk:v1.4.1
95+
image: cmk:v1.5.1
9696
name: cmk-isolate-infra
9797
volumeMounts:
9898
- 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.4.1
52+
image: cmk:v1.5.1
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.4.1
55+
image: cmk:v1.5.1
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.4.1
52+
image: cmk:v1.5.1
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.4.1
55+
image: cmk:v1.5.1
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.4.1
50+
image: cmk:v1.5.1
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.4.1
53+
image: cmk:v1.5.1
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.4.1
46+
image: cmk:v1.5.1
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
@@ -39,7 +39,7 @@ spec:
3939
command:
4040
- "/bin/bash"
4141
- "-c"
42-
image: cmk:v1.4.1
42+
image: cmk:v1.5.1
4343
name: cmk-webhook
4444
volumeMounts:
4545
- mountPath: /etc/webhook

tests/integration/test_cmk_help.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def test_cmk_help():
6666
--cmk-cmd-list=<list> Comma seperated list of CMK sub-commands to run
6767
on each host
6868
[default: init,reconcile,install,discover,nodereport].
69-
--cmk-img=<img> CMK Docker image [default: cmk:v1.4.1].
69+
--cmk-img=<img> CMK Docker image [default: cmk:v1.5.1].
7070
--cmk-img-pol=<pol> Image pull policy for the CMK Docker image
7171
[default: IfNotPresent].
7272
--install-dir=<dir> CMK install directory [default: /opt/bin].

tests/unit/test_reconfigure_setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def test_execute_reconfigure_failure1(caplog):
9999
with pytest.raises(SystemExit) as err:
100100
reconfigure_setup.execute_reconfigure(2, 2, "-1",
101101
"packed", "packed",
102-
"cmk:v1.4.1", "IfNotPresent",
102+
"cmk:v1.5.1", "IfNotPresent",
103103
"/opt/bin", node_list,
104104
"fake-saname",
105105
"fake-namespace")
@@ -121,7 +121,7 @@ def test_execute_reconfigure_failure2(caplog):
121121
with pytest.raises(SystemExit) as err:
122122
reconfigure_setup.execute_reconfigure(2, 2, "-1",
123123
"packed", "packed",
124-
"cmk:v1.4.1", "IfNotPresent",
124+
"cmk:v1.5.1", "IfNotPresent",
125125
"/opt/bin", node_list,
126126
"fake-saname",
127127
"fake-namespace")

0 commit comments

Comments
 (0)