diff --git a/.obs/workflows.yml b/.obs/workflows.yml index d1a8d0f..74a6495 100644 --- a/.obs/workflows.yml +++ b/.obs/workflows.yml @@ -74,10 +74,6 @@ staging_build: source_package: upgrade-controller source_project: isv:SUSE:Edge:Factory target_project: isv:SUSE:Edge:Factory:Staging - - branch_package: - source_package: cluster-api-provider-rke2 - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging - branch_package: source_package: nm-configurator source_project: isv:SUSE:Edge:Factory @@ -138,10 +134,6 @@ staging_build: source_package: ironic-ipa-downloader-image source_project: isv:SUSE:Edge:Factory target_project: isv:SUSE:Edge:Factory:Staging - - branch_package: - source_package: cluster-api-provider-rke2-controlplane-image - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging - branch_package: source_package: upgrade-controller-image source_project: isv:SUSE:Edge:Factory @@ -154,10 +146,6 @@ staging_build: source_package: baremetal-operator-image source_project: isv:SUSE:Edge:Factory target_project: isv:SUSE:Edge:Factory:Staging - - branch_package: - source_package: cluster-api-provider-rke2-bootstrap-image - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging - branch_package: source_package: sriov-network-operator-chart source_project: isv:SUSE:Edge:Factory diff --git a/cluster-api-provider-rke2-bootstrap-image/Dockerfile b/cluster-api-provider-rke2-bootstrap-image/Dockerfile deleted file mode 100644 index d710210..0000000 --- a/cluster-api-provider-rke2-bootstrap-image/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -#!BuildTag: %%IMG_PREFIX%%cluster-api-provider-rke2-bootstrap:v%%cluster-api-provider-rke2_version%% -#!BuildTag: %%IMG_PREFIX%%cluster-api-provider-rke2-bootstrap:%%cluster-api-provider-rke2_version%% -#!BuildTag: %%IMG_PREFIX%%cluster-api-provider-rke2-bootstrap:%%cluster-api-provider-rke2_version%%-%RELEASE% -#!BuildVersion: 15.6 -ARG SLE_VERSION -FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro - -FROM registry.suse.com/bci/bci-base:$SLE_VERSION AS base -COPY --from=micro / /installroot/ -RUN zypper --installroot /installroot --non-interactive install --no-recommends cluster-api-provider-rke2-bootstrap shadow; zypper -n clean; rm -rf /var/log/* - -FROM micro AS final -# Define labels according to https://en.opensuse.org/Building_derived_containers -# labelprefix=com.suse.application.cluster-api-provider-rke2 -LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)" -LABEL org.opencontainers.image.title="SLE cluster-api-provider-rke2 Container Image" -LABEL org.opencontainers.image.description="cluster-api-provider-rke2 based on the SLE Base Container Image." -LABEL org.opencontainers.image.version="%%cluster-api-provider-rke2_version%%" -LABEL org.opencontainers.image.url="https://www.suse.com/products/server/" -LABEL org.opencontainers.image.created="%BUILDTIME%" -LABEL org.opencontainers.image.vendor="SUSE LLC" -LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%cluster-api-provider-rke2-bootstrap:%%cluster-api-provider-rke2_version%%-%RELEASE%" -LABEL org.openbuildservice.disturl="%DISTURL%" -LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%" -LABEL com.suse.eula="SUSE Combined EULA February 2024" -LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle" -LABEL com.suse.image-type="application" -LABEL com.suse.release-stage="released" -# endlabelprefix - -COPY --from=base /installroot / -RUN mv /usr/bin/rke2-bootstrap-manager /manager -# Use uid of nonroot user (65532) because kubernetes expects numeric user when applying pod security policies -USER 65532 -ENTRYPOINT [ "/manager" ] diff --git a/cluster-api-provider-rke2-bootstrap-image/_service b/cluster-api-provider-rke2-bootstrap-image/_service deleted file mode 100644 index d14623e..0000000 --- a/cluster-api-provider-rke2-bootstrap-image/_service +++ /dev/null @@ -1,19 +0,0 @@ - - - - - Dockerfile - %%cluster-api-provider-rke2_version%% - cluster-api-provider-rke2-bootstrap - patch - - - Dockerfile - IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix}) - IMG_PREFIX - IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo) - IMG_REPO - SUPPORT_LEVEL=$(rpm --macros=/root/.rpmmacros -E %support_level) - SUPPORT_LEVEL - - diff --git a/cluster-api-provider-rke2-controlplane-image/Dockerfile b/cluster-api-provider-rke2-controlplane-image/Dockerfile deleted file mode 100644 index 15dcbfa..0000000 --- a/cluster-api-provider-rke2-controlplane-image/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -#!BuildTag: %%IMG_PREFIX%%cluster-api-provider-rke2-controlplane:v%%cluster-api-provider-rke2_version%% -#!BuildTag: %%IMG_PREFIX%%cluster-api-provider-rke2-controlplane:%%cluster-api-provider-rke2_version%% -#!BuildTag: %%IMG_PREFIX%%cluster-api-provider-rke2-controlplane:%%cluster-api-provider-rke2_version%%-%RELEASE% -#!BuildVersion: 15.6 -ARG SLE_VERSION -FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro - -FROM registry.suse.com/bci/bci-base:$SLE_VERSION AS base -COPY --from=micro / /installroot/ -RUN zypper --installroot /installroot --non-interactive install --no-recommends cluster-api-provider-rke2-control-plane shadow; zypper -n clean; rm -rf /var/log/* - -FROM micro AS final -# Define labels according to https://en.opensuse.org/Building_derived_containers -# labelprefix=com.suse.application.cluster-api-provider-rke2 -LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)" -LABEL org.opencontainers.image.title="SLE cluster-api-provider-rke2 Container Image" -LABEL org.opencontainers.image.description="cluster-api-provider-rke2 based on the SLE Base Container Image." -LABEL org.opencontainers.image.version="%%cluster-api-provider-rke2_version%%" -LABEL org.opencontainers.image.url="https://www.suse.com/products/server/" -LABEL org.opencontainers.image.created="%BUILDTIME%" -LABEL org.opencontainers.image.vendor="SUSE LLC" -LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%cluster-api-provider-rke2-controlplane:%%cluster-api-provider-rke2_version%%-%RELEASE%" -LABEL org.openbuildservice.disturl="%DISTURL%" -LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%" -LABEL com.suse.eula="SUSE Combined EULA February 2024" -LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle" -LABEL com.suse.image-type="application" -LABEL com.suse.release-stage="released" -# endlabelprefix - -COPY --from=base /installroot / -RUN mv /usr/bin/rke2-control-plane-manager /manager -# Use uid of nonroot user (65532) because kubernetes expects numeric user when applying pod security policies -USER 65532 -ENTRYPOINT [ "/manager" ] diff --git a/cluster-api-provider-rke2-controlplane-image/_service b/cluster-api-provider-rke2-controlplane-image/_service deleted file mode 100644 index e7c74e7..0000000 --- a/cluster-api-provider-rke2-controlplane-image/_service +++ /dev/null @@ -1,19 +0,0 @@ - - - - - Dockerfile - %%cluster-api-provider-rke2_version%% - cluster-api-provider-rke2-control-plane - patch - - - Dockerfile - IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix}) - IMG_PREFIX - IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo) - IMG_REPO - SUPPORT_LEVEL=$(rpm --macros=/root/.rpmmacros -E %support_level) - SUPPORT_LEVEL - - diff --git a/cluster-api-provider-rke2/_service b/cluster-api-provider-rke2/_service deleted file mode 100644 index 5e28b2c..0000000 --- a/cluster-api-provider-rke2/_service +++ /dev/null @@ -1,23 +0,0 @@ - - - https://github.com/rancher-sandbox/cluster-api-provider-rke2 - git - v0.8.0 - _auto_ - @PARENT_TAG@ - enable - steven.hardy@suse.com - v* - v(\d+\.\d+\.\d+) - yes - \1 - - - - *.tar - gz - - - - - diff --git a/cluster-api-provider-rke2/cluster-api-provider-rke2.spec b/cluster-api-provider-rke2/cluster-api-provider-rke2.spec deleted file mode 100644 index a23b9f6..0000000 --- a/cluster-api-provider-rke2/cluster-api-provider-rke2.spec +++ /dev/null @@ -1,61 +0,0 @@ -# -# spec file for package cluster-api-provider-rke2 -# -# Copyright (c) 2023 SUSE LLC -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via https://bugs.opensuse.org/ -# - - -Name: cluster-api-provider-rke2 -Version: 0.8.0 -Release: 0 -Summary: Cluster API provider for RKE2 -License: Apache-2.0 -URL: https://github.com/rancher-sandbox/cluster-api-provider-rke2 -Source: cluster-api-provider-rke2-%{version}.tar.gz -Source1: vendor.tar.gz -BuildRequires: golang(API) = 1.22 -ExcludeArch: s390 -ExcludeArch: %{ix86} - -%description - -Cluster API provider for RKE2 - -%package bootstrap -Summary: Cluster API bootstrap controller for RKE2 -%description bootstrap -Cluster API bootstrap controller for RKE2 - -%package control-plane -Summary: Cluster API control-plane controller for RKE2 -%description control-plane -Cluster API control-plane controller for RKE2 - -%prep -%autosetup -a1 -n cluster-api-provider-rke2-%{version} - -%build -make managers - -%install -install -D -m0755 bin/rke2-bootstrap-manager %{buildroot}%{_bindir}/rke2-bootstrap-manager -install -D -m0755 bin/rke2-control-plane-manager %{buildroot}%{_bindir}/rke2-control-plane-manager - -%files bootstrap -%{_bindir}/rke2-bootstrap-manager - -%files control-plane -%{_bindir}/rke2-control-plane-manager - -%changelog