diff --git a/magnum_cluster_api/conf.py b/magnum_cluster_api/conf.py index 8c79f33c..62537091 100644 --- a/magnum_cluster_api/conf.py +++ b/magnum_cluster_api/conf.py @@ -45,7 +45,7 @@ ), cfg.StrOpt( "v1_25_image", - default="$image_repository/cluster-autoscaler:v1.25.5", + default="$image_repository/cluster-autoscaler:v1.25.2", help="Image for the cluster auto-scaler for Kubernetes v1.25.", ), cfg.StrOpt( diff --git a/magnum_cluster_api/tests/unit/test_images.py b/magnum_cluster_api/tests/unit/test_images.py index cfb7fad5..d9681490 100644 --- a/magnum_cluster_api/tests/unit/test_images.py +++ b/magnum_cluster_api/tests/unit/test_images.py @@ -21,26 +21,30 @@ @pytest.mark.parametrize( "version,image,image_repository", [ - ("v1.22.0", "registry.k8s.io/autoscaling/cluster-autoscaler:v1.22.1", None), - ("v1.22.17", "registry.k8s.io/autoscaling/cluster-autoscaler:v1.22.1", None), - ("v1.23.0", "registry.k8s.io/autoscaling/cluster-autoscaler:v1.23.0", None), - ("v1.23.17", "registry.k8s.io/autoscaling/cluster-autoscaler:v1.23.0", None), - ("v1.24.0", "registry.k8s.io/autoscaling/cluster-autoscaler:v1.24.1", None), - ("v1.24.17", "registry.k8s.io/autoscaling/cluster-autoscaler:v1.24.1", None), - ("v1.25.0", "registry.k8s.io/autoscaling/cluster-autoscaler:v1.25.1", None), - ("v1.25.17", "registry.k8s.io/autoscaling/cluster-autoscaler:v1.25.1", None), - ("v1.26.0", "registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.1", None), - ("v1.26.3", "registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.1", None), - ("v1.22.0", "quay.io/vexxhost/cluster-autoscaler:v1.22.1", "quay.io/vexxhost"), - ("v1.22.17", "quay.io/vexxhost/cluster-autoscaler:v1.22.1", "quay.io/vexxhost"), - ("v1.23.0", "quay.io/vexxhost/cluster-autoscaler:v1.23.0", "quay.io/vexxhost"), - ("v1.23.17", "quay.io/vexxhost/cluster-autoscaler:v1.23.0", "quay.io/vexxhost"), - ("v1.24.0", "quay.io/vexxhost/cluster-autoscaler:v1.24.1", "quay.io/vexxhost"), - ("v1.24.17", "quay.io/vexxhost/cluster-autoscaler:v1.24.1", "quay.io/vexxhost"), - ("v1.25.0", "quay.io/vexxhost/cluster-autoscaler:v1.25.1", "quay.io/vexxhost"), - ("v1.25.17", "quay.io/vexxhost/cluster-autoscaler:v1.25.1", "quay.io/vexxhost"), - ("v1.26.3", "quay.io/vexxhost/cluster-autoscaler:v1.26.1", "quay.io/vexxhost"), - ("v1.26.3", "quay.io/vexxhost/cluster-autoscaler:v1.26.1", "quay.io/vexxhost"), + ("v1.22.0", "registry.k8s.io/autoscaling/cluster-autoscaler:v1.22.3", None), + ("v1.22.17", "registry.k8s.io/autoscaling/cluster-autoscaler:v1.22.3", None), + ("v1.23.0", "registry.k8s.io/autoscaling/cluster-autoscaler:v1.23.1", None), + ("v1.23.17", "registry.k8s.io/autoscaling/cluster-autoscaler:v1.23.1", None), + ("v1.24.0", "registry.k8s.io/autoscaling/cluster-autoscaler:v1.24.2", None), + ("v1.24.17", "registry.k8s.io/autoscaling/cluster-autoscaler:v1.24.2", None), + ("v1.25.0", "registry.k8s.io/autoscaling/cluster-autoscaler:v1.25.2", None), + ("v1.25.17", "registry.k8s.io/autoscaling/cluster-autoscaler:v1.25.2", None), + ("v1.26.0", "registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.3", None), + ("v1.26.3", "registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.3", None), + ("v1.27.0", "registry.k8s.io/autoscaling/cluster-autoscaler:v1.27.2", None), + ("v1.27.3", "registry.k8s.io/autoscaling/cluster-autoscaler:v1.27.2", None), + ("v1.22.0", "quay.io/vexxhost/cluster-autoscaler:v1.22.3", "quay.io/vexxhost"), + ("v1.22.17", "quay.io/vexxhost/cluster-autoscaler:v1.22.3", "quay.io/vexxhost"), + ("v1.23.0", "quay.io/vexxhost/cluster-autoscaler:v1.23.1", "quay.io/vexxhost"), + ("v1.23.17", "quay.io/vexxhost/cluster-autoscaler:v1.23.1", "quay.io/vexxhost"), + ("v1.24.0", "quay.io/vexxhost/cluster-autoscaler:v1.24.2", "quay.io/vexxhost"), + ("v1.24.17", "quay.io/vexxhost/cluster-autoscaler:v1.24.2", "quay.io/vexxhost"), + ("v1.25.0", "quay.io/vexxhost/cluster-autoscaler:v1.25.2", "quay.io/vexxhost"), + ("v1.25.17", "quay.io/vexxhost/cluster-autoscaler:v1.25.2", "quay.io/vexxhost"), + ("v1.26.0", "quay.io/vexxhost/cluster-autoscaler:v1.26.3", "quay.io/vexxhost"), + ("v1.26.3", "quay.io/vexxhost/cluster-autoscaler:v1.26.3", "quay.io/vexxhost"), + ("v1.27.0", "quay.io/vexxhost/cluster-autoscaler:v1.27.2", "quay.io/vexxhost"), + ("v1.27.3", "quay.io/vexxhost/cluster-autoscaler:v1.27.2", "quay.io/vexxhost"), ], ) def test_get_cluster_autoscaler_image(image_repository, version, image):