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

DDA w/operator component cleanups and improvements #1251

Merged
merged 18 commits into from
Dec 12, 2024
Merged

DDA w/operator component cleanups and improvements #1251

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
135ae7a
fix namespaces in DDA w/operator components
fanny-jiang Nov 19, 2024
75195b0
apply review suggestions, refactor
fanny-jiang Nov 22, 2024
048ebb2
Merge branch 'main' into fanny/operator-namespaces
fanny-jiang Nov 22, 2024
8355c2d
nolint
fanny-jiang Nov 22, 2024
29112d3
add more params
fanny-jiang Dec 3, 2024
23a0e28
add logs_dd_url var for fakeintake
fanny-jiang Dec 3, 2024
e6f51b9
Merge branch 'main' into fanny/operator-namespaces
fanny-jiang Dec 4, 2024
ea0d6a1
cleanup
fanny-jiang Dec 6, 2024
c94aeef
more refactor
fanny-jiang Dec 9, 2024
2dfb561
fix labelselector
fanny-jiang Dec 9, 2024
a5d2ffc
Merge branch 'main' into fanny/operator-namespaces
fanny-jiang Dec 9, 2024
1ab12b1
fix dda kindvm
fanny-jiang Dec 9, 2024
c83c5b7
fix default namespace
fanny-jiang Dec 9, 2024
156e590
fix linter
fanny-jiang Dec 9, 2024
0c80207
Merge branch 'main' into fanny/operator-namespaces
fanny-jiang Dec 11, 2024
259e496
Merge branch 'main' into fanny/operator-namespaces
fanny-jiang Dec 11, 2024
2de33f6
address review comments
fanny-jiang Dec 11, 2024
5edf90b
fix tlsVerify for invoke-kind operator test
fanny-jiang Dec 12, 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
3 changes: 3 additions & 0 deletions components/datadog/apps/dda/datadogagent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ func K8sAppDefinition(e config.Env, kubeProvider *kubernetes.Provider, namespace
}

ddaRef, err := componentskube.NewKubernetesObjRef(e, baseName, namespace, "DatadogAgent", pulumi.String("").ToStringOutput(), pulumi.String("datadoghq.com/v2alpha1").ToStringOutput(), map[string]string{"app": baseName})
if err != nil {
return nil, nil, err
}

return k8sComponent, ddaRef, nil
}
Expand Down
2 changes: 1 addition & 1 deletion components/datadog/operator/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
)

// OperatorOutput is used to import the Operator component
type OperatorOutput struct {
type OperatorOutput struct { // nolint:revive, We want to keep the name as <Component>Output
Copy link
Contributor

Choose a reason for hiding this comment

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

What is the lint error?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I was getting this lint error:

Error: components/datadog/operator/component.go:11:6: exported: type name will be used as operator.OperatorOutput by other packages, and that stutters; consider calling this Output (revive)
  type OperatorOutput struct {

components.JSONImporter
Operator compkubernetes.KubernetesObjectRef `json:"operator"`
}
Expand Down
4 changes: 2 additions & 2 deletions components/kubernetes/kubernetes_object_ref.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/DataDog/test-infra-definitions/components"
)

type KubernetesObjRefOutput struct {
type KubernetesObjRefOutput struct { // nolint:revive, We want to keep the name as <Component>Output
components.JSONImporter

Namespace string `json:"namespace"`
Expand All @@ -18,7 +18,7 @@ type KubernetesObjRefOutput struct {
LabelSelectors map[string]string `json:"labelSelectors"`
}

type KubernetesObjectRef struct {
type KubernetesObjectRef struct { // nolint:revive, We want to keep the name as <Component>Output
pducolin marked this conversation as resolved.
Show resolved Hide resolved
pulumi.ResourceState
components.Component

Expand Down