Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build env update for linux on arm #651

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

build env update for linux on arm #651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b7b4ac
build env update for linux on arm
jc-rh Sep 6, 2024
f3f16bd
Skip precaching pull retry on unknown manifest and detect digests mad…
jc-rh Oct 1, 2024
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
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -mod=vendor -a

#####################################################################################################
# Build the operator image
# note: update origin-cli-artifacts from `latest` to an appropriate OCP verison during release e.g `4.18`
FROM quay.io/openshift/origin-cli-artifacts:latest AS origincli
# note: update origin-cli-artifacts from `latest` to an appropriate OCP verison during release e.g `4.17`
FROM --platform=linux/amd64 quay.io/openshift/origin-cli-artifacts:latest AS origincli
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest

RUN if [[ ! -f /bin/nsenter ]]; then \
Expand Down
10 changes: 7 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:$(VERSION)
IMG ?= $(IMAGE_TAG_BASE):$(VERSION)

CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
OPERATOR_SDK = $(shell pwd)/bin/x86_64/operator-sdk
OPERATOR_SDK = $(shell pwd)/bin/operator-sdk
KUSTOMIZE = $(shell pwd)/bin/kustomize
GOTESTSUM = $(shell pwd)/bin/gotestsum
MOCK_GEN = $(shell pwd)/bin/mockgen
Expand All @@ -80,7 +80,7 @@ generate-code: ## Generate code containing Clientset, Informers, Listers
hack/update-codegen.sh

controller-gen: ## Download controller-gen locally if necessary.
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.13.0)
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0)

mock-gen: ## Download mockgen locally if necessary.
$(call go-get-tool,$(MOCK_GEN),go.uber.org/mock/[email protected])
Expand Down Expand Up @@ -147,7 +147,11 @@ OPERATOR_SDK_VERSION = $(shell $(OPERATOR_SDK) version 2>/dev/null | sed 's/^ope
OPERATOR_SDK_VERSION_REQ = v1.28.0-ocp
operator-sdk: ## Download operator-sdk locally if necessary.
ifneq ($(OPERATOR_SDK_VERSION_REQ),$(OPERATOR_SDK_VERSION))
curl -L https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/operator-sdk/4.13.11/operator-sdk-v1.28.0-ocp-linux-x86_64.tar.gz | tar -xz -C bin/
@{ \
set -e ;\
OS=$(shell go env GOOS) && ARCH=$(shell arch) && if [ $${ARCH} == "arm64" ]; then ARCH=aarch64; fi; \
curl -Lv https://mirror.openshift.com/pub/openshift-v4/$${ARCH}/clients/operator-sdk/4.13.11/operator-sdk-v1.28.0-ocp-$${OS}-$${ARCH}.tar.gz | tar --strip-components 2 -xz -C bin/ ;\
}
endif

# go-get-tool will 'go get' any package $2 and install it to $1.
Expand Down
107 changes: 57 additions & 50 deletions bundle/manifests/lca.openshift.io_imagebasedupgrades.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading