Deliver 0.7.1 with CRDv1 and OpenShift 4.9 support

DataDog · Oct 21, 2021 · f8df254 · f8df254
1 parent a608dc0
commit f8df254
Show file tree

Hide file tree

Showing 17 changed files with 43,311 additions and 20,369 deletions.
diff --git a/Makefile b/Makefile
@@ -137,7 +137,7 @@ bundle-push:
 
 .PHONY: bundle-redhat-build
 bundle-redhat-build:
-	docker build -f bundle.redhat.Dockerfile -t scan.connect.redhat.com/ospid-1125a16e-7487-49a2-93ae-f6a21920e804/operator-bundle:$(VERSION) .
+	docker build --no-cache -f bundle.redhat.Dockerfile -t scan.connect.redhat.com/ospid-1125a16e-7487-49a2-93ae-f6a21920e804/operator-bundle:$(VERSION) .
 
 ##@ Datadog Custom part
 .PHONY: install-tools

diff --git a/bundle-redhat/manifests/datadog-operator.clusterserviceversion.yaml b/bundle-redhat/manifests/datadog-operator.clusterserviceversion.yaml
@@ -2,6 +2,7 @@ apiVersion: operators.coreos.com/v1alpha1
 kind: ClusterServiceVersion
 metadata:
   annotations:
+    olm.skipRange: "<0.7.1"
     alm-examples: |-
       [
         {
@@ -94,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-rc.2
+  name: datadog-operator.v0.7.1
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -782,7 +783,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
-                image: datadog/operator:0.7.1-rc.2
+                image: registry.connect.redhat.com/datadog/operator:0.7.1
                 imagePullPolicy: IfNotPresent
                 livenessProbe:
                   httpGet:
@@ -871,4 +872,4 @@ spec:
   maturity: alpha
   provider:
     name: Datadog
-  version: 0.7.1-rc.2
+  version: 0.7.1
diff --git a/bundle-redhat/manifests/datadoghq.com_datadogagents.yaml b/bundle-redhat/manifests/datadoghq.com_datadogagents.yaml
diff --git a/bundle-redhat/manifests/datadoghq.com_datadogmetrics.yaml b/bundle-redhat/manifests/datadoghq.com_datadogmetrics.yaml
@@ -1,109 +1,111 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
   name: datadogmetrics.datadoghq.com
 spec:
-  additionalPrinterColumns:
-  - JSONPath: .status.conditions[?(@.type=='Active')].status
-    name: active
-    type: string
-  - JSONPath: .status.conditions[?(@.type=='Valid')].status
-    name: valid
-    type: string
-  - JSONPath: .status.currentValue
-    name: value
-    type: string
-  - JSONPath: .status.autoscalerReferences
-    name: references
-    type: string
-  - JSONPath: .status.conditions[?(@.type=='Updated')].lastUpdateTime
-    name: update time
-    type: date
   group: datadoghq.com
   names:
     kind: DatadogMetric
     listKind: DatadogMetricList
     plural: datadogmetrics
     singular: datadogmetric
   scope: Namespaced
-  subresources:
-    status: {}
-  validation:
-    openAPIV3Schema:
-      description: DatadogMetric allows autoscaling on arbitrary Datadog query
-      properties:
-        apiVersion:
-          description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-          type: string
-        kind:
-          description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-          type: string
-        metadata:
-          type: object
-        spec:
-          description: DatadogMetricSpec defines the desired state of DatadogMetric
-          properties:
-            externalMetricName:
-              description: ExternalMetricName is reserved for internal use
-              type: string
-            maxAge:
-              description: MaxAge provides the max age for the metric query (overrides the default setting `external_metrics_provider.max_age`)
-              type: string
-            query:
-              description: Query is the raw datadog query
-              type: string
-          type: object
-        status:
-          description: DatadogMetricStatus defines the observed state of DatadogMetric
-          properties:
-            autoscalerReferences:
-              description: List of autoscalers currently using this DatadogMetric
-              type: string
-            conditions:
-              description: Conditions Represents the latest available observations of a DatadogMetric's current state.
-              items:
-                description: DatadogMetricCondition describes the state of a DatadogMetric at a certain point.
-                properties:
-                  lastTransitionTime:
-                    description: Last time the condition transitioned from one status to another.
-                    format: date-time
-                    type: string
-                  lastUpdateTime:
-                    description: Last time the condition was updated.
-                    format: date-time
-                    type: string
-                  message:
-                    description: A human readable message indicating details about the transition.
-                    type: string
-                  reason:
-                    description: The reason for the condition's last transition.
-                    type: string
-                  status:
-                    description: Status of the condition, one of True, False, Unknown.
-                    type: string
-                  type:
-                    description: Type of DatadogMetric condition.
-                    type: string
-                required:
-                - status
-                - type
-                type: object
-              type: array
-            currentValue:
-              description: Value is the latest value of the metric
-              type: string
-          required:
-          - currentValue
-          type: object
-      type: object
-  version: v1alpha1
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - jsonPath: .status.conditions[?(@.type=='Active')].status
+      name: active
+      type: string
+    - jsonPath: .status.conditions[?(@.type=='Valid')].status
+      name: valid
+      type: string
+    - jsonPath: .status.currentValue
+      name: value
+      type: string
+    - jsonPath: .status.autoscalerReferences
+      name: references
+      type: string
+    - jsonPath: .status.conditions[?(@.type=='Updated')].lastUpdateTime
+      name: update time
+      type: date
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: DatadogMetric allows autoscaling on arbitrary Datadog query
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: DatadogMetricSpec defines the desired state of DatadogMetric
+            properties:
+              externalMetricName:
+                description: ExternalMetricName is reserved for internal use
+                type: string
+              maxAge:
+                description: MaxAge provides the max age for the metric query (overrides the default setting `external_metrics_provider.max_age`)
+                type: string
+              query:
+                description: Query is the raw datadog query
+                type: string
+            type: object
+          status:
+            description: DatadogMetricStatus defines the observed state of DatadogMetric
+            properties:
+              autoscalerReferences:
+                description: List of autoscalers currently using this DatadogMetric
+                type: string
+              conditions:
+                description: Conditions Represents the latest available observations of a DatadogMetric's current state.
+                items:
+                  description: DatadogMetricCondition describes the state of a DatadogMetric at a certain point.
+                  properties:
+                    lastTransitionTime:
+                      description: Last time the condition transitioned from one status to another.
+                      format: date-time
+                      type: string
+                    lastUpdateTime:
+                      description: Last time the condition was updated.
+                      format: date-time
+                      type: string
+                    message:
+                      description: A human readable message indicating details about the transition.
+                      type: string
+                    reason:
+                      description: The reason for the condition's last transition.
+                      type: string
+                    status:
+                      description: Status of the condition, one of True, False, Unknown.
+                      type: string
+                    type:
+                      description: Type of DatadogMetric condition.
+                      type: string
+                  required:
+                  - status
+                  - type
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - type
+                x-kubernetes-list-type: map
+              currentValue:
+                description: Value is the latest value of the metric
+                type: string
+            required:
+            - currentValue
+            type: object
+        type: object
     served: true
     storage: true
+    subresources:
+      status: {}
 status:
   acceptedNames:
     kind: ""