Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Collect all images into one single txt file #558

Merged
merged 1 commit into from
Aug 21, 2023

Conversation

w13915984028
Copy link
Member

Problem:

Harvester puts all container image names into a tarball image-lists.tar.gz, and this file is not published.

It is not very convenient to check if an image is packed into ISO file.

image

Solution:

Generate an additional single txt file, which includes all images in the ISO, and also publish this file.

Related Issue:

harvester/harvester#4176

Test plan:

  1. Build the Harvester ISO
  2. Check if the image-all.txt is existing in the path dist/artifacts
  3. Check all images are listed in this file
  4. Check the first line of this file, the timestamp should be updated after each successful building

cat dist/artifacts/image-all.txt

# All images in the Harvester ISO built @  Thu Aug 17 13:48:28 UTC 2023 

# In  harvester-extra-master.txt
docker.io/rancher/harvester-upgrade:04c258b9
docker.io/rancher/harvester-upgrade:master-04c258b9-head

# In  harvester-images-master.txt
docker.io/banzaicloud/eventrouter:v0.1.0
docker.io/library/alpine:3
docker.io/library/busybox:1.32.0
docker.io/longhornio/backing-image-manager:v1.4.3
docker.io/longhornio/csi-attacher:v3.4.0
...

@w13915984028
Copy link
Member Author

w13915984028 commented Aug 17, 2023

The all image list from master-head building 20230821
# All images in the Harvester ISO built @  Mon Aug 21 10:30:37 UTC 2023 

# In harvester-extra-master.txt
docker.io/rancher/harvester-upgrade:04c258b9
docker.io/rancher/harvester-upgrade:master-04c258b9-head

# In harvester-images-master.txt
docker.io/library/alpine:3
docker.io/library/busybox:1.32.0
docker.io/longhornio/backing-image-manager:v1.4.3
docker.io/longhornio/csi-attacher:v3.4.0
docker.io/longhornio/csi-node-driver-registrar:v2.5.0
docker.io/longhornio/csi-provisioner:v2.1.2
docker.io/longhornio/csi-resizer:v1.3.0
docker.io/longhornio/csi-snapshotter:v5.0.1
docker.io/longhornio/livenessprobe:v2.8.0
docker.io/longhornio/longhorn-engine:v1.4.3
docker.io/longhornio/longhorn-instance-manager:v1.4.3
docker.io/longhornio/longhorn-manager:v1.4.3
docker.io/longhornio/longhorn-share-manager:v1.4.3
docker.io/longhornio/longhorn-ui:v1.4.3
docker.io/longhornio/support-bundle-kit:v0.0.25
docker.io/rancher/harvester-eventrouter:v0.1.1
docker.io/rancher/harvester-load-balancer-webhook:master-head
docker.io/rancher/harvester-load-balancer:master-head
docker.io/rancher/harvester-network-controller:master-head
docker.io/rancher/harvester-network-helper:master-head
docker.io/rancher/harvester-network-webhook:master-head
docker.io/rancher/harvester-node-disk-manager:master-head
docker.io/rancher/harvester-node-manager:master-head
docker.io/rancher/harvester-pcidevices:v0.2.5
docker.io/rancher/harvester-seeder:v0.1.0
docker.io/rancher/harvester-upgrade:master-head
docker.io/rancher/harvester-vm-import-controller:v0.1.5
docker.io/rancher/harvester-webhook:master-head
docker.io/rancher/harvester:master-head
docker.io/rancher/support-bundle-kit:master-head
ghcr.io/k8snetworkplumbingwg/whereabouts:v0.6.2-amd64
ghcr.io/kube-vip/kube-vip-iptables:v0.6.0
registry.k8s.io/sig-storage/snapshot-controller:v5.0.1
registry.k8s.io/sig-storage/snapshot-validation-webhook:v5.0.1
registry.suse.com/bci/bci-base:15.4
registry.suse.com/suse/sles/15.4/libguestfs-tools:0.54.0-150400.3.19.1
registry.suse.com/suse/sles/15.4/virt-api:0.54.0-150400.3.19.1
registry.suse.com/suse/sles/15.4/virt-controller:0.54.0-150400.3.19.1
registry.suse.com/suse/sles/15.4/virt-handler:0.54.0-150400.3.19.1
registry.suse.com/suse/sles/15.4/virt-launcher:0.54.0-150400.3.19.1
registry.suse.com/suse/sles/15.4/virt-operator:0.54.0-150400.3.19.1
registry.suse.com/suse/vmdp/vmdp:2.5.4.2

# In harvester-repo-images-master.txt
docker.io/rancher/harvester-cluster-repo:master

