Skip to content
Closed
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
12 changes: 0 additions & 12 deletions Dockerfile.openshift
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22 AS builder

#
# CCM binary builder
#
Expand All @@ -10,16 +9,6 @@ RUN GO111MODULE=on CGO_ENABLED=0 GOOS=${GOOS} GOPROXY=${GOPROXY} go build \
-o=aws-cloud-controller-manager \
cmd/aws-cloud-controller-manager/main.go

#
# OpenShift Tests Extension binary builder
#
RUN pushd tests/aws-cloud-controller-manager-tests-ext && \
GO111MODULE=on CGO_ENABLED=0 GOOS=${GOOS} GOPROXY=${GOPROXY} go build \
-trimpath \
-ldflags="-w -s -X 'main.version=${VERSION}'" \
-o=/build/aws-cloud-controller-manager-tests-ext . && \
gzip /build/aws-cloud-controller-manager-tests-ext

#
# Main stage
#
Expand All @@ -28,6 +17,5 @@ FROM registry.ci.openshift.org/ocp/4.22:base-rhel9
LABEL description="AWS Cloud Controller Manager"

COPY --from=builder /build/aws-cloud-controller-manager /bin/aws-cloud-controller-manager
COPY --from=builder /build/aws-cloud-controller-manager-tests-ext.gz /bin/aws-cloud-controller-manager-tests-ext.gz

ENTRYPOINT [ "/bin/aws-cloud-controller-manager" ]
8 changes: 0 additions & 8 deletions openshift-hack/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,6 @@ GIT_VERSION ?= $(shell git describe --dirty --tags --match='v*')
VERSION ?= $(GIT_VERSION)
LDFLAGS ?= -w -s -X k8s.io/component-base/version.gitVersion=$(VERSION) -X main.gitVersion=$(VERSION)

.PHONY: aws-cloud-controller-manager-tests-ext
aws-cloud-controller-manager-tests-ext:
pushd tests/aws-cloud-controller-manager-tests-ext && \
GO111MODULE=on CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) GOPROXY=$(GOPROXY) go build \
-trimpath \
-ldflags="$(LDFLAGS)" \
-o=../../aws-cloud-controller-manager-tests-ext .

.PHONY: image
image:
podman build -f Dockerfile.openshift \
Expand Down
47 changes: 0 additions & 47 deletions openshift-hack/devel.md

This file was deleted.

69 changes: 0 additions & 69 deletions tests/aws-cloud-controller-manager-tests-ext/README.md

This file was deleted.

196 changes: 0 additions & 196 deletions tests/aws-cloud-controller-manager-tests-ext/e2e/helper.go

This file was deleted.

Loading