diff --git a/.obs/workflows.yml b/.obs/workflows.yml index 82231a8..6e07b82 100644 --- a/.obs/workflows.yml +++ b/.obs/workflows.yml @@ -94,26 +94,14 @@ staging_build: source_package: hauler source_project: isv:SUSE:Edge:Factory target_project: isv:SUSE:Edge:Factory:Staging - - branch_package: - source_package: ip-address-manager - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging - branch_package: source_package: baremetal-operator source_project: isv:SUSE:Edge:Factory target_project: isv:SUSE:Edge:Factory:Staging - - branch_package: - source_package: cluster-api-provider-metal3 - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging - branch_package: source_package: cdi-chart source_project: isv:SUSE:Edge:Factory target_project: isv:SUSE:Edge:Factory:Staging - - branch_package: - source_package: cluster-api-provider-metal3-image - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging - branch_package: source_package: metallb-chart source_project: isv:SUSE:Edge:Factory @@ -154,10 +142,6 @@ staging_build: source_package: metallb-controller-image source_project: isv:SUSE:Edge:Factory target_project: isv:SUSE:Edge:Factory:Staging - - branch_package: - source_package: ip-address-manager-image - source_project: isv:SUSE:Edge:Factory - target_project: isv:SUSE:Edge:Factory:Staging - branch_package: source_package: metallb-speaker-image source_project: isv:SUSE:Edge:Factory diff --git a/cluster-api-provider-metal3-image/Dockerfile b/cluster-api-provider-metal3-image/Dockerfile deleted file mode 100644 index f7490b9..0000000 --- a/cluster-api-provider-metal3-image/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -#!BuildTag: %%IMG_PREFIX%%cluster-api-provider-metal3:v%%cluster-api-provider-metal3_version%% -#!BuildTag: %%IMG_PREFIX%%cluster-api-provider-metal3:%%cluster-api-provider-metal3_version%% -#!BuildTag: %%IMG_PREFIX%%cluster-api-provider-metal3:%%cluster-api-provider-metal3_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-metal3 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-metal3 -LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)" -LABEL org.opencontainers.image.title="SLE cluster-api-provider-metal3 Container Image" -LABEL org.opencontainers.image.description="cluster-api-provider-metal3 based on the SLE Base Container Image." -LABEL org.opencontainers.image.version="%%cluster-api-provider-metal3_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-metal3:%%cluster-api-provider-metal3_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/cluster-api-provider-metal3 /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-metal3-image/_service b/cluster-api-provider-metal3-image/_service deleted file mode 100644 index 9030996..0000000 --- a/cluster-api-provider-metal3-image/_service +++ /dev/null @@ -1,19 +0,0 @@ - - - - - Dockerfile - %%cluster-api-provider-metal3_version%% - cluster-api-provider-metal3 - 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-metal3/_service b/cluster-api-provider-metal3/_service deleted file mode 100644 index 05c5946..0000000 --- a/cluster-api-provider-metal3/_service +++ /dev/null @@ -1,23 +0,0 @@ - - - https://github.com/metal3-io/cluster-api-provider-metal3 - git - v1.7.2 - _auto_ - @PARENT_TAG@ - enable - steven.hardy@suse.com - v* - v(\d+\.\d+\.\d+) - yes - \1 - - - - *.tar - gz - - - - - diff --git a/cluster-api-provider-metal3/cluster-api-provider-metal3.spec b/cluster-api-provider-metal3/cluster-api-provider-metal3.spec deleted file mode 100644 index 31d6fa3..0000000 --- a/cluster-api-provider-metal3/cluster-api-provider-metal3.spec +++ /dev/null @@ -1,54 +0,0 @@ -# -# spec file for package cluster-api-provider-metal3 -# -# 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-metal3 -Version: 1.7.2 -Release: 0 -Summary: Cluster API Infrastructure Provider for Metal3 -License: Apache-2.0 -URL: https://github.com/metal3-io/cluster-api-provider-metal3 -Source: cluster-api-provider-metal3-%{version}.tar.gz -Source1: vendor.tar.gz -BuildRequires: golang(API) = 1.22 -ExcludeArch: s390 -ExcludeArch: %{ix86} - -%description - -Cluster API Provider Metal3 is one of the providers for Cluster API and enables -users to deploy a Cluster API based cluster on top of bare metal infrastructure -using Metal3. - -%prep -%autosetup -a1 -n cluster-api-provider-metal3-%{version} - -%build -go build \ - -mod=vendor \ - -buildmode=pie \ - -a -ldflags '-extldflags "-static"' - -%install -install -D -m0755 cluster-api-provider-metal3 %{buildroot}%{_bindir}/cluster-api-provider-metal3 - -%files -%license LICENSE -%doc README.md -%{_bindir}/cluster-api-provider-metal3 - -%changelog diff --git a/ip-address-manager-image/Dockerfile b/ip-address-manager-image/Dockerfile deleted file mode 100644 index 8e91d8b..0000000 --- a/ip-address-manager-image/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -#!BuildTag: %%IMG_PREFIX%%ip-address-manager:v%%ip-address-manager_version%% -#!BuildTag: %%IMG_PREFIX%%ip-address-manager:%%ip-address-manager_version%% -#!BuildTag: %%IMG_PREFIX%%ip-address-manager:%%ip-address-manager_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 ip-address-manager 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.ip-address-manager -LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)" -LABEL org.opencontainers.image.title="SLE ip-address-manager Container Image" -LABEL org.opencontainers.image.description="ip-address-manager based on the SLE Base Container Image." -LABEL org.opencontainers.image.version="%%ip-address-manager_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%%ip-address-manager:%%ip-address-manager_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/ip-address-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/ip-address-manager-image/_service b/ip-address-manager-image/_service deleted file mode 100644 index 0a33cbf..0000000 --- a/ip-address-manager-image/_service +++ /dev/null @@ -1,19 +0,0 @@ - - - - - Dockerfile - %%ip-address-manager_version%% - ip-address-manager - 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/ip-address-manager/_service b/ip-address-manager/_service deleted file mode 100644 index a20e69b..0000000 --- a/ip-address-manager/_service +++ /dev/null @@ -1,23 +0,0 @@ - - - https://github.com/metal3-io/ip-address-manager - git - v1.7.2 - _auto_ - @PARENT_TAG@ - enable - steven.hardy@suse.com - v* - v(\d+\.\d+\.\d+) - yes - \1 - - - - *.tar - gz - - - - - diff --git a/ip-address-manager/ip-address-manager.spec b/ip-address-manager/ip-address-manager.spec deleted file mode 100644 index 319b3fa..0000000 --- a/ip-address-manager/ip-address-manager.spec +++ /dev/null @@ -1,51 +0,0 @@ -# -# spec file for package ip-address-manager -# -# 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: ip-address-manager -Version: 1.7.2 -Release: 0 -Summary: Metal3 IPAM controller -License: Apache-2.0 -URL: https://github.com/metal3-io/ip-address-manager -Source: ip-address-manager-%{version}.tar.gz -Source1: vendor.tar.gz -BuildRequires: golang(API) = 1.22 -ExcludeArch: s390 -ExcludeArch: %{ix86} - -%description - -Metal3 IPAM controller - -%prep -%autosetup -a1 -n ip-address-manager-%{version} - -%build -go build \ - -mod=vendor \ - -buildmode=pie \ - -%install -install -D -m0755 ip-address-manager %{buildroot}%{_bindir}/ip-address-manager - -%files -%license LICENSE -%doc README.md -%{_bindir}/ip-address-manager - -%changelog