From cbdf579ad092e4768cb79c0d831fe8548ae975cb Mon Sep 17 00:00:00 2001 From: Denis Romanenko Date: Mon, 15 Aug 2022 15:20:42 +0300 Subject: [PATCH 1/8] [candi] migrate to containerd 1.6 Signed-off-by: Denis Romanenko --- .../node-group/031_install_containerd.sh.tpl | 17 +------ .../node-group/031_install_containerd.sh.tpl | 17 +------ .../node-group/031_install_containerd.sh.tpl | 17 +------ .../032_remove_containerd_fe.sh.tpl | 13 +++-- candi/version_map.yml | 34 ++++++------- .../images/containerd-fe/scripts/uninstall | 17 ------- .../images/containerd-fe/werf.inc.yaml | 48 ------------------- 7 files changed, 30 insertions(+), 133 deletions(-) rename modules/007-registrypackages/images/containerd-fe/scripts/install => candi/bashible/common-steps/node-group/032_remove_containerd_fe.sh.tpl (56%) mode change 100755 => 100644 delete mode 100755 modules/007-registrypackages/images/containerd-fe/scripts/uninstall delete mode 100644 modules/007-registrypackages/images/containerd-fe/werf.inc.yaml diff --git a/candi/bashible/bundles/centos/node-group/031_install_containerd.sh.tpl b/candi/bashible/bundles/centos/node-group/031_install_containerd.sh.tpl index 5257a6e9c2e..75b124cc7ca 100644 --- a/candi/bashible/bundles/centos/node-group/031_install_containerd.sh.tpl +++ b/candi/bashible/bundles/centos/node-group/031_install_containerd.sh.tpl @@ -1,4 +1,4 @@ -# Copyright 2021 Flant JSC +# Copyright 2022 Flant JSC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -84,19 +84,4 @@ if [[ "$should_install_containerd" == true ]]; then bb-rp-install "containerd-io:${containerd_tag}" "crictl:${crictl_tag}" fi - -# Upgrade containerd-flant-edition if needed -containerd_fe_tag="{{ index .images.registrypackages "containerdFe1511" | toString }}" -if ! bb-rp-is-installed? "containerd-flant-edition" "${containerd_fe_tag}" ; then - systemctl stop containerd.service - bb-rp-install "containerd-flant-edition:${containerd_fe_tag}" - - mkdir -p /etc/systemd/system/containerd.service.d - bb-sync-file /etc/systemd/system/containerd.service.d/override.conf - << EOF -[Service] -ExecStart= -ExecStart=-/usr/local/bin/containerd -EOF -fi - {{- end }} diff --git a/candi/bashible/bundles/debian/node-group/031_install_containerd.sh.tpl b/candi/bashible/bundles/debian/node-group/031_install_containerd.sh.tpl index 9e844afb460..9eae0a7e595 100644 --- a/candi/bashible/bundles/debian/node-group/031_install_containerd.sh.tpl +++ b/candi/bashible/bundles/debian/node-group/031_install_containerd.sh.tpl @@ -1,4 +1,4 @@ -# Copyright 2021 Flant JSC +# Copyright 2022 Flant JSC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -91,19 +91,4 @@ containerd_tag="{{- index $.images.registrypackages (printf "containerdDebian%sB bb-rp-install "containerd-io:${containerd_tag}" "crictl:${crictl_tag}" fi - -# Upgrade containerd-flant-edition if needed -containerd_fe_tag="{{ index .images.registrypackages "containerdFe1511" | toString }}" -if ! bb-rp-is-installed? "containerd-flant-edition" "${containerd_fe_tag}" ; then - systemctl stop containerd.service - bb-rp-install "containerd-flant-edition:${containerd_fe_tag}" - - mkdir -p /etc/systemd/system/containerd.service.d - bb-sync-file /etc/systemd/system/containerd.service.d/override.conf - << EOF -[Service] -ExecStart= -ExecStart=-/usr/local/bin/containerd -EOF -fi - {{- end }} diff --git a/candi/bashible/bundles/ubuntu-lts/node-group/031_install_containerd.sh.tpl b/candi/bashible/bundles/ubuntu-lts/node-group/031_install_containerd.sh.tpl index 57f6c5156d0..14f78cb24aa 100644 --- a/candi/bashible/bundles/ubuntu-lts/node-group/031_install_containerd.sh.tpl +++ b/candi/bashible/bundles/ubuntu-lts/node-group/031_install_containerd.sh.tpl @@ -1,4 +1,4 @@ -# Copyright 2021 Flant JSC +# Copyright 2022 Flant JSC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -85,19 +85,4 @@ if [[ "$should_install_containerd" == true ]]; then bb-rp-install "containerd-io:${containerd_tag}" "crictl:${crictl_tag}" fi - -# Upgrade containerd-flant-edition if needed -containerd_fe_tag="{{ index .images.registrypackages "containerdFe1511" | toString }}" -if ! bb-rp-is-installed? "containerd-flant-edition" "${containerd_fe_tag}" ; then - systemctl stop containerd.service - bb-rp-install "containerd-flant-edition:${containerd_fe_tag}" - - mkdir -p /etc/systemd/system/containerd.service.d - bb-sync-file /etc/systemd/system/containerd.service.d/override.conf - << EOF -[Service] -ExecStart= -ExecStart=-/usr/local/bin/containerd -EOF -fi - {{- end }} diff --git a/modules/007-registrypackages/images/containerd-fe/scripts/install b/candi/bashible/common-steps/node-group/032_remove_containerd_fe.sh.tpl old mode 100755 new mode 100644 similarity index 56% rename from modules/007-registrypackages/images/containerd-fe/scripts/install rename to candi/bashible/common-steps/node-group/032_remove_containerd_fe.sh.tpl index fa119a34436..0440c2cca2c --- a/modules/007-registrypackages/images/containerd-fe/scripts/install +++ b/candi/bashible/common-steps/node-group/032_remove_containerd_fe.sh.tpl @@ -1,4 +1,3 @@ -#!/bin/bash # Copyright 2021 Flant JSC # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,5 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -set -Eeo pipefail -cp containerd /usr/local/bin +# TODO remove on next release !!! + +{{- if eq .cri "Containerd" }} +# Upgrade containerd-flant-edition if needed +if [[ -f /etc/systemd/system/containerd.service.d/override.conf ]]; then + rm -rf /usr/local/bin/containerd ${BB_RP_INSTALLED_PACKAGES_STORE}/containerd-fe ${BB_RP_INSTALLED_PACKAGES_STORE}/containerd-flant-edition /etc/systemd/system/containerd.service.d + systemctl daemon-reload + systemctl restart containerd.service +fi +{{- end }} diff --git a/candi/version_map.yml b/candi/version_map.yml index a5ce481cd95..822aff7096c 100644 --- a/candi/version_map.yml +++ b/candi/version_map.yml @@ -22,8 +22,8 @@ bashible: &bashible desiredVersion: "containerd.io=1.4.6-1" allowedPattern: "containerd.io=1.[234]" containerd: - desiredVersion: "containerd.io=1.5.11-1" - allowedPattern: "containerd.io=1.[56]" + desiredVersion: "containerd.io=1.6.7-1" + allowedPattern: "containerd.io=1.[6]" kernel: generic: desiredVersion: "5.3.0-51-generic" @@ -45,8 +45,8 @@ bashible: &bashible desiredVersion: "containerd.io=1.4.6-1" allowedPattern: "containerd.io=1.[234]" containerd: - desiredVersion: "containerd.io=1.5.11-1" - allowedPattern: "containerd.io=1.[56]" + desiredVersion: "containerd.io=1.6.7-1" + allowedPattern: "containerd.io=1.[6]" kernel: generic: desiredVersion: "5.4.0-54-generic" @@ -65,11 +65,11 @@ bashible: &bashible desiredVersion: "docker-ce=5:20.10.14~3-0~ubuntu-jammy" allowedPattern: "" containerd: - desiredVersion: "containerd.io=1.5.11-1" + desiredVersion: "containerd.io=1.6.7-1" allowedPattern: "containerd.io=1.[56]" containerd: - desiredVersion: "containerd.io=1.5.11-1" - allowedPattern: "containerd.io=1.[56]" + desiredVersion: "containerd.io=1.6.7-1" + allowedPattern: "containerd.io=1.[6]" kernel: generic: desiredVersion: "5.15.0-27-generic" @@ -106,8 +106,8 @@ bashible: &bashible desiredVersion: "containerd.io=1.4.6-1" allowedPattern: "containerd.io=1.[234]" containerd: - desiredVersion: "containerd.io=1.5.11-1" - allowedPattern: "containerd.io=1.[56]" + desiredVersion: "containerd.io=1.6.7-1" + allowedPattern: "containerd.io=1.[6]" kernel: generic: desiredVersion: "4.19.0-18-amd64" @@ -120,8 +120,8 @@ bashible: &bashible desiredVersion: "containerd.io=1.4.6-1" allowedPattern: "containerd.io=1.[234]" containerd: - desiredVersion: "containerd.io=1.5.11-1" - allowedPattern: "containerd.io=1.[56]" + desiredVersion: "containerd.io=1.6.7-1" + allowedPattern: "containerd.io=1.[6]" kernel: generic: desiredVersion: "5.10.0-10-amd64" @@ -135,8 +135,8 @@ bashible: &bashible desiredVersion: "containerd.io-1.4.6-3.1.el7.x86_64" allowedPattern: "containerd.io-1.[1234]" containerd: - desiredVersion: "containerd.io-1.5.11-3.1.el7.x86_64" - allowedPattern: "containerd.io-1.[56]" + desiredVersion: "containerd.io-1.6.7-3.1.el7.x86_64" + allowedPattern: "containerd.io-1.[6]" kernel: generic: desiredVersion: "3.10.0-1127.el7.x86_64" @@ -149,8 +149,8 @@ bashible: &bashible desiredVersion: "containerd.io-1.4.6-3.1.el8.x86_64" allowedPattern: "containerd.io-1.[1234]" containerd: - desiredVersion: "containerd.io-1.5.11-3.1.el8.x86_64" - allowedPattern: "containerd.io-1.[56]" + desiredVersion: "containerd.io-1.6.7-3.1.el8.x86_64" + allowedPattern: "containerd.io-1.[6]" kernel: generic: desiredVersion: "4.18.0-305.3.1.el8.x86_64" @@ -172,8 +172,8 @@ k8s: desiredVersion: "containerd.io=1.4.6-1" allowedPattern: "containerd.io=1.[234]" containerd: - desiredVersion: "containerd.io=1.5.11-1" - allowedPattern: "containerd.io=1.[56]" + desiredVersion: "containerd.io=1.6.7-1" + allowedPattern: "containerd.io=1.[6]" kernel: generic: desiredVersion: "5.3.0-51-generic" diff --git a/modules/007-registrypackages/images/containerd-fe/scripts/uninstall b/modules/007-registrypackages/images/containerd-fe/scripts/uninstall deleted file mode 100755 index acde07f92eb..00000000000 --- a/modules/007-registrypackages/images/containerd-fe/scripts/uninstall +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -# Copyright 2021 Flant JSC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -Eeo pipefail -rm -f /usr/local/bin/containerd diff --git a/modules/007-registrypackages/images/containerd-fe/werf.inc.yaml b/modules/007-registrypackages/images/containerd-fe/werf.inc.yaml deleted file mode 100644 index 755783af8c3..00000000000 --- a/modules/007-registrypackages/images/containerd-fe/werf.inc.yaml +++ /dev/null @@ -1,48 +0,0 @@ -{{- $version := "1.5.11" }} -{{- $image_version := $version | replace "." "-" }} - ---- -image: {{ $.ModuleName }}/{{ $.ImageName }}-{{ $image_version }} -from: {{ $.Images.BASE_SCRATCH }} -import: -- artifact: {{ $.ModuleName }}/{{ $.ImageName }}-artifact-{{ $image_version }} - add: / - to: / - includePaths: - - containerd - - install - - uninstall - before: setup -docker: - LABEL: - distro: all - version: all - containerd: {{ $version }} ---- -artifact: {{ $.ModuleName }}/{{ $.ImageName }}-artifact-{{ $image_version }} -from: {{ $.Images.BASE_GOLANG_16_BUSTER }} -git: -- add: /modules/007-{{ $.ModuleName }}/images/{{ $.ImageName }}/scripts - to: / - stageDependencies: - setup: - - '**/*' -mount: -- fromPath: ~/go-pkg-cache - to: /go/pkg -shell: - beforeInstall: - - apt-get update - - apt-get install -y patch libbtrfs-dev - install: - - mkdir -p /src - - cd /src - - git clone https://github.com/containerd/containerd.git - - cd containerd - - git checkout tags/v{{ $version }} - - git config --global user.email "builder@deckhouse.io" - - git cherry-pick 5f3ce9512b74718ac9519196ba70dfb1ee075fbe # Do not append []string{""} to command to preserve Docker and Werf compatibility - - make bin/containerd - - mv bin/containerd /containerd - setup: - - chmod +x /containerd /install /uninstall From 1e6b4f5307091abd9914da30e8f545cf24101e68 Mon Sep 17 00:00:00 2001 From: Denis Romanenko Date: Mon, 15 Aug 2022 17:45:18 +0300 Subject: [PATCH 2/8] [candi] migrate to containerd 1.6 Signed-off-by: Denis Romanenko --- .../bundles/debian/all/001_install_mandatory_packages.sh.tpl | 2 +- .../ubuntu-lts/all/001_install_mandatory_packages.sh.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/candi/bashible/bundles/debian/all/001_install_mandatory_packages.sh.tpl b/candi/bashible/bundles/debian/all/001_install_mandatory_packages.sh.tpl index cf8cf1f8974..a51be6e15fb 100644 --- a/candi/bashible/bundles/debian/all/001_install_mandatory_packages.sh.tpl +++ b/candi/bashible/bundles/debian/all/001_install_mandatory_packages.sh.tpl @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -SYSTEM_PACKAGES="curl wget inotify-tools bash-completion lvm2 parted apt-transport-https sudo nfs-common vim" +SYSTEM_PACKAGES="curl wget inotify-tools bash-completion lvm2 parted apt-transport-https sudo nfs-common vim libseccomp2" KUBERNETES_DEPENDENCIES="iptables iproute2 socat util-linux mount ebtables ethtool" if bb-is-debian-version? 9 || bb-is-debian-version? 10 || bb-is-debian-version? 11; then diff --git a/candi/bashible/bundles/ubuntu-lts/all/001_install_mandatory_packages.sh.tpl b/candi/bashible/bundles/ubuntu-lts/all/001_install_mandatory_packages.sh.tpl index cfa97fd2dc6..24f15883292 100644 --- a/candi/bashible/bundles/ubuntu-lts/all/001_install_mandatory_packages.sh.tpl +++ b/candi/bashible/bundles/ubuntu-lts/all/001_install_mandatory_packages.sh.tpl @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -SYSTEM_PACKAGES="curl wget virt-what inotify-tools bash-completion lvm2 parted apt-transport-https sudo nfs-common" +SYSTEM_PACKAGES="curl wget virt-what inotify-tools bash-completion lvm2 parted apt-transport-https sudo nfs-common libseccomp2" KUBERNETES_DEPENDENCIES="iptables iproute2 socat util-linux mount ebtables ethtool conntrack" bb-apt-install ${SYSTEM_PACKAGES} ${KUBERNETES_DEPENDENCIES} From 0f53a53779bf6461d511c6716b981b30198b3cf9 Mon Sep 17 00:00:00 2001 From: Denis Romanenko Date: Mon, 15 Aug 2022 18:43:20 +0300 Subject: [PATCH 3/8] [candi] migrate to containerd 1.6 Signed-off-by: Denis Romanenko --- .../debian/all/001_install_mandatory_packages.sh.tpl | 2 +- .../ubuntu-lts/all/001_install_mandatory_packages.sh.tpl | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/candi/bashible/bundles/debian/all/001_install_mandatory_packages.sh.tpl b/candi/bashible/bundles/debian/all/001_install_mandatory_packages.sh.tpl index a51be6e15fb..e5c40df1a54 100644 --- a/candi/bashible/bundles/debian/all/001_install_mandatory_packages.sh.tpl +++ b/candi/bashible/bundles/debian/all/001_install_mandatory_packages.sh.tpl @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - +# libseccomp - containerd.io dependencies SYSTEM_PACKAGES="curl wget inotify-tools bash-completion lvm2 parted apt-transport-https sudo nfs-common vim libseccomp2" KUBERNETES_DEPENDENCIES="iptables iproute2 socat util-linux mount ebtables ethtool" diff --git a/candi/bashible/bundles/ubuntu-lts/all/001_install_mandatory_packages.sh.tpl b/candi/bashible/bundles/ubuntu-lts/all/001_install_mandatory_packages.sh.tpl index 24f15883292..5a05d44f55c 100644 --- a/candi/bashible/bundles/ubuntu-lts/all/001_install_mandatory_packages.sh.tpl +++ b/candi/bashible/bundles/ubuntu-lts/all/001_install_mandatory_packages.sh.tpl @@ -11,10 +11,15 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - +# libseccomp - containerd.io dependencies SYSTEM_PACKAGES="curl wget virt-what inotify-tools bash-completion lvm2 parted apt-transport-https sudo nfs-common libseccomp2" KUBERNETES_DEPENDENCIES="iptables iproute2 socat util-linux mount ebtables ethtool conntrack" bb-apt-install ${SYSTEM_PACKAGES} ${KUBERNETES_DEPENDENCIES} bb-rp-install "jq:{{ .images.registrypackages.jq16 }}" "curl:{{ .images.registrypackages.d8Curl7800 }}" + +# containerd 1.6.7 requires libseccomp version >= 2.5.0 +if bb-is-ubuntu-version? 18.04; then + bb-apt-install --force libseccomp2 +fi From fb0294c9a3ccbec3936c82d323c5301ab03bb533 Mon Sep 17 00:00:00 2001 From: Denis Romanenko Date: Mon, 15 Aug 2022 20:34:22 +0300 Subject: [PATCH 4/8] [candi] migrate to containerd 1.6 Signed-off-by: Denis Romanenko --- .../ubuntu-lts/all/001_install_mandatory_packages.sh.tpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/candi/bashible/bundles/ubuntu-lts/all/001_install_mandatory_packages.sh.tpl b/candi/bashible/bundles/ubuntu-lts/all/001_install_mandatory_packages.sh.tpl index 5a05d44f55c..59432042931 100644 --- a/candi/bashible/bundles/ubuntu-lts/all/001_install_mandatory_packages.sh.tpl +++ b/candi/bashible/bundles/ubuntu-lts/all/001_install_mandatory_packages.sh.tpl @@ -20,6 +20,7 @@ bb-apt-install ${SYSTEM_PACKAGES} ${KUBERNETES_DEPENDENCIES} bb-rp-install "jq:{{ .images.registrypackages.jq16 }}" "curl:{{ .images.registrypackages.d8Curl7800 }}" # containerd 1.6.7 requires libseccomp version >= 2.5.0 -if bb-is-ubuntu-version? 18.04; then +libseccomp_version="$(dpkg-query --show --showformat '${Version}' libseccomp2)" +if dpkg --compare-versions ${libseccomp_version} lt 2.5; then bb-apt-install --force libseccomp2 fi From 1c1c860c9d3a8e881c39678d5f52a1d62e027197 Mon Sep 17 00:00:00 2001 From: Denis Romanenko Date: Mon, 15 Aug 2022 22:08:44 +0300 Subject: [PATCH 5/8] [candi] migrate to containerd 1.6 Signed-off-by: Denis Romanenko --- .../debian/all/001_install_mandatory_packages.sh.tpl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/candi/bashible/bundles/debian/all/001_install_mandatory_packages.sh.tpl b/candi/bashible/bundles/debian/all/001_install_mandatory_packages.sh.tpl index e5c40df1a54..38cf08ca446 100644 --- a/candi/bashible/bundles/debian/all/001_install_mandatory_packages.sh.tpl +++ b/candi/bashible/bundles/debian/all/001_install_mandatory_packages.sh.tpl @@ -1,4 +1,4 @@ -# Copyright 2021 Flant JSC +# Copyright 2022 Flant JSC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -25,3 +25,9 @@ fi bb-apt-install ${SYSTEM_PACKAGES} ${KUBERNETES_DEPENDENCIES} bb-rp-install "jq:{{ .images.registrypackages.jq16 }}" "curl:{{ .images.registrypackages.d8Curl7800 }}" + +# containerd 1.6.7 requires libseccomp version >= 2.5.0 +libseccomp_version="$(dpkg-query --show --showformat '${Version}' libseccomp2)" +if dpkg --compare-versions ${libseccomp_version} lt 2.5; then + bb-apt-install --force libseccomp2 +fi From 1bc13343ab74adeee386f358a26297b75cd8af00 Mon Sep 17 00:00:00 2001 From: Denis Romanenko Date: Tue, 16 Aug 2022 07:04:50 +0300 Subject: [PATCH 6/8] ++ Signed-off-by: Denis Romanenko --- .../common-steps/node-group/032_remove_containerd_fe.sh.tpl | 1 - 1 file changed, 1 deletion(-) diff --git a/candi/bashible/common-steps/node-group/032_remove_containerd_fe.sh.tpl b/candi/bashible/common-steps/node-group/032_remove_containerd_fe.sh.tpl index 0440c2cca2c..076e270bb97 100644 --- a/candi/bashible/common-steps/node-group/032_remove_containerd_fe.sh.tpl +++ b/candi/bashible/common-steps/node-group/032_remove_containerd_fe.sh.tpl @@ -15,7 +15,6 @@ # TODO remove on next release !!! {{- if eq .cri "Containerd" }} -# Upgrade containerd-flant-edition if needed if [[ -f /etc/systemd/system/containerd.service.d/override.conf ]]; then rm -rf /usr/local/bin/containerd ${BB_RP_INSTALLED_PACKAGES_STORE}/containerd-fe ${BB_RP_INSTALLED_PACKAGES_STORE}/containerd-flant-edition /etc/systemd/system/containerd.service.d systemctl daemon-reload From ecf85227db8b89628a336e2fa80873258d4cf754 Mon Sep 17 00:00:00 2001 From: Denis Romanenko Date: Tue, 16 Aug 2022 16:07:32 +0300 Subject: [PATCH 7/8] ++ Signed-off-by: Denis Romanenko --- .../bundles/centos/node-group/031_install_containerd.sh.tpl | 2 +- .../bundles/debian/node-group/031_install_containerd.sh.tpl | 2 +- .../bundles/ubuntu-lts/node-group/031_install_containerd.sh.tpl | 2 +- .../common-steps/node-group/032_remove_containerd_fe.sh.tpl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/candi/bashible/bundles/centos/node-group/031_install_containerd.sh.tpl b/candi/bashible/bundles/centos/node-group/031_install_containerd.sh.tpl index 75b124cc7ca..390d17aa993 100644 --- a/candi/bashible/bundles/centos/node-group/031_install_containerd.sh.tpl +++ b/candi/bashible/bundles/centos/node-group/031_install_containerd.sh.tpl @@ -1,4 +1,4 @@ -# Copyright 2022 Flant JSC +# Copyright 2021 Flant JSC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/candi/bashible/bundles/debian/node-group/031_install_containerd.sh.tpl b/candi/bashible/bundles/debian/node-group/031_install_containerd.sh.tpl index 9eae0a7e595..c3401a24d25 100644 --- a/candi/bashible/bundles/debian/node-group/031_install_containerd.sh.tpl +++ b/candi/bashible/bundles/debian/node-group/031_install_containerd.sh.tpl @@ -1,4 +1,4 @@ -# Copyright 2022 Flant JSC +# Copyright 2021 Flant JSC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/candi/bashible/bundles/ubuntu-lts/node-group/031_install_containerd.sh.tpl b/candi/bashible/bundles/ubuntu-lts/node-group/031_install_containerd.sh.tpl index 14f78cb24aa..c77b3302806 100644 --- a/candi/bashible/bundles/ubuntu-lts/node-group/031_install_containerd.sh.tpl +++ b/candi/bashible/bundles/ubuntu-lts/node-group/031_install_containerd.sh.tpl @@ -1,4 +1,4 @@ -# Copyright 2022 Flant JSC +# Copyright 2021 Flant JSC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/candi/bashible/common-steps/node-group/032_remove_containerd_fe.sh.tpl b/candi/bashible/common-steps/node-group/032_remove_containerd_fe.sh.tpl index 076e270bb97..0aa92b6aa40 100644 --- a/candi/bashible/common-steps/node-group/032_remove_containerd_fe.sh.tpl +++ b/candi/bashible/common-steps/node-group/032_remove_containerd_fe.sh.tpl @@ -1,4 +1,4 @@ -# Copyright 2021 Flant JSC +# Copyright 2022 Flant JSC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. From fc69421f676dd76b9e8670f8be9758a18938b1b3 Mon Sep 17 00:00:00 2001 From: Denis Romanenko Date: Tue, 16 Aug 2022 16:13:42 +0300 Subject: [PATCH 8/8] ++ Signed-off-by: Denis Romanenko --- .../bundles/debian/all/001_install_mandatory_packages.sh.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/candi/bashible/bundles/debian/all/001_install_mandatory_packages.sh.tpl b/candi/bashible/bundles/debian/all/001_install_mandatory_packages.sh.tpl index 38cf08ca446..f942e6ca302 100644 --- a/candi/bashible/bundles/debian/all/001_install_mandatory_packages.sh.tpl +++ b/candi/bashible/bundles/debian/all/001_install_mandatory_packages.sh.tpl @@ -1,4 +1,4 @@ -# Copyright 2022 Flant JSC +# Copyright 2021 Flant JSC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License.