openstack-image-manager 0.20231212.0__tar.gz → 0.20231219.0__tar.gz

{openstack-image-manager-0.20231212.0/openstack_image_manager.egg-info → openstack-image-manager-0.20231219.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openstack-image-manager
-Version: 0.20231212.0
+Version: 0.20231219.0
 Summary: OpenStack image manager
 Author-email: OSISM community <info@osism.tech>
 License:                                  Apache License
@@ -227,7 +227,7 @@ Requires-Dist: minio==7.2.0
 Requires-Dist: munch==4.0.0
 Requires-Dist: natsort==8.4.0
 Requires-Dist: openstacksdk==2.0.0
-Requires-Dist: paramiko==3.3.1
+Requires-Dist: paramiko==3.4.0
 Requires-Dist: patool==1.15.0
 Requires-Dist: requests==2.31.0
 Requires-Dist: ruamel.yaml==0.18.5

{openstack-image-manager-0.20231212.0 → openstack-image-manager-0.20231219.0}/etc/images/cirros.yml

@@ -31,3 +31,7 @@ images:
         url: https://github.com/cirros-dev/cirros/releases/download/0.6.1/cirros-0.6.1-x86_64-disk.img
         checksum: "sha256:cc704ab14342c1c8a8d91b66a7fc611d921c8b8f1aaf4695f9d6463d913fa8d1"
         build_date: 2022-11-22
+      - version: '0.6.2'
+        url: https://github.com/cirros-dev/cirros/releases/download/0.6.2/cirros-0.6.2-x86_64-disk.img
+        checksum: "sha256:07e44a73e54c94d988028515403c1ed762055e01b83a767edf3c2b387f78ce00"
+        build_date: 2023-05-30

{openstack-image-manager-0.20231212.0 → openstack-image-manager-0.20231219.0}/etc/images/flatcar.yml

@@ -28,3 +28,8 @@ images:
         source: https://stable.release.flatcar-linux.net/amd64-usr/3227.2.4/flatcar_production_openstack_image.img.bz2
         checksum: "sha256:774a4fd77da47a7c91714e6424891d6887ed7b9b72daadc40d56bb2f7527b4f5"
         build_date: 2022-10-27
+      - version: '3602.2.3'
+        url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/flatcar/3602.2.3/flatcar_production_openstack_image.img
+        source: https://stable.release.flatcar-linux.net/amd64-usr/3602.2.3/flatcar_production_openstack_image.img
+        checksum: "sha256:23b2d10aa0adf53d58bca0d9664338bdd308bef9e56f8393d39cb5e22bff4409"
+        build_date: 2023-12-11

{openstack-image-manager-0.20231212.0 → openstack-image-manager-0.20231219.0}/etc/images/gardenlinux.yml

@@ -2,6 +2,7 @@
 images:
   - name: Garden Linux
     enable: true
+    shortname: gardenlinux
     format: qcow2
     login: admin
     min_disk: 10
@@ -37,3 +38,8 @@ images:
         url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-image-gardenlinux/gardenlinux-amd64.934.11.qcow2
         checksum: "sha256:616a217afe692ba8b6a9eca3a99291414b77a819c18430e6cba1b01a7ba6238b"
         build_date: 2023-10-25
+      - version: '1312.1'
+        url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/gardenlinux/1312.1/openstack-gardener_prod-amd64-1312.1-c6ebc74e.qcow2
+        source: https://github.com/gardenlinux/gardenlinux/releases/download/1312.1/openstack-gardener_prod-amd64-1312.1-c6ebc74e.tar.xz
+        checksum: "sha256:12a67458959dabd8c4fa38f0224aa37f8e18629c218bbb716f411575a068663c"
+        build_date: 2023-11-22

{openstack-image-manager-0.20231212.0 → openstack-image-manager-0.20231219.0}/etc/images/kubernetes.yml

@@ -34,3 +34,7 @@ images:
         url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube-v1.28/ubuntu-2204-kube-v1.28.4.qcow2
         checksum: "sha256:ad9cb2fd07c0b9bd25e5476cc8daf0e9037f1b9d0bfef95ce2346f18f03bf58c"
         build_date: 2023-11-16
+      - version: '1.29.0'
+        url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube-v1.29/ubuntu-2204-kube-v1.29.0.qcow2
+        checksum: "sha256:d6576f6f920e84070f86a67ca9b6b6c7e48b2baff32fde70840e3f7df09b87c4"
+        build_date: 2023-12-18

{openstack-image-manager-0.20231212.0 → openstack-image-manager-0.20231219.0}/etc/images/talos.yml

@@ -33,3 +33,8 @@ images:
         source: https://github.com/siderolabs/talos/releases/download/v1.4.5/openstack-amd64.tar.gz
         checksum: "sha256:fc7dc71a6acece93196c8bace15139469b7bfbe4fa7d001336da0fdda9b437c9"
         build_date: 2023-05-30
+      - version: '1.6.0'
+        url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/talos/1.6.0/openstack-amd64.raw
+        source: https://github.com/siderolabs/talos/releases/download/v1.6.0/openstack-amd64.raw.xz
+        checksum: "sha256:e3754c2338b4ce831db5442cf62deab260d56b64227a07cfc26e4b73eef5abaf"
+        build_date: 2023-12-15

{openstack-image-manager-0.20231212.0 → openstack-image-manager-0.20231219.0}/openstack_image_manager/manage.py

@@ -1097,7 +1097,11 @@ class ImageManager:
                             logger.info("Deactivating image '%s'" % image)
                             self.conn.image.deactivate_image(cloud_image.id)
 
-                        if self.CONF.hide and not self.CONF.dry_run:
+                        if (
+                            self.CONF.hide
+                            and not self.CONF.dry_run
+                            and cloud_image.visibility != "community"
+                        ):
                             logger.info(
                                 "Setting visibility of '%s' to 'community'" % image
                             )
@@ -1107,6 +1111,17 @@ class ImageManager:
                     except Exception as e:
                         logger.error("An Exception occurred: \n%s" % e)
                         self.exit_with_error = True
+            elif counter[image_name] <= last:
+                logger.info(
+                    f"Image '{image}' will not be deleted, {counter[image_name]} <= {last}"
+                )
+                if (
+                    self.CONF.hide
+                    and not self.CONF.dry_run
+                    and cloud_image.visibility != "community"
+                ):
+                    logger.info("Setting visibility of '%s' to 'community'" % image)
+                    self.conn.image.update_image(cloud_image.id, visibility="community")
             elif (
                 counter[image_name] < last and self.CONF.hide and not self.CONF.dry_run
             ):

{openstack-image-manager-0.20231212.0 → openstack-image-manager-0.20231219.0}/openstack_image_manager/mirror.py

@@ -51,6 +51,18 @@ def main(
     logger.remove()
     logger.add(sys.stderr, format=log_fmt, level=level, colorize=True)
 
+    client = Minio(
+        minio_server,
+        access_key=minio_access_key,
+        secret_key=minio_secret_key,
+    )
+
+    result = client.bucket_exists(minio_bucket)
+    if not result:
+        logger.error(f"Create bucket '{minio_bucket}' first")
+        if not dry_run:
+            sys.exit(1)
+
     onlyfiles = []
     for f in listdir(images):
         if isfile(join(images, f)):
@@ -58,24 +70,17 @@ def main(
             onlyfiles.append(f)
 
     all_images = []
-    for file in onlyfiles:
+    for file in [x for x in onlyfiles if x.endswith(".yml")]:
+        logger.info(f"Processing file {file}")
         with open(join(images, file)) as fp:
             data = yaml.load(fp, Loader=yaml.SafeLoader)
             for image in data.get("images"):
                 logger.debug(f"Adding {image['name']} to the list of images")
                 all_images.append(image)
 
-    client = Minio(
-        minio_server,
-        access_key=minio_access_key,
-        secret_key=minio_secret_key,
-    )
-
-    result = client.bucket_exists(minio_bucket)
-    if not result:
-        logger.error(f"Create bucket '{minio_bucket}' first")
-
     for image in all_images:
+        logger.info(f"Processing image {image['name']}")
+
         if "versions" not in image:
             continue
 
@@ -105,31 +110,32 @@ def main(
 
             try:
                 client.stat_object(minio_bucket, os.path.join(dirname, filename))
-                logger.info(f"'{filename}' available in '{dirname}'")
+                logger.info(f"File {filename} available in bucket {dirname}")
             except S3Error:
-                logger.info(f"'{filename}' not yet available in '{dirname}'")
+                logger.info(f"File {filename} not yet available in bucket {dirname}")
 
-                logger.info(f"Downloading {version['source']}")
-                response = requests.get(
-                    version["source"], stream=True, allow_redirects=True
-                )
-                with open(os.path.basename(path.path), "wb") as fp:
-                    shutil.copyfileobj(response.raw, fp)
-                del response
+                if not isfile(os.path.basename(path.path)):
+                    logger.info(f"Downloading {version['source']}")
+                    response = requests.get(
+                        version["source"], stream=True, allow_redirects=True
+                    )
+                    with open(os.path.basename(path.path), "wb") as fp:
+                        shutil.copyfileobj(response.raw, fp)
+                    del response
 
                 if fileextension in [".bz2", ".zip", ".xz", ".gz"]:
-                    logger.info(f"Decompressing '{os.path.basename(path.path)}'")
+                    logger.info(f"Decompressing {os.path.basename(path.path)}")
                     patoolib.extract_archive(os.path.basename(path.path), outdir=".")
                     os.remove(os.path.basename(path.path))
 
                 if not dry_run:
-                    logger.info(f"Uploading '{filename}' to '{dirname}'")
+                    logger.info(f"Uploading {filename} to bucket {dirname}")
                     client.fput_object(
                         minio_bucket, os.path.join(dirname, filename), filename
                     )
                 else:
                     logger.info(
-                        f"Not uploading '{filename}' to '{dirname}' (dry-run enabled)"
+                        f"Not uploading {filename} to bucket {dirname} (dry-run enabled)"
                     )
 
                 os.remove(filename)

{openstack-image-manager-0.20231212.0 → openstack-image-manager-0.20231219.0/openstack_image_manager.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openstack-image-manager
-Version: 0.20231212.0
+Version: 0.20231219.0
 Summary: OpenStack image manager
 Author-email: OSISM community <info@osism.tech>
 License:                                  Apache License
@@ -227,7 +227,7 @@ Requires-Dist: minio==7.2.0
 Requires-Dist: munch==4.0.0
 Requires-Dist: natsort==8.4.0
 Requires-Dist: openstacksdk==2.0.0
-Requires-Dist: paramiko==3.3.1
+Requires-Dist: paramiko==3.4.0
 Requires-Dist: patool==1.15.0
 Requires-Dist: requests==2.31.0
 Requires-Dist: ruamel.yaml==0.18.5

{openstack-image-manager-0.20231212.0 → openstack-image-manager-0.20231219.0}/openstack_image_manager.egg-info/requires.txt

@@ -3,7 +3,7 @@ minio==7.2.0
 munch==4.0.0
 natsort==8.4.0
 openstacksdk==2.0.0
-paramiko==3.3.1
+paramiko==3.4.0
 patool==1.15.0
 requests==2.31.0
 ruamel.yaml==0.18.5

{openstack-image-manager-0.20231212.0 → openstack-image-manager-0.20231219.0}/requirements.txt

@@ -3,7 +3,7 @@ minio==7.2.0
 munch==4.0.0
 natsort==8.4.0
 openstacksdk==2.0.0
-paramiko==3.3.1
+paramiko==3.4.0
 patool==1.15.0
 requests==2.31.0
 ruamel.yaml==0.18.5