diff --git a/documentation/Installation.md b/documentation/Installation.md index 2526482d3..a9450fdfe 100644 --- a/documentation/Installation.md +++ b/documentation/Installation.md @@ -6668,23 +6668,23 @@ The tables below shows the correspondence of versions that are supported and is | | kubernetesui/metrics-scraper | v1.0.8 | v1.0.8 | v1.0.8 | v1.0.8 | v1.0.8 | v1.0.8 | v1.0.8 | Required only if Kubernetes Dashboard plugin is set to be installed. | | | rancher/local-path-provisioner | v0.0.26 | v0.0.26 | v0.0.26 | v0.0.26 | v0.0.26 | v0.0.26 | v0.0.26 | Required only if local-path provisioner plugin is set to be installed. | -## Default Dependent Components Versions for Kubernetes Versions v1.30.0 +## Default Dependent Components Versions for Kubernetes Versions v1.30.1 | Type | Name | Versions | | | | | | | Note | |----------|----------------------------------------------------------------|------------------|------------------------------|--------------|--------------|-------------------|-----------|-----------|------------------------------------------------------------------------------------------------------------| | | | CentOS RHEL 7.5+ | CentOS RHEL Oracle Linux 8.4 | Ubuntu 20.04 | Ubuntu 22.04 | Oracle Linux 7.5+ | RHEL 8.6+ | RockyLinux 8.6+ | | -| binaries | kubeadm | v1.30.0 | v1.30.0 | v1.30.0 | v1.30.0 | v1.30.0 | v1.30.0 | v1.30.0 | SHA1: 8c8944db422c756914ee3e3a6351a04849123da5 | -| | kubelet | v1.30.0 | v1.30.0 | v1.30.0 | v1.30.0 | v1.30.0 | v1.30.0 | v1.30.0 | SHA1: e737859916420af8163c73cc337ccda7b06dffcd | -| | kubectl | v1.30.0 | v1.30.0 | v1.30.0 | v1.30.0 | v1.30.0 | v1.30.0 | v1.30.0 | SHA1: 1ae127a1e41446d282e9d339468eded4b9fed80c | +| binaries | kubeadm | v1.30.1 | v1.30.1 | v1.30.1 | v1.30.1 | v1.30.1 | v1.30.1 | v1.30.1 | SHA1: 85385f4b78b79bd1cd4d1ad5244422d372d5f758 | +| | kubelet | v1.30.1 | v1.30.1 | v1.30.1 | v1.30.1 | v1.30.1 | v1.30.1 | v1.30.1 | SHA1: c62da6ab918b8e56d7c9b77e642ffc73ffdbffac | +| | kubectl | v1.30.1 | v1.30.1 | v1.30.1 | v1.30.1 | v1.30.1 | v1.30.1 | v1.30.1 | SHA1: bced94239f1dbdb04d3a661a067bf9587865b6e8 | | | calicoctl | v3.27.0 | v3.27.0 | v3.27.0 | v3.27.0 | v3.27.0 | v3.27.0 | v3.27.0 | SHA1: 4d62cba82a4aee97ab20b96e7270da85d77ce20e Required only if calico is installed. | | | crictl | v1.29.0 | v1.29.0 | v1.29.0 | v1.29.0 | v1.29.0 | v1.29.0 | v1.29.0 | SHA1: c4224ed25f729dbf73976198c8bc73dec0bf5a5f Required only if containerd is used as a container runtime. | | rpms | docker-ce | 19.03 | 19.03 | 20.10 | 20.10 | 19.03 | 19.03 | 19.03 | | | | containerd.io | 1.6.* | 1.6.* | 1.6.* | 1.6.* | 1.6.* | 1.6.* | 1.6.* | | | | haproxy/rh-haproxy | 1.8 | 1.8 | 2.* | 2.* | 1.8 | 1.8 | 1.8 | Required only if balancers are presented in the deployment scheme. | | | keepalived | 1.3 | 2.1 | 2.* | 2.* | 1.3 | 2.1 | 2.1 | Required only if VRRP is presented in the deployment scheme. | -| images | registry.k8s.io/kube-apiserver | v1.30.0 | v1.30.0 | v1.30.0 | v1.30.0 | v1.30.0 | v1.30.0 | v1.30.0 | | -| | registry.k8s.io/kube-controller-manager | v1.30.0 | v1.30.0 | v1.30.0 | v1.30.0 | v1.30.0 | v1.30.0 | v1.30.0 | | -| | registry.k8s.io/kube-proxy | v1.30.0 | v1.30.0 | v1.30.0 | v1.30.0 | v1.30.0 | v1.30.0 | v1.30.0 | | -| | registry.k8s.io/kube-scheduler | v1.30.0 | v1.30.0 | v1.30.0 | v1.30.0 | v1.30.0 | v1.30.0 | v1.30.0 | | +| images | registry.k8s.io/kube-apiserver | v1.30.1 | v1.30.1 | v1.30.1 | v1.30.1 | v1.30.1 | v1.30.1 | v1.30.1 | | +| | registry.k8s.io/kube-controller-manager | v1.30.1 | v1.30.1 | v1.30.1 | v1.30.1 | v1.30.1 | v1.30.1 | v1.30.1 | | +| | registry.k8s.io/kube-proxy | v1.30.1 | v1.30.1 | v1.30.1 | v1.30.1 | v1.30.1 | v1.30.1 | v1.30.1 | | +| | registry.k8s.io/kube-scheduler | v1.30.1 | v1.30.1 | v1.30.1 | v1.30.1 | v1.30.1 | v1.30.1 | v1.30.1 | | | | registry.k8s.io/coredns | v1.11.1 | v1.11.1 | v1.11.1 | v1.11.1 | v1.11.1 | v1.11.1 | v1.11.1 | | | | registry.k8s.io/pause | 3.9 | 3.9 | 3.9 | 3.9 | 3.9 | 3.9 | 3.9 | | | | registry.k8s.io/etcd | 3.5.12-0 | 3.5.12-0 | 3.5.12-0 | 3.5.12-0 | 3.5.12-0 | 3.5.12-0 | 3.5.12-0 | | diff --git a/kubemarine/procedures/backup.py b/kubemarine/procedures/backup.py index 648f0fa70..b27560767 100755 --- a/kubemarine/procedures/backup.py +++ b/kubemarine/procedures/backup.py @@ -410,13 +410,18 @@ def _handle(self, payload: ParserPayload) -> None: items_by_resource: Dict[str, List[str]] = {} def append_item(api_version: str, kind: str, item: str) -> None: - resource_name = next( + resource_name = next(( r['name'] for r in resources if r['apiVersion'] == api_version and (r['kind'] == kind + # TODO remove this W/A for future releases having https://github.com/kubernetes/kubectl/issues/1593 resolved or kind in ('ValidatingAdmissionPolicyList', 'ValidatingAdmissionPolicyBindingList') - and r['kind'] == kind.rstrip('List')) - ) + and r['kind'] == kind[:-len('List')]) + ), None) + + if resource_name is None: + raise Exception(f"Failed to find resource name for apiVersion: {api_version}, kind: {kind}") + items_by_resource.setdefault(resource_name, []).append(item) with gzip.open(payload.resource_path, 'rt', encoding='utf-8') as file: