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

testing edit to generate-openapi #1626

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
+6 −14
Draft

testing edit to generate-openapi #1626

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
994811c
testing edit to generate-openapi
swang392 Jan 15, 2025
955b8f6
oops
swang392 Jan 15, 2025
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
6 changes: 4 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,10 @@ install-tools: bin/$(PLATFORM)/golangci-lint bin/$(PLATFORM)/operator-sdk bin/$(

.PHONY: generate-openapi
generate-openapi: bin/$(PLATFORM)/openapi-gen
bin/$(PLATFORM)/openapi-gen --logtostderr --output-dir api/datadoghq/v1alpha1 --output-file zz_generated.openapi.go --output-pkg api/datadoghq/v1alpha1 --go-header-file ./hack/boilerplate.go.txt ./api/datadoghq/v1alpha1
bin/$(PLATFORM)/openapi-gen --logtostderr --output-dir api/datadoghq/v2alpha1 --output-file zz_generated.openapi.go --output-pkg api/datadoghq/v2alpha1 --go-header-file ./hack/boilerplate.go.txt ./api/datadoghq/v2alpha1
@set -o pipefail; \
bin/$(PLATFORM)/openapi-gen --logtostderr --output-dir api/datadoghq/v1alpha1 --output-file zz_generated.openapi.go --output-pkg api/datadoghq/v1alpha1 --go-header-file ./hack/boilerplate.go.txt ./api/datadoghq/v1alpha1 2>&1 | tee /dev/stderr | grep -q "violation" && { echo "Error: Warnings detected"; exit 1; } || true
@set -o pipefail; \
bin/$(PLATFORM)/openapi-gen --logtostderr --output-dir api/datadoghq/v2alpha1 --output-file zz_generated.openapi.go --output-pkg api/datadoghq/v2alpha1 --go-header-file ./hack/boilerplate.go.txt ./api/datadoghq/v2alpha1 2>&1 | tee /dev/stderr | grep -q "violation" && { echo "Error: Warnings detected"; exit 1; } || true

.PHONY: preflight-redhat-container
preflight-redhat-container: bin/$(PLATFORM)/preflight
Expand Down
1 change: 0 additions & 1 deletion api/datadoghq/v2alpha1/datadogagent_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,6 @@ type OtelCollectorFeatureConfig struct {
// If not, this will lead to a port conflict.
// This limitation will be lifted once annotations support is removed.
// +optional
// +listType=atomic
Ports []*corev1.ContainerPort `json:"ports,omitempty"`

// OTelCollector Config Relevant to the Core agent
Expand Down
5 changes: 0 additions & 5 deletions api/datadoghq/v2alpha1/zz_generated.openapi.go
View file
Open in desktop

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

2 changes: 0 additions & 2 deletions config/crd/bases/v1/datadoghq.com_datadogagents.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1411,7 +1411,6 @@ spec:
- containerPort
type: object
type: array
x-kubernetes-list-type: atomic
type: object
otlp:
description: OTLP ingest configuration
Expand Down Expand Up @@ -8275,7 +8274,6 @@ spec:
- containerPort
type: object
type: array
x-kubernetes-list-type: atomic
type: object
otlp:
description: OTLP ingest configuration
Expand Down
6 changes: 2 additions & 4 deletions config/crd/bases/v1/datadoghq.com_datadogagents_v2alpha1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1457,8 +1457,7 @@
],
"type": "object"
},
"type": "array",
"x-kubernetes-list-type": "atomic"
"type": "array"
}
},
"type": "object"
Expand Down Expand Up @@ -8263,8 +8262,7 @@
],
"type": "object"
},
"type": "array",
"x-kubernetes-list-type": "atomic"
"type": "array"
}
},
"type": "object"
Expand Down
Loading