build(swagger): Fix Swagger build problems #3084
Conversation
| @@ -318,7 +318,6 @@ $(VERSION_FILE): | |||
| touch $(VERSION_FILE) | |||
|
|
|||
| dist/$(DB).yaml: $(MANIFESTS) $(E2E_MANIFESTS) $(VERSION_FILE) | |||
| # We additionally disable ALWAYS_OFFLOAD_NODE_STATUS | |||
There was a problem hiding this comment.
comment no longer correct
| .PHONY: start-aux | ||
| start-aux: $(GOPATH)/bin/goreman | ||
| .PHONY: start | ||
| start: status stop install controller cli executor-image $(GOPATH)/bin/goreman |
There was a problem hiding this comment.
because start-aux now blocks, we do not run wait or env
| @@ -451,7 +448,7 @@ $(GOPATH)/bin/swagger: | |||
| .PHONY: swagger | |||
| swagger: api/openapi-spec/swagger.json | |||
|
|
|||
| pkg/apis/workflow/v1alpha1/openapi_generated.go: | |||
| pkg/apis/workflow/v1alpha1/openapi_generated.go: $(shell find pkg/apis/workflow/v1alpha1 -type f -not -name openapi_generated.go) | |||
| @@ -461,20 +458,29 @@ pkg/apis/workflow/v1alpha1/openapi_generated.go: | |||
| --report-filename pkg/apis/api-rules/violation_exceptions.list | |||
| $(call restore_go_mod) | |||
|
|
|||
| dist/kubernetes.swagger.json: | |||
There was a problem hiding this comment.
I've reordered this section of the make file to reflect its execution order
| @@ -2196,6 +2196,10 @@ | |||
| "type": "string" | |||
| } | |||
| }, | |||
| "depends": { | |||
| pkg/apiclient/_.secondary.swagger.json: hack/secondaryswaggergen.go pkg/apis/workflow/v1alpha1/openapi_generated.go dist/kubernetes.swagger.json | ||
| go run ./hack secondaryswaggergen | ||
|
|
||
| dist/swagger.json: $(GOPATH)/bin/swagger $(SWAGGER_FILES) $(MANIFESTS_VERSION_FILE) hack/swaggify.sh | ||
| swagger mixin -c 684 $(SWAGGER_FILES) | sed 's/VERSION/$(MANIFESTS_VERSION)/' | ./hack/swaggify.sh > dist/swagger.json | ||
| # we always ignore the conflicts, so lets automated figuring out how many there will be and just use that |
There was a problem hiding this comment.
@sarabala1979 so we never have to change the -c again :)
| .PHONY: start-aux | ||
| start-aux: $(GOPATH)/bin/goreman | ||
| .PHONY: start | ||
| start: status stop install controller cli executor-image $(GOPATH)/bin/goreman |
| @@ -2196,6 +2196,10 @@ | |||
| "type": "string" | |||
| } | |||
| }, | |||
| "depends": { | |||
|
FYI: #3076 Changed some docstrings that were previously not present on the swagger file and therefore aren't reflected on this PR yet. Please merge with master before merging this PR in order to avoid master having incorrect codegen |
|
Kudos, SonarCloud Quality Gate passed!
|
alexec
changed the title
|
Synced with master. Can be merged as soon as approved. |
Checklist:
"fix(controller): Updates such and such. Fixes #1234".@simster7 this can be merged as soon as green.