Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .obs/chartfile/elemental-operator-crds-helm/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# SPDX-License-Identifier: Apache-2.0
#!BuildTag: rancher/elemental-operator-crds-chart:latest
#!BuildTag: rancher/elemental-operator-crds-chart:%VERSION%
#!BuildTag: rancher/elemental-operator-crds-chart:%VERSION%-%RELEASE%
apiVersion: v2
Expand Down
1 change: 0 additions & 1 deletion .obs/chartfile/elemental-operator-helm/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# SPDX-License-Identifier: Apache-2.0
#!BuildTag: rancher/elemental-operator-chart:latest
#!BuildTag: rancher/elemental-operator-chart:%VERSION%
#!BuildTag: rancher/elemental-operator-chart:%VERSION%-%RELEASE%
apiVersion: v2
Expand Down
3 changes: 1 addition & 2 deletions .obs/dockerfile/operator-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# SPDX-License-Identifier: Apache-2.0
# Define the names/tags of the container
#!BuildTag: rancher/elemental-operator:latest
#!BuildTag: rancher/elemental-operator:%VERSION%
#!BuildTag: rancher/elemental-operator:%VERSION%-%RELEASE%
#!UseOBSRepositories
Expand All @@ -20,7 +19,7 @@ COPY --from=BASE /installroot /
RUN /usr/sbin/update-ca-certificates

ARG BUILD_REPO=%%IMG_REPO%%
ARG IMAGE_REPO=$BUILD_REPO/rancher/elemental-operator:latest
ARG IMAGE_REPO=$BUILD_REPO/rancher/elemental-operator:%VERSION%-%RELEASE%

# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=com.suse.elemental
Expand Down
3 changes: 1 addition & 2 deletions .obs/dockerfile/seedimage-builder/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# SPDX-License-Identifier: Apache-2.0
# Define the names/tags of the container
#!BuildTag: rancher/seedimage-builder:latest
#!BuildTag: rancher/seedimage-builder:%VERSION%
#!BuildTag: rancher/seedimage-builder:%VERSION%-%RELEASE%
#!UseOBSRepositories
Expand All @@ -20,7 +19,7 @@ COPY --from=BASE /installroot /
RUN /usr/sbin/update-ca-certificates

ARG BUILD_REPO=%%IMG_REPO%%
ARG IMAGE_REPO=$BUILD_REPO/rancher/elemental-seedimage-builder-image:latest
ARG IMAGE_REPO=$BUILD_REPO/rancher/elemental-seedimage-builder-image:%VERSION%-%RELEASE%

# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=com.suse.elemental
Expand Down
124 changes: 0 additions & 124 deletions .obs/specfile/elemental-register/elemental-register.spec

This file was deleted.

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ GINKGO_VER := $(shell go list -m github.com/onsi/ginkgo/v2 | awk '{print $$2}')
GINKGO := $(ABS_TOOLS_DIR)/ginkgo-$(GINKGO_VER)
GINKGO_PKG := github.com/onsi/ginkgo/v2/ginkgo

SETUP_ENVTEST_VER := v0.0.0-20240213082838-4282ca1767dc
SETUP_ENVTEST_VER := release-0.22
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

the old version doesn't seem to be available anymore...

SETUP_ENVTEST := $(ABS_TOOLS_DIR)/setup-envtest-$(SETUP_ENVTEST_VER)
SETUP_ENVTEST_PKG := sigs.k8s.io/controller-runtime/tools/setup-envtest

Expand Down