Fix CRD size by removing defaultOverride schema

DataDog · Nov 16, 2021 · 8ea1118 · 8ea1118
1 parent f8df254
commit 8ea1118
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 22,242 deletions.
diff --git a/api/v1alpha1/datadogagent_types.go b/api/v1alpha1/datadogagent_types.go
@@ -1288,9 +1288,9 @@ const (
 // DatadogAgentStatus defines the observed state of DatadogAgent.
 // +k8s:openapi-gen=true
 type DatadogAgentStatus struct {
-
 	// DefaultOverride contains attributes that were not configured that the runtime defaulted.
 	// +optional
+	// +kubebuilder:pruning:PreserveUnknownFields
 	DefaultOverride *DatadogAgentSpec `json:"defaultOverride,omitempty"`
 
 	// The actual state of the Agent as an extended daemonset.

diff --git a/bundle-redhat/manifests/datadog-operator.clusterserviceversion.yaml b/bundle-redhat/manifests/datadog-operator.clusterserviceversion.yaml
@@ -2,7 +2,7 @@ apiVersion: operators.coreos.com/v1alpha1
 kind: ClusterServiceVersion
 metadata:
   annotations:
-    olm.skipRange: "<0.7.1"
+    olm.skipRange: "<0.7.2"
     alm-examples: |-
       [
         {
@@ -95,7 +95,7 @@ metadata:
     operators.operatorframework.io/builder: operator-sdk-v1.4.0+git
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
     repository: https://github.com/DataDog/datadog-operator
-  name: datadog-operator.v0.7.1
+  name: datadog-operator.v0.7.2
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -783,7 +783,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
-                image: registry.connect.redhat.com/datadog/operator:0.7.1
+                image: registry.connect.redhat.com/datadog/operator:0.7.2
                 imagePullPolicy: IfNotPresent
                 livenessProbe:
                   httpGet:
@@ -872,4 +872,4 @@ spec:
   maturity: alpha
   provider:
     name: Datadog
-  version: 0.7.1
+  version: 0.7.2
diff --git a/bundle-redhat/manifests/datadoghq.com_datadogagents.yaml b/bundle-redhat/manifests/datadoghq.com_datadogagents.yaml
diff --git a/bundle-redhat/metadata/annotations.yaml b/bundle-redhat/metadata/annotations.yaml
@@ -6,9 +6,9 @@ annotations:
   operators.operatorframework.io.bundle.package.v1: datadog-operator-certified
   operators.operatorframework.io.bundle.channels.v1: alpha
   operators.operatorframework.io.bundle.channel.default.v1: alpha
+  operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.builder: operator-sdk-v1.4.0+git
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v2
-  operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
 
   # Annotations for testing.
   operators.operatorframework.io.test.mediatype.v1: scorecard+v1

diff --git a/bundle.Dockerfile b/bundle.Dockerfile
@@ -7,9 +7,9 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=datadog-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=alpha
 LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha
+LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.4.0+git
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v2
-LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 
 # Labels for testing.
 LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1

diff --git a/bundle.redhat.Dockerfile b/bundle.redhat.Dockerfile
@@ -7,9 +7,9 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=datadog-operator-certified
 LABEL operators.operatorframework.io.bundle.channels.v1=alpha
 LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha
+LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.4.0+git
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v2
-LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 
 # Labels for testing.
 LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1

diff --git a/bundle/manifests/datadog-operator.clusterserviceversion.yaml b/bundle/manifests/datadog-operator.clusterserviceversion.yaml
@@ -94,7 +94,7 @@ metadata:
     operators.operatorframework.io/builder: operator-sdk-v1.4.0+git
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
     repository: https://github.com/DataDog/datadog-operator
-  name: datadog-operator.v0.7.1
+  name: datadog-operator.v0.7.2
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -782,7 +782,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
-                image: gcr.io/datadoghq/operator:0.7.1
+                image: gcr.io/datadoghq/operator:0.7.2
                 imagePullPolicy: IfNotPresent
                 livenessProbe:
                   httpGet:
@@ -871,4 +871,4 @@ spec:
   maturity: alpha
   provider:
     name: Datadog
-  version: 0.7.1
+  version: 0.7.2
diff --git a/bundle/manifests/datadoghq.com_datadogagents.yaml b/bundle/manifests/datadoghq.com_datadogagents.yaml
diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml
@@ -6,9 +6,9 @@ annotations:
   operators.operatorframework.io.bundle.package.v1: datadog-operator
   operators.operatorframework.io.bundle.channels.v1: alpha
   operators.operatorframework.io.bundle.channel.default.v1: alpha
+  operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.builder: operator-sdk-v1.4.0+git
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v2
-  operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
 
   # Annotations for testing.
   operators.operatorframework.io.test.mediatype.v1: scorecard+v1

diff --git a/config/crd/bases/v1/datadoghq.com_datadogagents.yaml b/config/crd/bases/v1/datadoghq.com_datadogagents.yaml
@@ -22062,6 +22062,7 @@ spec:
                       to. Set to 'datadoghq.eu' to send data to the EU site.
                     type: string
                 type: object
+                x-kubernetes-preserve-unknown-fields: true
             type: object
         type: object
     served: true

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -3,6 +3,6 @@ resources:
 images:
 - name: controller
   newName: gcr.io/datadoghq/operator
-  newTag: 0.7.1
+  newTag: 0.7.2
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
diff --git a/hack/patch-bundle.sh b/hack/patch-bundle.sh
@@ -15,4 +15,4 @@ $YQ m -i -a "$ROOT_DIR/bundle/manifests/datadog-operator.clusterserviceversion.y
 rm -f "$ROOT_DIR/bundle/manifests/datadog-operator-manager_v1_serviceaccount.yaml"
 
 # Remove defaultOverride section in DatadogAgent status due to the error: "datadoghq.com_datadogagents.yaml bigger than total allowed limit"
-$YQ d -i "$ROOT_DIR/bundle/manifests/datadoghq.com_datadogagents.yaml" 'spec.validation.openAPIV3Schema.properties.status.properties.defaultOverride'
+$YQ d -i "$ROOT_DIR/bundle/manifests/datadoghq.com_datadogagents.yaml" 'spec.versions[*].schema.openAPIV3Schema.properties.status.properties.defaultOverride.properties'