Skip to content

Commit 91a6e73

Browse files
authored
Merge pull request #1868 from kube-logging/fix/make-workload-meta-override-not-required
2 parents e45bb86 + b497341 commit 91a6e73

File tree

5 files changed

+1
-10
lines changed

5 files changed

+1
-10
lines changed

charts/logging-operator/charts/logging-operator-crds/templates/logging-extensions.banzaicloud.io_hosttailers.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2679,8 +2679,6 @@ spec:
26792679
type: object
26802680
type: array
26812681
type: object
2682-
required:
2683-
- workloadMetaOverrides
26842682
type: object
26852683
status:
26862684
type: object

charts/logging-operator/crds/logging-extensions.banzaicloud.io_hosttailers.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2676,8 +2676,6 @@ spec:
26762676
type: object
26772677
type: array
26782678
type: object
2679-
required:
2680-
- workloadMetaOverrides
26812679
type: object
26822680
status:
26832681
type: object

config/crd/bases/logging-extensions.banzaicloud.io_hosttailers.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2676,8 +2676,6 @@ spec:
26762676
type: object
26772677
type: array
26782678
type: object
2679-
required:
2680-
- workloadMetaOverrides
26812679
type: object
26822680
status:
26832681
type: object

pkg/sdk/extensions/api/v1alpha1/eventtailer_types.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,8 @@ type _metaEventTailer = interface{} //nolint:deadcode,unused
3535

3636
// EventTailerSpec defines the desired state of EventTailer
3737
type EventTailerSpec struct {
38-
// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
39-
// Important: Run "make" to regenerate code after modifying this file
40-
4138
//+kubebuilder:validation:Required
39+
4240
// The resources of EventTailer will be placed into this namespace
4341
ControlNamespace string `json:"controlNamespace"`
4442
// Volume definition for tracking fluentbit file positions (optional)

pkg/sdk/extensions/api/v1alpha1/hosttailer_types.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ type HostTailerSpec struct {
4242
// daemonset (and possibly other resource in the future) in case there is a change in an immutable field
4343
// that otherwise couldn't be managed with a simple update.
4444
EnableRecreateWorkloadOnImmutableFieldChange bool `json:"enableRecreateWorkloadOnImmutableFieldChange,omitempty"`
45-
//+kubebuilder:validation:Required
4645
// Override metadata of the created resources
4746
WorkloadMetaBase *types.MetaBase `json:"workloadMetaOverrides,omitempty"`
4847
// Override podSpec fields for the given daemonset

0 commit comments

Comments
 (0)