chore: synced file(s) with aiven/aiven-operator (#24)

* chore: synced local 'charts/aiven-operator/' with remote 'charts/aiven-operator/' * chore: synced local 'charts/aiven-operator-crds/' with remote 'charts/aiven-operator-crds/'
aiven · Apr 25, 2023 · 7a234be · 7a234be
1 parent 6e322a6
commit 7a234be
Show file tree

Hide file tree

Showing 17 changed files with 203 additions and 18 deletions.
diff --git a/charts/aiven-operator-crds/Chart.yaml b/charts/aiven-operator-crds/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: aiven-operator-crds
 description: A Helm chart to deploy the aiven operator custom resource definitions
 type: application
-version: v0.10.0
-appVersion: v0.10.0
+version: v0.11.0
+appVersion: v0.11.0
 maintainers:
   - name: mhoffm-aiven
     url: https://www.aiven.io

diff --git a/charts/aiven-operator-crds/templates/aiven.io_cassandras.yaml b/charts/aiven-operator-crds/templates/aiven.io_cassandras.yaml
@@ -68,6 +68,18 @@ spec:
               connInfoSecretTarget:
                 description: Information regarding secret creation
                 properties:
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    description: Annotations added to the secret
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: Labels added to the secret
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
                   name:
                     description: Name of the secret resource to be created. By default,
                       is equal to the resource name

diff --git a/charts/aiven-operator-crds/templates/aiven.io_clickhouses.yaml b/charts/aiven-operator-crds/templates/aiven.io_clickhouses.yaml
@@ -55,6 +55,18 @@ spec:
               connInfoSecretTarget:
                 description: Information regarding secret creation
                 properties:
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    description: Annotations added to the secret
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: Labels added to the secret
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
                   name:
                     description: Name of the secret resource to be created. By default,
                       is equal to the resource name

diff --git a/charts/aiven-operator-crds/templates/aiven.io_clickhouseusers.yaml b/charts/aiven-operator-crds/templates/aiven.io_clickhouseusers.yaml
@@ -61,6 +61,18 @@ spec:
               connInfoSecretTarget:
                 description: Information regarding secret creation
                 properties:
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    description: Annotations added to the secret
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: Labels added to the secret
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
                   name:
                     description: Name of the secret resource to be created. By default,
                       is equal to the resource name

diff --git a/charts/aiven-operator-crds/templates/aiven.io_connectionpools.yaml b/charts/aiven-operator-crds/templates/aiven.io_connectionpools.yaml
@@ -70,6 +70,18 @@ spec:
               connInfoSecretTarget:
                 description: Information regarding secret creation
                 properties:
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    description: Annotations added to the secret
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: Labels added to the secret
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
                   name:
                     description: Name of the secret resource to be created. By default,
                       is equal to the resource name

diff --git a/charts/aiven-operator-crds/templates/aiven.io_grafanas.yaml b/charts/aiven-operator-crds/templates/aiven.io_grafanas.yaml
@@ -68,6 +68,18 @@ spec:
               connInfoSecretTarget:
                 description: Information regarding secret creation
                 properties:
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    description: Annotations added to the secret
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: Labels added to the secret
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
                   name:
                     description: Name of the secret resource to be created. By default,
                       is equal to the resource name

diff --git a/charts/aiven-operator-crds/templates/aiven.io_kafkas.yaml b/charts/aiven-operator-crds/templates/aiven.io_kafkas.yaml
@@ -68,6 +68,18 @@ spec:
               connInfoSecretTarget:
                 description: Information regarding secret creation
                 properties:
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    description: Annotations added to the secret
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: Labels added to the secret
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
                   name:
                     description: Name of the secret resource to be created. By default,
                       is equal to the resource name

diff --git a/charts/aiven-operator-crds/templates/aiven.io_mysqls.yaml b/charts/aiven-operator-crds/templates/aiven.io_mysqls.yaml
@@ -68,6 +68,18 @@ spec:
               connInfoSecretTarget:
                 description: Information regarding secret creation
                 properties:
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    description: Annotations added to the secret
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: Labels added to the secret
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
                   name:
                     description: Name of the secret resource to be created. By default,
                       is equal to the resource name

diff --git a/charts/aiven-operator-crds/templates/aiven.io_opensearches.yaml b/charts/aiven-operator-crds/templates/aiven.io_opensearches.yaml
@@ -55,6 +55,18 @@ spec:
               connInfoSecretTarget:
                 description: Information regarding secret creation
                 properties:
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    description: Annotations added to the secret
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: Labels added to the secret
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
                   name:
                     description: Name of the secret resource to be created. By default,
                       is equal to the resource name
@@ -389,7 +401,7 @@ spec:
                         description: Maximum number of aggregation buckets allowed
                           in a single response. OpenSearch default value is used when
                           this is not defined.
-                        maximum: 20000
+                        maximum: 65536
                         minimum: 1
                         type: integer
                       thread_pool_analyze_queue_size:

diff --git a/charts/aiven-operator-crds/templates/aiven.io_postgresqls.yaml b/charts/aiven-operator-crds/templates/aiven.io_postgresqls.yaml
@@ -68,6 +68,18 @@ spec:
               connInfoSecretTarget:
                 description: Information regarding secret creation
                 properties:
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    description: Annotations added to the secret
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: Labels added to the secret
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
                   name:
                     description: Name of the secret resource to be created. By default,
                       is equal to the resource name

diff --git a/charts/aiven-operator-crds/templates/aiven.io_projects.yaml b/charts/aiven-operator-crds/templates/aiven.io_projects.yaml
@@ -97,6 +97,18 @@ spec:
               connInfoSecretTarget:
                 description: Information regarding secret creation
                 properties:
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    description: Annotations added to the secret
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: Labels added to the secret
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
                   name:
                     description: Name of the secret resource to be created. By default,
                       is equal to the resource name

diff --git a/charts/aiven-operator-crds/templates/aiven.io_redis.yaml b/charts/aiven-operator-crds/templates/aiven.io_redis.yaml
@@ -55,6 +55,18 @@ spec:
               connInfoSecretTarget:
                 description: Information regarding secret creation
                 properties:
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    description: Annotations added to the secret
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: Labels added to the secret
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
                   name:
                     description: Name of the secret resource to be created. By default,
                       is equal to the resource name

diff --git a/charts/aiven-operator-crds/templates/aiven.io_serviceintegrations.yaml b/charts/aiven-operator-crds/templates/aiven.io_serviceintegrations.yaml
@@ -247,17 +247,26 @@ spec:
                 type: object
               destinationEndpointId:
                 description: Destination endpoint for the integration (if any)
+                maxLength: 36
+                type: string
+                x-kubernetes-validations:
+                - message: Value is immutable
+                  rule: self == oldSelf
+              destinationProjectName:
+                description: Destination project for the integration (if any)
+                maxLength: 63
                 type: string
                 x-kubernetes-validations:
                 - message: Value is immutable
                   rule: self == oldSelf
               destinationServiceName:
                 description: Destination service for the integration (if any)
+                maxLength: 64
                 type: string
                 x-kubernetes-validations:
                 - message: Value is immutable
                   rule: self == oldSelf
-              external_aws_cloudwatch_metrics:
+              externalAWSCloudwatchMetrics:
                 description: External AWS CloudWatch Metrics integration Logs configuration
                   values
                 properties:
@@ -303,24 +312,44 @@ spec:
                     type: array
                 type: object
               integrationType:
-                description: Type of the service integration
+                description: Type of the service integration accepted by Aiven API.
+                  Some values may not be supported by the operator
                 enum:
+                - alertmanager
+                - autoscaler
+                - caching
+                - cassandra_cross_service_cluster
+                - clickhouse_kafka
+                - clickhouse_postgresql
+                - dashboard
                 - datadog
-                - kafka_logs
+                - datasource
+                - external_aws_cloudwatch_logs
+                - external_aws_cloudwatch_metrics
+                - external_elasticsearch_logs
+                - external_google_cloud_logging
+                - external_opensearch_logs
+                - flink
+                - flink_external_kafka
+                - internal_connectivity
+                - jolokia
                 - kafka_connect
+                - kafka_logs
+                - kafka_mirrormaker
+                - logs
+                - m3aggregator
+                - m3coordinator
                 - metrics
-                - dashboard
-                - rsyslog
+                - opensearch_cross_cluster_replication
+                - opensearch_cross_cluster_search
+                - prometheus
                 - read_replica
+                - rsyslog
                 - schema_registry_proxy
-                - jolokia
-                - internal_connectivity
-                - external_google_cloud_logging
-                - datasource
-                - clickhouse_postgresql
-                - clickhouse_kafka
-                - logs
-                - external_aws_cloudwatch_metrics
+                - stresstester
+                - thanosquery
+                - thanosstore
+                - vmalert
                 type: string
                 x-kubernetes-validations:
                 - message: Value is immutable
@@ -534,12 +563,21 @@ spec:
                   rule: self == oldSelf
               sourceEndpointID:
                 description: Source endpoint for the integration (if any)
+                maxLength: 36
+                type: string
+                x-kubernetes-validations:
+                - message: Value is immutable
+                  rule: self == oldSelf
+              sourceProjectName:
+                description: Source project for the integration (if any)
+                maxLength: 63
                 type: string
                 x-kubernetes-validations:
                 - message: Value is immutable
                   rule: self == oldSelf
               sourceServiceName:
                 description: Source service for the integration (if any)
+                maxLength: 64
                 type: string
                 x-kubernetes-validations:
                 - message: Value is immutable

diff --git a/charts/aiven-operator-crds/templates/aiven.io_serviceusers.yaml b/charts/aiven-operator-crds/templates/aiven.io_serviceusers.yaml
@@ -67,6 +67,18 @@ spec:
               connInfoSecretTarget:
                 description: Information regarding secret creation
                 properties:
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    description: Annotations added to the secret
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: Labels added to the secret
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
                   name:
                     description: Name of the secret resource to be created. By default,
                       is equal to the resource name

diff --git a/charts/aiven-operator/Chart.yaml b/charts/aiven-operator/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: aiven-operator
 description: A Helm chart to deploy the aiven operator
 type: application
-version: v0.10.0
-appVersion: v0.10.0
+version: v0.11.0
+appVersion: v0.11.0
 maintainers:
   - name: mhoffm-aiven
     url: https://www.aiven.io

diff --git a/charts/aiven-operator/templates/ensure_cert_manager_if_webhooks_are_enabled.yaml b/charts/aiven-operator/templates/ensure_cert_manager_if_webhooks_are_enabled.yaml
@@ -1,8 +1,10 @@
 {{- if .Values.webhooks.enabled }}
 
+{{- if .Values.webhooks.checkCapabilities }}
 {{- if not (.Capabilities.APIVersions.Has "cert-manager.io/v1") -}}
     {{- fail "Required Cert Manager CRDs are missing even though Webhooks are enabled and Cert Manager is required" }}
 {{ end }}
+{{ end }}
 
 {{ end }}
 
diff --git a/charts/aiven-operator/values.yaml b/charts/aiven-operator/values.yaml
@@ -21,6 +21,7 @@ defaultTokenSecret:
 # webhhook configuration
 webhooks:
   enabled: true
+  checkCapabilities: true
   servicePort: 443
   # Set 10250 for GKE, default is 9443
   # containerPort: 9443