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.

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

Upgrade controller-gen to v0.14.0 and fix defaults #613

Merged
merged 1 commit into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest

## Tool Versions
KUSTOMIZE_VERSION ?= v5.2.1
CONTROLLER_TOOLS_VERSION ?= v0.13.0
CONTROLLER_TOOLS_VERSION ?= v0.14.0

.PHONY: kustomize
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary. If wrong version is installed, it will be removed before downloading.
Expand Down
3 changes: 3 additions & 0 deletions api/falcon/v1alpha1/falconadmission_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ type FalconAdmissionSpec struct {
InstallNamespace string `json:"installNamespace,omitempty"`

// CrowdStrike Falcon sensor configuration
// +kubebuilder:default:={}
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Falcon Sensor Configuration",order=3
Falcon FalconSensor `json:"falcon,omitempty"`

Expand All @@ -44,6 +45,7 @@ type FalconAdmissionSpec struct {
FalconAPI *FalconAPI `json:"falcon_api,omitempty"`

// ResourceQuota configures the ResourceQuota for the Falcon Admission Controller. This is useful for limiting the number of pods that can be created in the namespace.
// +kubebuilder:default:={}
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Falcon Admission Controller Resource Quota",order=4
ResQuota FalconAdmissionRQSpec `json:"resourcequota,omitempty"`

Expand All @@ -52,6 +54,7 @@ type FalconAdmissionSpec struct {
Registry RegistrySpec `json:"registry,omitempty"`

// Additional configuration for Falcon Admission Controller deployment.
// +kubebuilder:default:={}
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Falcon Admission Controller Configuration",order=5
AdmissionConfig FalconAdmissionConfigSpec `json:"admissionConfig,omitempty"`

Expand Down
4 changes: 3 additions & 1 deletion api/falcon/v1alpha1/falconcontainer_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ type FalconContainerSpec struct {
// +operator-sdk:csv:customresourcedefinitions:type=spec,order=1,xDescriptors={"urn:alm:descriptor:io.kubernetes:Namespace"}
InstallNamespace string `json:"installNamespace,omitempty"`

// +kubebuilder:default:={}
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Falcon Sensor Configuration",order=1
Falcon FalconSensor `json:"falcon,omitempty"`

// FalconAPI configures connection from your local Falcon operator to CrowdStrike Falcon platform.
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Falcon Platform API Configuration",order=2
FalconAPI *FalconAPI `json:"falcon_api,omitempty"`
Expand All @@ -32,7 +34,7 @@ type FalconContainerSpec struct {
Registry RegistrySpec `json:"registry,omitempty"`

// Injector represents additional configuration for Falcon Container Injector
// +kubebuilder:default:={imagePullPolicy:Always}
redhatrises marked this conversation as resolved.
Show resolved Hide resolved
// +kubebuilder:default:={}
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Falcon Container Injector Configuration",order=4
Injector FalconContainerInjectorSpec `json:"injector,omitempty"`

Expand Down
1 change: 1 addition & 0 deletions api/falcon/v1alpha1/falconimageanalyzer_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ type FalconImageAnalyzerSpec struct {
Registry RegistrySpec `json:"registry,omitempty"`

// Additional configuration for Falcon Image Analyzer deployment.
// +kubebuilder:default:={}
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Falcon Image Analyzer Configuration",order=5
ImageAnalyzerConfig FalconImageAnalyzerConfigSpec `json:"imageAnalyzerConfig,omitempty"`

Expand Down
3 changes: 3 additions & 0 deletions api/falcon/v1alpha1/falconnodesensor_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@ type FalconNodeSensorSpec struct {
InstallNamespace string `json:"installNamespace,omitempty"`

// Various configuration for DaemonSet Deployment
// +kubebuilder:default:={}
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="DaemonSet Configuration",order=3
Node FalconNodeSensorConfig `json:"node,omitempty"`

// +kubebuilder:default:={}
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Falcon Sensor Configuration",order=2
Falcon FalconSensor `json:"falcon,omitempty"`

Expand Down Expand Up @@ -66,6 +68,7 @@ type FalconNodeSensorConfig struct {
ImagePullSecrets []corev1.LocalObjectReference `json:"imagePullSecrets,omitempty"`

// Type of DaemonSet update. Can be "RollingUpdate" or "OnDelete". Default is RollingUpdate.
// +kubebuilder:default={}
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="DaemonSet Update Strategy",order=6
DSUpdateStrategy FalconNodeUpdateStrategy `json:"updateStrategy,omitempty"`

Expand Down
277 changes: 153 additions & 124 deletions config/crd/bases/falcon.crowdstrike.com_falconadmissions.yaml

Large diffs are not rendered by default.

1,569 changes: 800 additions & 769 deletions config/crd/bases/falcon.crowdstrike.com_falconcontainers.yaml

Large diffs are not rendered by default.

194 changes: 104 additions & 90 deletions config/crd/bases/falcon.crowdstrike.com_falconimageanalyzers.yaml

Large diffs are not rendered by default.

418 changes: 202 additions & 216 deletions config/crd/bases/falcon.crowdstrike.com_falconnodesensors.yaml

Large diffs are not rendered by default.

2,458 changes: 1,259 additions & 1,199 deletions deploy/falcon-operator.yaml

Large diffs are not rendered by default.

Loading