From 3c4d67eb506824b0b554f613299593eca37a64cc Mon Sep 17 00:00:00 2001 From: Alejandro Ruiz Date: Thu, 11 Jan 2024 10:43:13 +0100 Subject: [PATCH 1/2] Remove s390x --- .drone.yml | 91 ------------------------------------------------------ 1 file changed, 91 deletions(-) diff --git a/.drone.yml b/.drone.yml index ce5548dcfc..01dc56d587 100644 --- a/.drone.yml +++ b/.drone.yml @@ -212,96 +212,6 @@ volumes: --- -kind: pipeline -type: docker -name: linux-s390x -platform: - os: linux - arch: amd64 -# Hack needed for s390x: https://gist.github.com/colstrom/c2f359f72658aaabb44150ac20b16d7c#gistcomment-3858388 -node: - arch: s390x -steps: -- name: build - image: rancher/dapper:v0.5.8 - commands: - - dapper build - volumes: - - name: docker - path: /var/run/docker.sock -- name: github_binary_release - image: rancher/drone-images:github-release-s390x - settings: - api_key: - from_secret: github_token - prerelease: true - checksum: - - sha256 - checksum_file: CHECKSUMsum-s390x.txt - checksum_flatten: true - files: - - "dist/artifacts/*" - when: - instance: - - drone-publish.rancher.io - ref: - - refs/head/master - - refs/tags/* - event: - - tag -- name: docker-publish-agent - image: rancher/drone-images:docker-s390x - volumes: - - name: docker - path: /var/run/docker.sock - settings: - dockerfile: package/Dockerfile.agent - password: - from_secret: docker_password - repo: "rancher/fleet-agent" - tag: "${DRONE_TAG}-linux-s390x" - username: - from_secret: docker_username - build_args: - - "ARCH=s390x" - when: - instance: - - drone-publish.rancher.io - ref: - - refs/head/master - - refs/tags/* - event: - - tag -- name: docker-publish - image: rancher/drone-images:docker-s390x - volumes: - - name: docker - path: /var/run/docker.sock - settings: - dockerfile: package/Dockerfile - password: - from_secret: docker_password - repo: "rancher/fleet" - tag: "${DRONE_TAG}-linux-s390x" - username: - from_secret: docker_username - build_args: - - "ARCH=s390x" - when: - instance: - - drone-publish.rancher.io - ref: - - refs/head/master - - refs/tags/* - event: - - tag -volumes: -- name: docker - host: - path: /var/run/docker.sock - ---- - kind: pipeline type: docker name: windows-1809 @@ -444,4 +354,3 @@ depends_on: - linux-arm64 - windows-1809 - windows-2022 -- linux-s390x From 5e4fbd84f1b7f2294dd3f28ed2b03536decdf31e Mon Sep 17 00:00:00 2001 From: Alejandro Ruiz Date: Thu, 11 Jan 2024 10:47:08 +0100 Subject: [PATCH 2/2] go generate to update copyright years --- pkg/apis/fleet.cattle.io/v1alpha1/doc.go | 2 +- pkg/apis/fleet.cattle.io/v1alpha1/zz_generated_deepcopy.go | 2 +- pkg/apis/fleet.cattle.io/v1alpha1/zz_generated_list_types.go | 2 +- pkg/apis/fleet.cattle.io/v1alpha1/zz_generated_register.go | 2 +- pkg/apis/fleet.cattle.io/zz_generated_register.go | 2 +- pkg/generated/controllers/fleet.cattle.io/factory.go | 2 +- pkg/generated/controllers/fleet.cattle.io/interface.go | 2 +- pkg/generated/controllers/fleet.cattle.io/v1alpha1/bundle.go | 2 +- .../controllers/fleet.cattle.io/v1alpha1/bundledeployment.go | 2 +- .../fleet.cattle.io/v1alpha1/bundlenamespacemapping.go | 2 +- pkg/generated/controllers/fleet.cattle.io/v1alpha1/cluster.go | 2 +- .../controllers/fleet.cattle.io/v1alpha1/clustergroup.go | 2 +- .../controllers/fleet.cattle.io/v1alpha1/clusterregistration.go | 2 +- .../fleet.cattle.io/v1alpha1/clusterregistrationtoken.go | 2 +- pkg/generated/controllers/fleet.cattle.io/v1alpha1/content.go | 2 +- pkg/generated/controllers/fleet.cattle.io/v1alpha1/gitrepo.go | 2 +- .../controllers/fleet.cattle.io/v1alpha1/gitreporestriction.go | 2 +- pkg/generated/controllers/fleet.cattle.io/v1alpha1/imagescan.go | 2 +- pkg/generated/controllers/fleet.cattle.io/v1alpha1/interface.go | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkg/apis/fleet.cattle.io/v1alpha1/doc.go b/pkg/apis/fleet.cattle.io/v1alpha1/doc.go index 99f552e33e..4a251048f1 100644 --- a/pkg/apis/fleet.cattle.io/v1alpha1/doc.go +++ b/pkg/apis/fleet.cattle.io/v1alpha1/doc.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 - 2023 SUSE LLC +Copyright (c) 2020 - 2024 SUSE LLC Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/fleet.cattle.io/v1alpha1/zz_generated_deepcopy.go b/pkg/apis/fleet.cattle.io/v1alpha1/zz_generated_deepcopy.go index feaae867c7..0c8501d809 100644 --- a/pkg/apis/fleet.cattle.io/v1alpha1/zz_generated_deepcopy.go +++ b/pkg/apis/fleet.cattle.io/v1alpha1/zz_generated_deepcopy.go @@ -2,7 +2,7 @@ // +build !ignore_autogenerated /* -Copyright (c) 2020 - 2023 SUSE LLC +Copyright (c) 2020 - 2024 SUSE LLC Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/fleet.cattle.io/v1alpha1/zz_generated_list_types.go b/pkg/apis/fleet.cattle.io/v1alpha1/zz_generated_list_types.go index c28f058d65..4c84153012 100644 --- a/pkg/apis/fleet.cattle.io/v1alpha1/zz_generated_list_types.go +++ b/pkg/apis/fleet.cattle.io/v1alpha1/zz_generated_list_types.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 - 2023 SUSE LLC +Copyright (c) 2020 - 2024 SUSE LLC Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/fleet.cattle.io/v1alpha1/zz_generated_register.go b/pkg/apis/fleet.cattle.io/v1alpha1/zz_generated_register.go index 7a481efcb8..ac04045571 100644 --- a/pkg/apis/fleet.cattle.io/v1alpha1/zz_generated_register.go +++ b/pkg/apis/fleet.cattle.io/v1alpha1/zz_generated_register.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 - 2023 SUSE LLC +Copyright (c) 2020 - 2024 SUSE LLC Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/apis/fleet.cattle.io/zz_generated_register.go b/pkg/apis/fleet.cattle.io/zz_generated_register.go index 5f7e06cb02..9e41ac8de4 100644 --- a/pkg/apis/fleet.cattle.io/zz_generated_register.go +++ b/pkg/apis/fleet.cattle.io/zz_generated_register.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 - 2023 SUSE LLC +Copyright (c) 2020 - 2024 SUSE LLC Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/controllers/fleet.cattle.io/factory.go b/pkg/generated/controllers/fleet.cattle.io/factory.go index 89d2fb079d..9ac96f115d 100644 --- a/pkg/generated/controllers/fleet.cattle.io/factory.go +++ b/pkg/generated/controllers/fleet.cattle.io/factory.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 - 2023 SUSE LLC +Copyright (c) 2020 - 2024 SUSE LLC Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/controllers/fleet.cattle.io/interface.go b/pkg/generated/controllers/fleet.cattle.io/interface.go index 49de012560..42fe1afe15 100644 --- a/pkg/generated/controllers/fleet.cattle.io/interface.go +++ b/pkg/generated/controllers/fleet.cattle.io/interface.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 - 2023 SUSE LLC +Copyright (c) 2020 - 2024 SUSE LLC Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/bundle.go b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/bundle.go index e4315631d1..27205ecfc5 100644 --- a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/bundle.go +++ b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/bundle.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 - 2023 SUSE LLC +Copyright (c) 2020 - 2024 SUSE LLC Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/bundledeployment.go b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/bundledeployment.go index 4d6b053505..5a13b2f196 100644 --- a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/bundledeployment.go +++ b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/bundledeployment.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 - 2023 SUSE LLC +Copyright (c) 2020 - 2024 SUSE LLC Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/bundlenamespacemapping.go b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/bundlenamespacemapping.go index f910707172..c442bd1a44 100644 --- a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/bundlenamespacemapping.go +++ b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/bundlenamespacemapping.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 - 2023 SUSE LLC +Copyright (c) 2020 - 2024 SUSE LLC Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/cluster.go b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/cluster.go index d457499150..9b98d2d660 100644 --- a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/cluster.go +++ b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/cluster.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 - 2023 SUSE LLC +Copyright (c) 2020 - 2024 SUSE LLC Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/clustergroup.go b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/clustergroup.go index 522cad4039..ce917aa766 100644 --- a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/clustergroup.go +++ b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/clustergroup.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 - 2023 SUSE LLC +Copyright (c) 2020 - 2024 SUSE LLC Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/clusterregistration.go b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/clusterregistration.go index 85acd1d7d4..e56f50e34d 100644 --- a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/clusterregistration.go +++ b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/clusterregistration.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 - 2023 SUSE LLC +Copyright (c) 2020 - 2024 SUSE LLC Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/clusterregistrationtoken.go b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/clusterregistrationtoken.go index 770fd23b1e..87a0ca60b9 100644 --- a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/clusterregistrationtoken.go +++ b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/clusterregistrationtoken.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 - 2023 SUSE LLC +Copyright (c) 2020 - 2024 SUSE LLC Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/content.go b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/content.go index 6be3b880f5..047907e70a 100644 --- a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/content.go +++ b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/content.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 - 2023 SUSE LLC +Copyright (c) 2020 - 2024 SUSE LLC Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/gitrepo.go b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/gitrepo.go index 7c83cf4292..7724ffb999 100644 --- a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/gitrepo.go +++ b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/gitrepo.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 - 2023 SUSE LLC +Copyright (c) 2020 - 2024 SUSE LLC Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/gitreporestriction.go b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/gitreporestriction.go index 63108e1816..c1c2486ceb 100644 --- a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/gitreporestriction.go +++ b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/gitreporestriction.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 - 2023 SUSE LLC +Copyright (c) 2020 - 2024 SUSE LLC Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/imagescan.go b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/imagescan.go index 58b5357327..b08cd2634c 100644 --- a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/imagescan.go +++ b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/imagescan.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 - 2023 SUSE LLC +Copyright (c) 2020 - 2024 SUSE LLC Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/interface.go b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/interface.go index e37d42d903..36906de8c3 100644 --- a/pkg/generated/controllers/fleet.cattle.io/v1alpha1/interface.go +++ b/pkg/generated/controllers/fleet.cattle.io/v1alpha1/interface.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2020 - 2023 SUSE LLC +Copyright (c) 2020 - 2024 SUSE LLC Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.