From be242a3c3c9de1968698d555e3fcf9465c54fdb5 Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Fri, 16 Sep 2022 03:53:43 +0000 Subject: [PATCH 1/2] release: Adapt kata-deploy for 3.0.0-rc0 kata-deploy files must be adapted to a new release. The cases where it happens are when the release goes from -> to: * main -> stable: * kata-deploy-stable / kata-cleanup-stable: are removed * stable -> stable: * kata-deploy / kata-cleanup: bump the release to the new one. There are no changes when doing an alpha release, as the files on the "main" branch always point to the "latest" and "stable" tags. Signed-off-by: Peng Tao --- .../base/kata-cleanup-stable.yaml | 46 ------------- .../kata-deploy/base/kata-deploy-stable.yaml | 69 ------------------- 2 files changed, 115 deletions(-) delete mode 100644 tools/packaging/kata-deploy/kata-cleanup/base/kata-cleanup-stable.yaml delete mode 100644 tools/packaging/kata-deploy/kata-deploy/base/kata-deploy-stable.yaml diff --git a/tools/packaging/kata-deploy/kata-cleanup/base/kata-cleanup-stable.yaml b/tools/packaging/kata-deploy/kata-cleanup/base/kata-cleanup-stable.yaml deleted file mode 100644 index f1d9d0a2f9..0000000000 --- a/tools/packaging/kata-deploy/kata-cleanup/base/kata-cleanup-stable.yaml +++ /dev/null @@ -1,46 +0,0 @@ ---- -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: kubelet-kata-cleanup - namespace: kube-system -spec: - selector: - matchLabels: - name: kubelet-kata-cleanup - template: - metadata: - labels: - name: kubelet-kata-cleanup - spec: - serviceAccountName: kata-label-node - nodeSelector: - katacontainers.io/kata-runtime: cleanup - containers: - - name: kube-kata-cleanup - image: quay.io/kata-containers/kata-deploy:stable - imagePullPolicy: Always - command: [ "bash", "-c", "/opt/kata-artifacts/scripts/kata-deploy.sh reset" ] - env: - - name: NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - securityContext: - privileged: false - volumeMounts: - - name: dbus - mountPath: /var/run/dbus - - name: systemd - mountPath: /run/systemd - volumes: - - name: dbus - hostPath: - path: /var/run/dbus - - name: systemd - hostPath: - path: /run/systemd - updateStrategy: - rollingUpdate: - maxUnavailable: 1 - type: RollingUpdate diff --git a/tools/packaging/kata-deploy/kata-deploy/base/kata-deploy-stable.yaml b/tools/packaging/kata-deploy/kata-deploy/base/kata-deploy-stable.yaml deleted file mode 100644 index 346e4c0ee2..0000000000 --- a/tools/packaging/kata-deploy/kata-deploy/base/kata-deploy-stable.yaml +++ /dev/null @@ -1,69 +0,0 @@ ---- -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: kata-deploy - namespace: kube-system -spec: - selector: - matchLabels: - name: kata-deploy - template: - metadata: - labels: - name: kata-deploy - spec: - serviceAccountName: kata-label-node - containers: - - name: kube-kata - image: quay.io/kata-containers/kata-deploy:stable - imagePullPolicy: Always - lifecycle: - preStop: - exec: - command: ["bash", "-c", "/opt/kata-artifacts/scripts/kata-deploy.sh cleanup"] - command: [ "bash", "-c", "/opt/kata-artifacts/scripts/kata-deploy.sh install" ] - env: - - name: NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - securityContext: - privileged: false - volumeMounts: - - name: crio-conf - mountPath: /etc/crio/ - - name: containerd-conf - mountPath: /etc/containerd/ - - name: kata-artifacts - mountPath: /opt/kata/ - - name: dbus - mountPath: /var/run/dbus - - name: systemd - mountPath: /run/systemd - - name: local-bin - mountPath: /usr/local/bin/ - volumes: - - name: crio-conf - hostPath: - path: /etc/crio/ - - name: containerd-conf - hostPath: - path: /etc/containerd/ - - name: kata-artifacts - hostPath: - path: /opt/kata/ - type: DirectoryOrCreate - - name: dbus - hostPath: - path: /var/run/dbus - - name: systemd - hostPath: - path: /run/systemd - - name: local-bin - hostPath: - path: /usr/local/bin/ - updateStrategy: - rollingUpdate: - maxUnavailable: 1 - type: RollingUpdate From 583591099d2c6e4696efac59e38d0bf0c122438a Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Fri, 16 Sep 2022 03:53:44 +0000 Subject: [PATCH 2/2] release: Kata Containers 3.0.0-rc0 - runtime-rs: delete some allow(dead_code) attributes - kata-types: don't check virtio_fs_daemon for inline-virtio-fs - kata-types: change return type of getting CPU period/quota function - runtime-rs: fix host device check pattern - runtime-rs: remove meaningless comment - runtime-rs: update rust runtime roadmap - runk: Enable seccomp support by default - config: add "inline-virtio-fs" as a "shared_fs" type - runtime-rs: add README.md - runk: Refactor container builder - kernel: fix kernel tarball name for SEV - libs/kata-types: replace tabs by spaces in comments - gperf: point URL to mirror site be242a3c3 release: Adapt kata-deploy for 3.0.0-rc0 156e1c324 runtime-rs: delete some allow(dead_code) attributes 62cf6e6fc runtime-rs: remove meaningless comment bcf6bf843 runk: Enable seccomp support by default 2b1d05857 runtime-rs: fix host device check pattern 85b49cee0 runtime-rs: add README.md 36d805fab config: add "inline-virtio-fs" as a "shared_fs" type b948a8ffe kernel: fix kernel tarball name for SEV 50f912615 libs/kata-types: replace tabs by spaces in comments 96c8be715 libs/kata-types: change return type of getting CPU period/quota fc9c6f87a kata-types: don't check virtio_fs_daemon for inline-virtio-fs 968c2f6e8 runk: Refactor container builder 84268f871 runtime-rs: update rust runtime roadmap 566656b08 gperf: point URL to mirror site Signed-off-by: Peng Tao --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index df7f8449cf..e3311eab40 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.0-alpha1 +3.0.0-rc0