Skip to content

Commit 4981fe1

Browse files
fmoral2fmoral2
committed
Merge remote-tracking branch 'upstream/master' into e2e.qase.report
2 parents a6aeec0 + c1e854d commit 4981fe1

File tree

3 files changed

+64
-67
lines changed

3 files changed

+64
-67
lines changed

‎charts/chart_versions.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
charts:
2-
- version: 1.16.501
2+
- version: 1.16.601
33
filename: /charts/rke2-cilium.yaml
44
bootstrap: true
55
- version: v3.29.1-build2025011000
@@ -14,7 +14,7 @@ charts:
1414
- version: 1.36.102
1515
filename: /charts/rke2-coredns.yaml
1616
bootstrap: true
17-
- version: 4.12.003
17+
- version: 4.12.004
1818
filename: /charts/rke2-ingress-nginx.yaml
1919
bootstrap: false
2020
- version: 27.0.200
@@ -41,7 +41,7 @@ charts:
4141
- version: 0.2.900
4242
filename: /charts/harvester-cloud-provider.yaml
4343
bootstrap: true
44-
- version: 0.1.2200
44+
- version: 0.1.2300
4545
filename: /charts/harvester-csi-driver.yaml
4646
bootstrap: true
4747
- version: 4.0.002

‎scripts/build-images

Lines changed: 55 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -13,96 +13,92 @@ EOF
1313

