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

Remove DatadogAgent v1alpha1 CRD version and conversion webhook #1242

Merged
merged 4 commits into from
Jun 24, 2024
Merged

Remove DatadogAgent v1alpha1 CRD version and conversion webhook #1242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
78f147e
Remove DatadogAgent v1alpha1 CRD version
levan-m Jun 21, 2024
2ca1009
Remove option of enabling conversion webhook
levan-m Jun 21, 2024
b7a8cd5
Don't generate DatadogAgent v1alpha1 doc
levan-m Jun 21, 2024
ab84fc0
Skip DatadogAgent v1alpha1 suite test
levan-m Jun 21, 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
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,12 @@ manifests: generate-manifests patch-crds ## Generate manifestcd s e.g. CRD, RBAC

.PHONY: generate-manifests
generate-manifests: $(CONTROLLER_GEN)
$(CONTROLLER_GEN) $(CRD_OPTIONS),crdVersions=v1 rbac:roleName=manager-role webhook paths="./apis/..." output:crd:artifacts:config=config/crd/bases/v1
$(CONTROLLER_GEN) $(CRD_OPTIONS),crdVersions=v1beta1 rbac:roleName=manager-role webhook paths="./apis/..." output:crd:artifacts:config=config/crd/bases/v1beta1
$(CONTROLLER_GEN) $(CRD_OPTIONS),crdVersions=v1 rbac:roleName=manager-role paths="./apis/..." output:crd:artifacts:config=config/crd/bases/v1
$(CONTROLLER_GEN) $(CRD_OPTIONS),crdVersions=v1beta1 rbac:roleName=manager-role paths="./apis/..." output:crd:artifacts:config=config/crd/bases/v1beta1

.PHONY: generate
generate: $(CONTROLLER_GEN) generate-openapi generate-docs ## Generate code
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./apis/.."
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./apis/..."

