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

Merge all of porch's go modules into a single go module #107

Merged
merged 7 commits into from
Sep 6, 2024
Merged

Merge all of porch's go modules into a single go module #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1ff6401
Merge whole porch into a single module
kispaljr Aug 27, 2024
6d0821f
Merge remote-tracking branch 'origin/main' into single-module
kispaljr Sep 3, 2024
8832fd1
Internalize KRM function code from GoogleContainerTools/kpt-functions…
kispaljr Sep 5, 2024
a71e004
Merge remote-tracking branch 'origin/main' into single-module
kispaljr Sep 5, 2024
54bf53e
Remove kpt-fn SDK version pinning, since it is replaced by internaliz…
kispaljr Sep 5, 2024
449b42f
Downgrade built-in set-namespace KRM fn's behavior to earlier version
kispaljr Sep 5, 2024
18ab2a0
Turn KRM function panics into errors in the built-in runtime
kispaljr Sep 5, 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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ GO_MODULES = \

.PHONY: tidy
tidy:
@for f in $(GO_MODULES); do (cd $$f; echo "Tidying $$f"; go mod tidy) || exit 1; done
go mod tidy

.PHONY: configure-git
configure-git:
Expand Down
52 changes: 0 additions & 52 deletions api/go.mod
View file
Open in desktop

This file was deleted.

145 changes: 0 additions & 145 deletions api/go.sum
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,9 @@ WORKDIR /go/src
# and so that source changes don't invalidate our downloaded layer

COPY go.mod go.sum ./
COPY api/go.mod api/go.sum ./api/

RUN echo "Downloading porch modules ..." \
&& go mod download
RUN echo "Downloading api modules ..." \
&& cd api && go mod download

ENV CGO_ENABLED=0
# Prebuild some library dependencies to warm the cache
Expand Down
3 changes: 0 additions & 3 deletions controllers/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,9 @@ WORKDIR /go/src
# cache deps before building and copying source so that we don't need to re-download as much
# and so that source changes don't invalidate our downloaded layer
COPY go.mod go.sum ./
COPY api/go.mod api/go.sum ./api/

RUN echo "Downloading porch modules ..." \
&& go mod download
RUN echo "Downloading api modules ..." \
&& cd api && go mod download

ENV CGO_ENABLED=0
# Prebuild some library dependencies to warm the cache
Expand Down
9 changes: 0 additions & 9 deletions controllers/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,6 @@ IMAGE_TAG ?= latest
IMAGE_REPO ?= docker.io/nephio
IMAGE_NAME ?= porch-controllers

# This includes the following targets:
Copy link
Collaborator

Choose a reason for hiding this comment

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

No longer needed?

# test, unit, unit-clean,
# gosec, lint,
# fmt, vet
include ../default-go.mk

# This includes the 'help' target that prints out all targets with their descriptions organized by categories
include ../default-help.mk

.PHONY: build-image docker-build
build-image docker-build:
docker buildx build --load --tag $(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) -f Dockerfile ..
Expand Down
Loading
Loading