1414
xargs -n1 -t docker image pull --quiet << EOF >> build/images-core.txt
1515
${REGISTRY}/rancher/hardened-kubernetes:${KUBERNETES_IMAGE_TAG}
16-
${REGISTRY}/rancher/hardened-coredns:v1.11.1-build20240305
17-
${REGISTRY}/rancher/hardened-cluster-autoscaler:v1.8.10-build20240124
18-
${REGISTRY}/rancher/hardened-dns-node-cache:1.22.28-build20240125
19-
${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-build20240418
20-
${REGISTRY}/rancher/hardened-k8s-metrics-server:v0.7.1-build20240401
21-
${REGISTRY}/rancher/hardened-addon-resizer:1.8.20-build20240410
22-
${REGISTRY}/rancher/klipper-helm:v0.8.3-build20240228
23-
${REGISTRY}/rancher/klipper-lb:v0.4.7
16+
${REGISTRY}/rancher/hardened-coredns:v1.12.0-build20241126
17+
${REGISTRY}/rancher/hardened-cluster-autoscaler:v1.9.0-build20241126
18+
${REGISTRY}/rancher/hardened-dns-node-cache:1.24.0-build20241211
19+
${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-build20241106
20+
${REGISTRY}/rancher/hardened-k8s-metrics-server:v0.7.2-build20250110
21+
${REGISTRY}/rancher/hardened-addon-resizer:1.8.22-build20250110
22+
${REGISTRY}/rancher/klipper-helm:v0.9.4-build20250113
23+
${REGISTRY}/rancher/klipper-lb:v0.4.10
2424
${REGISTRY}/rancher/mirrored-pause:${PAUSE_VERSION}
25-
${REGISTRY}/rancher/mirrored-ingress-nginx-kube-webhook-certgen:v20230312-helm-chart-4.5.2-28-g66a760794
26-
${REGISTRY}/rancher/nginx-ingress-controller:nginx-1.9.6-hardened1
25+
${REGISTRY}/rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.5.0
26+
${REGISTRY}/rancher/nginx-ingress-controller:v1.12.0-hardened2
2727
${REGISTRY}/rancher/rke2-cloud-provider:${CCM_VERSION}
28-
${REGISTRY}/rancher/mirrored-sig-storage-snapshot-controller:v6.2.1
29-
${REGISTRY}/rancher/mirrored-sig-storage-snapshot-validation-webhook:v6.2.2
28+
${REGISTRY}/rancher/mirrored-sig-storage-snapshot-controller:v8.2.0
29+
EOF
30+
31+
xargs -n1 -t docker image pull --quiet << EOF > build/images-traefik.txt
32+
${REGISTRY}/rancher/mirrored-library-traefik:2.11.10
3033
EOF
3134

3235
xargs -n1 -t docker image pull --quiet << EOF > build/images-canal.txt
33-
${REGISTRY}/rancher/hardened-calico:v3.27.3-build20240403
34-
${REGISTRY}/rancher/hardened-flannel:v0.25.1-build20240412
36+
${REGISTRY}/rancher/hardened-calico:v3.29.1-build20250110
37+
${REGISTRY}/rancher/hardened-flannel:v0.26.3-build20250108
3538
EOF
3639

3740
if [ "${GOARCH}" != "s390x" ]; then
3841
xargs -n1 -t docker image pull --quiet << EOF > build/images-cilium.txt
39-
${REGISTRY}/rancher/mirrored-cilium-certgen:v0.1.11
40-
${REGISTRY}/rancher/mirrored-cilium-cilium:v1.15.4
41-
${REGISTRY}/rancher/mirrored-cilium-cilium-envoy:v1.27.4-21905253931655328edaacf3cd16aeda73bbea2f
42-
${REGISTRY}/rancher/mirrored-cilium-clustermesh-apiserver:v1.15.4
43-
${REGISTRY}/rancher/mirrored-cilium-hubble-relay:v1.15.4
44-
${REGISTRY}/rancher/mirrored-cilium-hubble-ui:v0.13.0
45-
${REGISTRY}/rancher/mirrored-cilium-hubble-ui-backend:v0.13.0
46-
${REGISTRY}/rancher/mirrored-cilium-operator-aws:v1.15.4
47-
${REGISTRY}/rancher/mirrored-cilium-operator-azure:v1.15.4
48-
${REGISTRY}/rancher/mirrored-cilium-operator-generic:v1.15.4
49-
${REGISTRY}/rancher/hardened-cni-plugins:v1.4.1-build20240325
42+
${REGISTRY}/rancher/mirrored-cilium-certgen:v0.2.0
43+
${REGISTRY}/rancher/mirrored-cilium-cilium:v1.16.6
44+
${REGISTRY}/rancher/mirrored-cilium-cilium-envoy:v1.30.9-1737073743-40a016d11c0d863b772961ed0168eea6fe6b10a5
45+
${REGISTRY}/rancher/mirrored-cilium-clustermesh-apiserver:v1.16.6
46+
${REGISTRY}/rancher/mirrored-cilium-hubble-relay:v1.16.6
47+
${REGISTRY}/rancher/mirrored-cilium-hubble-ui:v0.13.1
48+
${REGISTRY}/rancher/mirrored-cilium-hubble-ui-backend:v0.13.1
49+
${REGISTRY}/rancher/mirrored-cilium-operator-aws:v1.16.6
50+
${REGISTRY}/rancher/mirrored-cilium-operator-azure:v1.16.6
51+
${REGISTRY}/rancher/mirrored-cilium-operator-generic:v1.16.6
52+
${REGISTRY}/rancher/hardened-cni-plugins:v1.6.2-build20250124
5053
EOF
5154

5255
xargs -n1 -t docker image pull --quiet << EOF > build/images-calico.txt
53-
${REGISTRY}/rancher/mirrored-calico-operator:v1.32.7
54-
${REGISTRY}/rancher/mirrored-calico-ctl:v3.27.3
55-
${REGISTRY}/rancher/mirrored-calico-kube-controllers:v3.27.3
56-
${REGISTRY}/rancher/mirrored-calico-typha:v3.27.3
57-
${REGISTRY}/rancher/mirrored-calico-node:v3.27.3
58-
${REGISTRY}/rancher/mirrored-calico-pod2daemon-flexvol:v3.27.3
59-
${REGISTRY}/rancher/mirrored-calico-cni:v3.27.3
60-
${REGISTRY}/rancher/mirrored-calico-apiserver:v3.27.3
61-
${REGISTRY}/rancher/mirrored-calico-csi:v3.27.3
62-
${REGISTRY}/rancher/mirrored-calico-node-driver-registrar:v3.27.3
56+
${REGISTRY}/rancher/mirrored-calico-operator:v1.36.2
57+
${REGISTRY}/rancher/mirrored-calico-ctl:v3.29.1
58+
${REGISTRY}/rancher/mirrored-calico-kube-controllers:v3.29.1
59+
${REGISTRY}/rancher/mirrored-calico-typha:v3.29.1
60+
${REGISTRY}/rancher/mirrored-calico-node:v3.29.1
61+
${REGISTRY}/rancher/mirrored-calico-pod2daemon-flexvol:v3.29.1
62+
${REGISTRY}/rancher/mirrored-calico-cni:v3.29.1
63+
${REGISTRY}/rancher/mirrored-calico-apiserver:v3.29.1
64+
${REGISTRY}/rancher/mirrored-calico-csi:v3.29.1
65+
${REGISTRY}/rancher/mirrored-calico-node-driver-registrar:v3.29.1
6366
EOF
6467

6568
if [ "${GOARCH}" != "arm64" ]; then
6669
xargs -n1 -t docker image pull --quiet << EOF > build/images-vsphere.txt
67-
${REGISTRY}/rancher/mirrored-cloud-provider-vsphere-cpi-release-manager:v1.28.0
68-
${REGISTRY}/rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.1.2
69-
${REGISTRY}/rancher/mirrored-cloud-provider-vsphere-csi-release-syncer:v3.1.2
70-
${REGISTRY}/rancher/mirrored-sig-storage-csi-node-driver-registrar:v2.8.0
71-
${REGISTRY}/rancher/mirrored-sig-storage-csi-resizer:v1.8.0
72-
${REGISTRY}/rancher/mirrored-sig-storage-livenessprobe:v2.10.0
73-
${REGISTRY}/rancher/mirrored-sig-storage-csi-attacher:v4.3.0
74-
${REGISTRY}/rancher/mirrored-sig-storage-csi-provisioner:v3.5.0
75-
${REGISTRY}/rancher/mirrored-sig-storage-csi-snapshotter:v6.2.1
70+
${REGISTRY}/rancher/mirrored-cloud-provider-vsphere:v1.32.1
71+
${REGISTRY}/rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.1
72+
${REGISTRY}/rancher/mirrored-cloud-provider-vsphere-csi-release-syncer:v3.3.1
73+
${REGISTRY}/rancher/mirrored-sig-storage-csi-node-driver-registrar:v2.12.0
74+
${REGISTRY}/rancher/mirrored-sig-storage-csi-resizer:v1.10.1
75+
${REGISTRY}/rancher/mirrored-sig-storage-livenessprobe:v2.14.0
76+
${REGISTRY}/rancher/mirrored-sig-storage-csi-attacher:v4.7.0
77+
${REGISTRY}/rancher/mirrored-sig-storage-csi-provisioner:v4.0.1
78+
${REGISTRY}/rancher/mirrored-sig-storage-csi-snapshotter:v7.0.2
7679
EOF
7780
fi
7881

7982
xargs -n1 -t docker image pull --quiet << EOF > build/images-multus.txt
80-
${REGISTRY}/rancher/hardened-multus-cni:v4.0.2-build20240208
81-
${REGISTRY}/rancher/hardened-cni-plugins:v1.4.0-build20240122
82-
${REGISTRY}/rancher/hardened-sriov-network-operator:v1.2.0-build20231010
83-
${REGISTRY}/rancher/hardened-sriov-network-config-daemon:v1.2.0-build20231010
84-
${REGISTRY}/rancher/hardened-sriov-network-device-plugin:v3.5.1-build20231009
85-
${REGISTRY}/rancher/hardened-sriov-cni:v2.6.3-build20231009
86-
${REGISTRY}/rancher/hardened-ib-sriov-cni:v1.0.2-build20231009
87-
${REGISTRY}/rancher/hardened-sriov-network-resources-injector:v1.5-build20231009
88-
${REGISTRY}/rancher/hardened-sriov-network-webhook:v1.2.0-build20231010
89-
${REGISTRY}/rancher/hardened-whereabouts:v0.6.3-build20240208
83+
${REGISTRY}/rancher/hardened-multus-cni:v4.1.4-build20250108
84+
${REGISTRY}/rancher/hardened-cni-plugins:v1.6.0-build20241022
85+
${REGISTRY}/rancher/hardened-whereabouts:v0.8.0-build20241011
9086
${REGISTRY}/rancher/mirrored-library-busybox:1.36.1
9187
EOF
9288

9389
xargs -n1 -t docker image pull --quiet << EOF > build/images-harvester.txt
94-
${REGISTRY}/rancher/harvester-cloud-provider:v0.2.1
95-
${REGISTRY}/rancher/mirrored-kube-vip-kube-vip-iptables:v0.6.0
96-
${REGISTRY}/rancher/harvester-csi-driver:v0.1.6
90+
${REGISTRY}/rancher/harvester-cloud-provider:v0.2.4
91+
${REGISTRY}/rancher/mirrored-kube-vip-kube-vip-iptables:v0.8.7
92+
${REGISTRY}/rancher/harvester-csi-driver:v0.2.2
9793
${REGISTRY}/rancher/mirrored-longhornio-csi-node-driver-registrar:v2.3.0
9894
${REGISTRY}/rancher/mirrored-longhornio-csi-resizer:v1.2.0
9995
${REGISTRY}/rancher/mirrored-longhornio-csi-provisioner:v2.1.2
10096
${REGISTRY}/rancher/mirrored-longhornio-csi-attacher:v3.2.1
10197
EOF
10298

10399
xargs -n1 -t docker image pull --quiet << EOF > build/images-flannel.txt
104-
${REGISTRY}/rancher/hardened-flannel:v0.25.1-build20240412
105-
${REGISTRY}/rancher/hardened-cni-plugins:v1.4.1-build20240325
100+
${REGISTRY}/rancher/hardened-flannel:v0.26.3-build20250108
101+
${REGISTRY}/rancher/hardened-cni-plugins:v1.6.0-build20241022
106102
EOF
107103
fi
108104
# Continue to provide a legacy airgap archive set with the default CNI images

‎tests/e2e/createreport/s3upload.go renamed to ‎tests/e2e/report/s3upload.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"github.com/aws/aws-sdk-go/aws"
1010
"github.com/aws/aws-sdk-go/aws/session"
1111
"github.com/aws/aws-sdk-go/service/s3"
12+
"github.com/sirupsen/logrus"
1213
)
1314

1415
const bucketName = "e2e-results-log"
@@ -23,18 +24,18 @@ func main() {
2324
log.Fatal("--file flag is required")
2425
}
2526

26-
logFile, err := ReadLogsFromFile(fileName)
27+
logFile, err := readLogsFromFile(fileName)
2728
if err != nil {
2829
log.Fatalf("Error reading log file: %v", err)
2930
}
3031
defer logFile.Close()
3132

32-
if err = UploadReport(logFile); err != nil {
33+
if err = uploadReport(logFile); err != nil {
3334
log.Fatalf("Error uploading report: %v", err)
3435
}
3536
}
3637

37-
func UploadReport(file *os.File) error {
38+
func uploadReport(file *os.File) error {
3839
sess, err := session.NewSession(&aws.Config{
3940
Region: aws.String("us-east-2"),
4041
})
@@ -55,12 +56,12 @@ func UploadReport(file *os.File) error {
5556
return fmt.Errorf("failed to upload to S3: %w", err)
5657
}
5758

58-
fmt.Printf("Successfully uploaded %s to S3\n", file.Name())
59+
logrus.Infof("Successfully uploaded %s to S3\n", file.Name())
5960

6061
return nil
6162
}
6263

63-
func ReadLogsFromFile(fileName string) (*os.File, error) {
64+
func readLogsFromFile(fileName string) (*os.File, error) {
6465
file, err := os.Open(fileName)
6566
if err != nil {
6667
return nil, fmt.Errorf("error opening file: %w", err)

0 commit comments

Comments
 (0)