Skip to content

Commit

Permalink
Merge pull request #35 from Nordix/upgrade_code_gen
Browse files Browse the repository at this point in the history
Fix api generation
  • Loading branch information
nephio-prow[bot] authored Mar 28, 2024
2 parents 204cb8a + 67441f9 commit 8a84339
Show file tree
Hide file tree
Showing 135 changed files with 3,707 additions and 5,431 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,7 @@ default.etcd/
# Output of the go coverage tool, specifically when used with LiteIDE
*.out
*.info
coverage_unit.html
coverage_unit.html

# Codegen artifacts
*.report
22 changes: 13 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2022 The kpt and Nephio Authors
# Copyright 2022-2024 The kpt and Nephio Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -30,13 +30,6 @@ include default-go.mk
# This includes the 'help' target that prints out all targets with their descriptions organized by categories
include default-help.mk

# Modules are ordered in dependency order. A module precedes modules that depend on it.
MODULES = \
examples/apps/hello-server \
api \
. \
controllers \

# GCP project to use for development

ifeq ($(GCP_PROJECT_ID),)
Expand Down Expand Up @@ -82,6 +75,13 @@ else
endif
endif

# Modules are ordered in dependency order. A module precedes modules that depend on it.
MODULES = \
examples/apps/hello-server \
api \
. \
controllers \

.DEFAULT_GOAL := all

.PHONY: all
Expand Down Expand Up @@ -147,8 +147,12 @@ start-function-runner:
$(IMAGE_REPO)/$(PORCH_FUNCTION_RUNNER_IMAGE):$(IMAGE_TAG) \
-disable-runtimes pod

.PHONY: generate-api
generate-api:
KUBE_VERBOSE=2 $(CURDIR)/scripts/generate-api.sh

.PHONY: generate
generate:
generate: generate-api
@for f in $(MODULES); do (cd $$f; echo "Generating $$f"; go generate -v ./...) || exit 1; done

.PHONY: tidy
Expand Down
9 changes: 6 additions & 3 deletions api/generated/clientset/versioned/clientset.go

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

18 changes: 0 additions & 18 deletions api/generated/clientset/versioned/doc.go

This file was deleted.

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

2 changes: 1 addition & 1 deletion api/generated/clientset/versioned/fake/doc.go

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

2 changes: 1 addition & 1 deletion api/generated/clientset/versioned/fake/register.go

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

2 changes: 1 addition & 1 deletion api/generated/clientset/versioned/scheme/doc.go

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

2 changes: 1 addition & 1 deletion api/generated/clientset/versioned/scheme/register.go

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

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

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

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

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

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

This file was deleted.

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

Loading

0 comments on commit 8a84339

Please sign in to comment.