Release operator version: 2.3.0 (#336)

Co-authored-by: Mark Michael <[email protected]> Co-authored-by: Jeremy Alvis <[email protected]>
wavefrontHQ · Mar 3, 2023 · b9918b8 · b9918b8
1 parent 244402e
commit b9918b8
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -140,6 +140,7 @@ We have templates for common scenarios. See the comments in each file for usage
  * [Using an existing collector ConfigMap](./deploy/kubernetes/scenarios/wavefront-collector-existing-configmap.yaml)
  * [With plugin configuration in a secret](./deploy/kubernetes/scenarios/wavefront-collector-with-plugin-secret.yaml)
  * [Filtering metrics upon collection](./deploy/kubernetes/scenarios/wavefront-collector-filtering.yaml)
+ * [Disabling control plane metrics](./deploy/kubernetes/wavefront-disable-control-plane-metrics.yaml)
  * [Defining Kubernetes resource limits](./deploy/kubernetes/scenarios/wavefront-pod-resources.yaml)
  * [Defining data collection pod tolerations](./deploy/kubernetes/scenarios/wavefront-daemonset-pod-tolerations.yaml)
  * [Defining proxy pre-processor rules](./deploy/kubernetes/scenarios/wavefront-proxy-preprocessor-rules.yaml)

diff --git a/deploy/kubernetes/scenarios/wavefront-disable-control-plane-metrics.yaml b/deploy/kubernetes/scenarios/wavefront-disable-control-plane-metrics.yaml
@@ -0,0 +1,18 @@
+# Need to change YOUR_CLUSTER_NAME, YOUR_WAVEFRONT_URL accordingly
+apiVersion: wavefront.com/v1alpha1
+kind: Wavefront
+metadata:
+  name: wavefront
+  namespace: observability-system
+spec:
+  clusterName: YOUR_CLUSTER_NAME
+  wavefrontUrl: YOUR_WAVEFRONT_URL
+  dataCollection:
+    metrics:
+      enable: true
+      # turn off control plane metrics with the following feature flag
+      controlPlane:
+        enable: false #defaults to true
+  dataExport:
+    wavefrontProxy:
+      enable: true
diff --git a/deploy/kubernetes/scenarios/wavefront-full-config.yaml b/deploy/kubernetes/scenarios/wavefront-full-config.yaml
@@ -60,6 +60,9 @@ spec:
       defaultCollectionInterval: 90s #defaults to 60s
       # Rules based and Prometheus endpoints auto-discovery.
       enableDiscovery: true #defaults to true
+      # controlPlane can enable/disable control plane metrics
+      controlPlane:
+        enable: true #defaults to true
       clusterCollector:
         resources:
           limits:
@@ -123,7 +126,7 @@ spec:
       # OpenTelemetry Protocol configuration
       otlp:
         grpcPort: 4317
-        httpPrt: 4318
+        httpPort: 4318
         resourceAttrsOnMetricsIncluded: false
       # DeltaCounterPort accumulates 1-minute delta counters on Wavefront data format
       deltaCounterPort: 50000

diff --git a/deploy/kubernetes/wavefront-operator.yaml b/deploy/kubernetes/wavefront-operator.yaml
@@ -10,7 +10,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.8.0
+    controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
   name: wavefronts.wavefront.com
 spec:
@@ -213,6 +213,20 @@ spec:
                                 type: object
                             type: object
                         type: object
+                      controlPlane:
+                        default:
+                          enable: true
+                        description: Whether to enable or disable metrics from the
+                          Kubernetes control plane. Defaults to true.
+                        properties:
+                          enable:
+                            default: true
+                            description: Enable is whether to include kubernetes.controlplane.*
+                              metrics and whether to include kubernetes_control_plane_source
+                            type: boolean
+                        required:
+                        - enable
+                        type: object
                       customConfig:
                         description: CustomConfig is the custom ConfigMap name for
                           the collector. Leave blank to use defaults.
@@ -621,12 +635,6 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
 ---
 apiVersion: v1
 automountServiceAccountToken: false
@@ -782,6 +790,7 @@ rules:
   resources:
   - events
   - namespaces
+  - endpoints
   - nodes
   - nodes/proxy
   - nodes/stats
@@ -930,6 +939,19 @@ subjects:
   namespace: observability-system
 ---
 apiVersion: v1
+data:
+  collector: 1.15.0
+  logging: 2.0.8
+  proxy: "12.1"
+kind: ConfigMap
+metadata:
+  labels:
+    app.kubernetes.io/component: controller-manager
+    app.kubernetes.io/name: wavefront
+  name: wavefront-component-versions
+  namespace: observability-system
+---
+apiVersion: v1
 data:
   controller_manager_config.yaml: |
     apiVersion: controller-runtime.sigs.k8s.io/v1alpha1
@@ -975,7 +997,22 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.namespace
-        image: projects.registry.vmware.com/tanzu_observability/kubernetes-operator:2.2.0
+        - name: COLLECTOR_VERSION
+          valueFrom:
+            configMapKeyRef:
+              key: collector
+              name: wavefront-component-versions
+        - name: PROXY_VERSION
+          valueFrom:
+            configMapKeyRef:
+              key: proxy
+              name: wavefront-component-versions
+        - name: LOGGING_VERSION
+          valueFrom:
+            configMapKeyRef:
+              key: logging
+              name: wavefront-component-versions
+        image: projects.registry.vmware.com/tanzu_observability/kubernetes-operator:2.3.0
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

diff --git a/docs/custom-configuration.md b/docs/custom-configuration.md
@@ -8,8 +8,8 @@ Install the Wavefront Operator into `observability-system` namespace.
 
 | Component                      | From                                                                                   | To                                                        |
 |--------------------------------|----------------------------------------------------------------------------------------|-----------------------------------------------------------|
-| Wavefront kubernetes operator  | `projects.registry.vmware.com/tanzu_observability/kubernetes-operator:2.2.0`           | `YOUR_IMAGE_REGISTRY/kubernetes-operator:2.2.0`           |
-| Wavefront kubernetes collector | `projects.registry.vmware.com/tanzu_observability/kubernetes-collector:1.14.0`         | `YOUR_IMAGE_REGISTRY/kubernetes-collector:1.14.0`         |
+| Wavefront kubernetes operator  | `projects.registry.vmware.com/tanzu_observability/kubernetes-operator:2.3.0`           | `YOUR_IMAGE_REGISTRY/kubernetes-operator:2.3.0`           |
+| Wavefront kubernetes collector | `projects.registry.vmware.com/tanzu_observability/kubernetes-collector:1.15.0`         | `YOUR_IMAGE_REGISTRY/kubernetes-collector:1.15.0`         |
 | Wavefront Proxy                | `projects.registry.vmware.com/tanzu_observability/proxy:12.1`                          | `YOUR_IMAGE_REGISTRY/proxy:12.1`                          |
 | Wavefront logging              | `projects.registry.vmware.com/tanzu_observability/kubernetes-operator-fluentbit:2.0.8` | `YOUR_IMAGE_REGISTRY/kubernetes-operator-fluentbit:2.0.8` |