.PHONY: generate-docs
generate-docs: manifests
Expand Down
2 changes: 1 addition & 1 deletion apis/datadoghq/v1alpha1/datadogagent_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1405,7 +1405,6 @@ const (

// DatadogAgent Deployment with Datadog Operator.
// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Without deleting this line, controller-gen fails with below error. Since v1alpha1 is getting deprecated in this release I don't removing this as a problem so didn't debug it any further

❯ bin/darwin-arm64/controller-gen "crd:preserveUnknownFields=false",crdVersions=v1 rbac:roleName=manager-role paths="./apis/..." output:crd:artifacts:config=config/crd/bases/v1
[repo_root]/apis/datadoghq/v1alpha1/datadogagent_types.go:1418:6: status subresource applied to version "v1alpha1" not in CRD
Error: not all generators ran successfully

// +kubebuilder:resource:path=datadogagents,shortName=dd
// +kubebuilder:printcolumn:name="active",type="string",JSONPath=".status.conditions[?(@.type=='Active')].status"
// +kubebuilder:printcolumn:name="agent",type="string",JSONPath=".status.agent.status"
Expand All @@ -1414,6 +1413,7 @@ const (
// +kubebuilder:printcolumn:name="age",type="date",JSONPath=".metadata.creationTimestamp"
// +k8s:openapi-gen=true
// +genclient
// +kubebuilder:skipversion
type DatadogAgent struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
7,909 changes: 0 additions & 7,909 deletions config/crd/bases/v1/datadoghq.com_datadogagents.yaml
View file
Open in desktop

Large diffs are not rendered by default.

24,176 changes: 4,281 additions & 19,895 deletions config/crd/bases/v1beta1/datadoghq.com_datadogagents.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions controllers/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ var (
)

func TestAPIs(t *testing.T) {
t.Skip()
RegisterFailHandler(Fail)

stenographer := st.NewFakeStenographer()
Expand Down
497 changes: 0 additions & 497 deletions docs/configuration.v1alpha1.md
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions hack/generate-docs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ func generateDoc(header []byte, crd apiextensions.CustomResourceDefinitionVersio

// Write prop content
var generator = map[string]func(*os.File, apiextensions.CustomResourceDefinitionVersion){
"v1alpha1": generateContent_v1alpha1,
"v2alpha1": generateContent_v2alpha1,
}
generator[version](f, crd)
Expand All @@ -74,10 +73,6 @@ func generateDoc(header []byte, crd apiextensions.CustomResourceDefinitionVersio
mustWrite(f, footer)
}

func generateContent_v1alpha1(f *os.File, crd apiextensions.CustomResourceDefinitionVersion) {
writePropsTable(f, crd.Schema.OpenAPIV3Schema.Properties["spec"].Properties)
}

func generateContent_v2alpha1(f *os.File, crd apiextensions.CustomResourceDefinitionVersion) {
writePropsTable(f, crd.Schema.OpenAPIV3Schema.Properties["spec"].Properties)

Expand Down
15 changes: 0 additions & 15 deletions hack/generate-docs/v1alpha1_example.markdown
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions hack/generate-docs/v1alpha1_footer.markdown
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
ctrlzap "sigs.k8s.io/controller-runtime/pkg/log/zap"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/webhook"

"go.uber.org/zap"
"go.uber.org/zap/zapcore"
Expand Down Expand Up @@ -124,7 +123,6 @@ type options struct {
datadogMonitorEnabled bool
datadogSLOEnabled bool
operatorMetricsEnabled bool
webhookEnabled bool
maximumGoroutines int
introspectionEnabled bool
datadogAgentProfileEnabled bool
Expand Down Expand Up @@ -158,7 +156,6 @@ func (opts *options) Parse() {
flag.BoolVar(&opts.datadogMonitorEnabled, "datadogMonitorEnabled", false, "Enable the DatadogMonitor controller")
flag.BoolVar(&opts.datadogSLOEnabled, "datadogSLOEnabled", false, "Enable the DatadogSLO controller")
flag.BoolVar(&opts.operatorMetricsEnabled, "operatorMetricsEnabled", true, "Enable sending operator metrics to Datadog")
flag.BoolVar(&opts.webhookEnabled, "webhookEnabled", false, "Enable CRD conversion webhook.")
flag.IntVar(&opts.maximumGoroutines, "maximumGoroutines", defaultMaximumGoroutines, "Override health check threshold for maximum number of goroutines.")
flag.BoolVar(&opts.introspectionEnabled, "introspectionEnabled", false, "Enable introspection (beta)")
flag.BoolVar(&opts.datadogAgentProfileEnabled, "datadogAgentProfileEnabled", false, "Enable DatadogAgentProfile controller (beta)")
Expand Down Expand Up @@ -207,11 +204,6 @@ func run(opts *options) error {
}
version.PrintVersionLogs(setupLog)

if opts.webhookEnabled {
setupLog.Error(nil, "DatadogAgent v1alpha1 and the conversion webhook will be removed in v1.8.0. "+
"See the migration page for instructions on migrating to v2alpha1: https://docs.datadoghq.com/containers/guide/datadogoperator_migration/")
}

if opts.profilingEnabled {
setupLog.Info("Starting datadog profiler")
if err := profiler.Start(
Expand Down Expand Up @@ -239,7 +231,6 @@ func run(opts *options) error {
BindAddress: opts.metricsAddr,
ExtraHandlers: debug.GetExtraMetricHandlers(),
}, HealthProbeBindAddress: ":8081",
WebhookServer: webhook.NewServer(webhook.Options{Port: 9443}),
LeaderElection: opts.enableLeaderElection,
LeaderElectionID: "datadog-operator-lock",
LeaderElectionResourceLock: resourcelock.LeasesResourceLock,
Expand Down Expand Up @@ -304,12 +295,6 @@ func run(opts *options) error {
return setupErrorf(setupLog, err, "Unable to start controllers")
}

if opts.webhookEnabled && opts.datadogAgentEnabled {
if err = (&datadoghqv2alpha1.DatadogAgent{}).SetupWebhookWithManager(mgr); err != nil {
return setupErrorf(setupLog, err, "unable to create webhook", "webhook", "DatadogAgent")
}
}

// +kubebuilder:scaffold:builder

setupLog.Info("starting manager")
Expand Down
Loading