# In rancher-images-v2.7.5.txt
docker.io/rancher/fleet-agent:v0.7.0
docker.io/rancher/fleet:v0.7.0
docker.io/rancher/gitjob:v0.1.54
docker.io/rancher/kubectl:v1.20.2
docker.io/rancher/kubectl:v1.21.5
docker.io/rancher/mirrored-grafana-grafana:9.1.5
docker.io/rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.1.1
docker.io/rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.3.0
docker.io/rancher/mirrored-kiwigrid-k8s-sidecar:1.19.2
docker.io/rancher/mirrored-kube-state-metrics-kube-state-metrics:v2.6.0
docker.io/rancher/mirrored-library-busybox:1.31.1
docker.io/rancher/mirrored-library-nginx:1.21.1-alpine
docker.io/rancher/mirrored-prometheus-adapter-prometheus-adapter:v0.10.0
docker.io/rancher/mirrored-prometheus-node-exporter:v1.3.1
docker.io/rancher/mirrored-prometheus-operator-prometheus-config-reloader:v0.59.1
docker.io/rancher/mirrored-prometheus-operator-prometheus-operator:v0.59.1
docker.io/rancher/mirrored-prometheus-prometheus:v2.38.0
docker.io/rancher/mirrored-prometheus-alertmanager:v0.24.0
docker.io/rancher/rancher-webhook:v0.3.5
docker.io/rancher/rancher:v2.7.5
docker.io/rancher/shell:v0.1.8
docker.io/rancher/shell:v0.1.18
docker.io/rancher/shell:v0.1.20
docker.io/rancher/system-agent:v0.3.3-suc
docker.io/rancher/system-upgrade-controller:v0.11.0
docker.io/rancher/mirrored-banzaicloud-fluentd:v1.14.6-alpine-5
docker.io/rancher/mirrored-banzaicloud-logging-operator:3.17.10
docker.io/rancher/mirrored-fluent-fluent-bit:1.9.5
docker.io/rancher/mirrored-jimmidyson-configmap-reload:v0.4.0

# In rancherd-bootstrap-images-master.txt
docker.io/rancher/system-agent-installer-rancher:v2.7.5
docker.io/rancher/system-agent-installer-rke2:v1.25.9-rke2r1

# In rke2-images-multus.linux-amd64-v1.25.9-rke2r1.txt
docker.io/rancher/hardened-cni-plugins:v1.0.1-build20221011
docker.io/rancher/hardened-multus-cni:v3.9.3-build20230109

# In rke2-images.linux-amd64-v1.25.9-rke2r1.txt
docker.io/rancher/rke2-runtime:v1.25.9-rke2r1
docker.io/rancher/hardened-kubernetes:v1.25.9-rke2r1-build20230412
docker.io/rancher/hardened-coredns:v1.10.1-build20230406
docker.io/rancher/hardened-cluster-autoscaler:v1.8.6-build20230406
docker.io/rancher/hardened-dns-node-cache:1.22.20-build20230406
docker.io/rancher/hardened-etcd:v3.5.7-k3s1-build20230406
docker.io/rancher/hardened-k8s-metrics-server:v0.6.2-build20221202
docker.io/rancher/klipper-helm:v0.7.6-build20230223
docker.io/rancher/klipper-lb:v0.4.3
docker.io/rancher/pause:3.6
docker.io/rancher/mirrored-ingress-nginx-kube-webhook-certgen:v20230312-helm-chart-4.5.2-28-g66a760794
docker.io/rancher/nginx-ingress-controller:nginx-1.6.4-hardened4
docker.io/rancher/rke2-cloud-provider:v1.26.3-build20230406
docker.io/rancher/mirrored-sig-storage-snapshot-controller:v6.2.1
docker.io/rancher/mirrored-sig-storage-snapshot-validation-webhook:v6.2.1
docker.io/rancher/hardened-calico:v3.25.0-build20230209
docker.io/rancher/hardened-flannel:v0.21.3-build20230308

Copy link
Contributor

@Vicente-Cheng Vicente-Cheng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only a nit discussion, others LGTM.

scripts/package-harvester-os Outdated Show resolved Hide resolved
@bk201
Copy link
Member

bk201 commented Aug 21, 2023

@w13915984028 Does the PR intend to publish the harvester-images-list.txt to GitHub release pages? If yes, we also need to add some changes to the drone CI file. like https://github.com/harvester/harvester/blob/04c258b90c9bed401986f0a60f17696dfab74c16/.drone.yml#L386-L402

BTW, we do publish the image list tarball. e.g., https://releases.rancher.com/harvester/v1.1.2/images-list.tar.gz

@w13915984028
Copy link
Member Author

@bk201 Added a new PR in Harvester to publish the harvester-images-list.txt, thanks.
harvester/harvester#4436

Copy link
Member

@bk201 bk201 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Nice enhancement.

@guangbochen
Copy link
Contributor

wondering if we know where docker.io/banzaicloud/eventrouter:v0.1.0 comes from, it should all replaced by rancher/harvester-eventrouter:v0.1.1? thanks.

@w13915984028
Copy link
Member Author

@guangbochen , yes, the eventrouter is replaced with new image in

package/upgrade/addons/logging_addon.yaml: - image: rancher/harvester-eventrouter:v0.1.1

let me check why the image list is not updated.

@w13915984028
Copy link
Member Author

w13915984028 commented Aug 21, 2023

We bumped all related event-router images in #545

The issue seems related to my local branch

Is re-building the ISO and will update the image list soon.

@w13915984028
Copy link
Member Author

@guangbochen The newly generated image list file, should be correct.

#558 (comment)

Copy link
Contributor

@guangbochen guangbochen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks.

@guangbochen guangbochen merged commit a94331a into harvester:master Aug 21, 2023
@guangbochen
Copy link
Contributor

@mergify backport v1.2

@mergify
Copy link

mergify bot commented Aug 21, 2023

backport v1.2

✅ Backports have been created

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants