From 90d5790e6872221c6be8128395242f1b3a3b56a2 Mon Sep 17 00:00:00 2001 From: Peter Braun Date: Fri, 20 Aug 2021 13:03:42 +0200 Subject: [PATCH] updates for OS 4.7 --- api/integreatly/v1alpha1/grafana_types.go | 2 +- .../integreatly.org_grafanadatasources.yaml | 8 - .../manifests/integreatly.org_grafanas.yaml | 152 ++++++++++-------- .../crd/bases/integreatly.org_grafanas.yaml | 1 - 4 files changed, 84 insertions(+), 79 deletions(-) diff --git a/api/integreatly/v1alpha1/grafana_types.go b/api/integreatly/v1alpha1/grafana_types.go index f5d5fea8c..97a2a8037 100644 --- a/api/integreatly/v1alpha1/grafana_types.go +++ b/api/integreatly/v1alpha1/grafana_types.go @@ -61,7 +61,7 @@ type JsonnetConfig struct { // Grafana API client settings type GrafanaClient struct { - TimeoutSeconds *int `json:"timeout"` + TimeoutSeconds *int `json:"timeout,omitempty"` PreferService bool `json:"preferService"` } diff --git a/bundle/manifests/integreatly.org_grafanadatasources.yaml b/bundle/manifests/integreatly.org_grafanadatasources.yaml index 8126d4730..896306503 100644 --- a/bundle/manifests/integreatly.org_grafanadatasources.yaml +++ b/bundle/manifests/integreatly.org_grafanadatasources.yaml @@ -273,14 +273,6 @@ spec: - name type: object status: - properties: - message: - type: string - phase: - type: string - required: - - message - - phase type: object type: object served: true diff --git a/bundle/manifests/integreatly.org_grafanas.yaml b/bundle/manifests/integreatly.org_grafanas.yaml index 6a9ac9e8d..a4ebcac1b 100644 --- a/bundle/manifests/integreatly.org_grafanas.yaml +++ b/bundle/manifests/integreatly.org_grafanas.yaml @@ -32,15 +32,6 @@ spec: baseImage: type: string client: - description: Grafana API client settings - properties: - preferService: - type: boolean - timeout: - type: integer - required: - - preferService - - timeout type: object config: description: GrafanaConfig is the configuration for grafana @@ -153,6 +144,8 @@ spec: type: boolean role_attribute_path: type: string + role_attribute_strict: + type: boolean scopes: type: string tls_client_ca: @@ -260,6 +253,8 @@ spec: type: string role_attribute_path: type: string + role_attribute_strict: + type: boolean scopes: type: string token_url: @@ -1881,6 +1876,85 @@ spec: type: string type: object type: object + env: + items: + description: EnvVar represents an environment variable present in a Container. + properties: + name: + description: Name of the environment variable. Must be a C_IDENTIFIER. + type: string + value: + description: 'Variable references $(VAR_NAME) are expanded using the previous defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to "".' + type: string + valueFrom: + description: Source for the environment variable's value. Cannot be used if value is not empty. + properties: + configMapKeyRef: + description: Selects a key of a ConfigMap. + properties: + key: + description: The key to select. + type: string + name: + description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: + description: Specify whether the ConfigMap or its key must be defined + type: boolean + required: + - key + type: object + fieldRef: + description: 'Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.labels['''']`, `metadata.annotations['''']`, spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.' + properties: + apiVersion: + description: Version of the schema the FieldPath is written in terms of, defaults to "v1". + type: string + fieldPath: + description: Path of the field to select in the specified API version. + type: string + required: + - fieldPath + type: object + resourceFieldRef: + description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.' + properties: + containerName: + description: 'Container name: required for volumes, optional for env vars' + type: string + divisor: + anyOf: + - type: integer + - type: string + description: Specifies the output format of the exposed resources, defaults to "1" + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + resource: + description: 'Required: resource to select' + type: string + required: + - resource + type: object + secretKeyRef: + description: Selects a key of a secret in the pod's namespace + properties: + key: + description: The key of the secret to select from. Must be a valid secret key. + type: string + name: + description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: + description: Specify whether the Secret or its key must be defined + type: boolean + required: + - key + type: object + type: object + required: + - name + type: object + type: array envFrom: items: description: EnvFromSource represents the source of a set of ConfigMaps @@ -3227,66 +3301,6 @@ spec: - config type: object status: - description: GrafanaStatus defines the observed state of Grafana - properties: - dashboards: - items: - description: Used to keep a dashboard reference without having access to the dashboard struct itself - properties: - folderId: - format: int64 - type: integer - folderName: - type: string - hash: - type: string - name: - type: string - namespace: - type: string - uid: - type: string - required: - - folderId - - folderName - - hash - - name - - namespace - - uid - type: object - type: array - failedPlugins: - items: - description: GrafanaPlugin contains information about a single plugin - properties: - name: - type: string - version: - type: string - required: - - name - - version - type: object - type: array - installedPlugins: - items: - description: GrafanaPlugin contains information about a single plugin - properties: - name: - type: string - version: - type: string - required: - - name - - version - type: object - type: array - message: - type: string - phase: - type: string - previousServiceName: - type: string type: object type: object served: true diff --git a/config/crd/bases/integreatly.org_grafanas.yaml b/config/crd/bases/integreatly.org_grafanas.yaml index 0efb40a03..f25263032 100644 --- a/config/crd/bases/integreatly.org_grafanas.yaml +++ b/config/crd/bases/integreatly.org_grafanas.yaml @@ -46,7 +46,6 @@ spec: type: integer required: - preferService - - timeout type: object config: description: GrafanaConfig is the configuration for grafana