diff --git a/pkg/templates/crds/hive-operator/hive.openshift.io_clusterpools.yaml b/pkg/templates/crds/hive-operator/hive.openshift.io_clusterpools.yaml index 8b2f16688..807527ac7 100644 --- a/pkg/templates/crds/hive-operator/hive.openshift.io_clusterpools.yaml +++ b/pkg/templates/crds/hive-operator/hive.openshift.io_clusterpools.yaml @@ -153,6 +153,117 @@ spec: type: string type: object x-kubernetes-map-type: atomic + installerEnv: + description: InstallerEnv are extra environment variables to pass + through to the installer. This may be used to enable additional + features of the installer. + 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 previously 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. + Double $$ are reduced to a single $, which allows for escaping + the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce the + string literal "$(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 + x-kubernetes-map-type: atomic + 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 + x-kubernetes-map-type: atomic + 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 + x-kubernetes-map-type: atomic + 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 + x-kubernetes-map-type: atomic + type: object + required: + - name + type: object + type: array inventory: description: Inventory maintains a list of entries consumed by the ClusterPool to customize the default ClusterDeployment. diff --git a/pkg/templates/crds/hive-operator/hive.openshift.io_hiveconfigs.yaml b/pkg/templates/crds/hive-operator/hive.openshift.io_hiveconfigs.yaml index e84e003ca..5d83a6827 100644 --- a/pkg/templates/crds/hive-operator/hive.openshift.io_hiveconfigs.yaml +++ b/pkg/templates/crds/hive-operator/hive.openshift.io_hiveconfigs.yaml @@ -627,6 +627,13 @@ spec: fatal, error, warn, info, debug, and trace. The default level is info. type: string + machinePoolPollInterval: + description: MachinePoolPollInterval is a string duration indicating + how much time must pass before checking whether remote resources + related to MachinePools need to be reapplied. Set to zero to disable + polling -- we'll only reconcile when hub objects change. The default + interval is 30m. + type: string maintenanceMode: description: MaintenanceMode can be set to true to disable the hive controllers in situations where we need to ensure nothing is running diff --git a/pkg/templates/crds/hive-operator/hive.openshift.io_machinepools.yaml b/pkg/templates/crds/hive-operator/hive.openshift.io_machinepools.yaml index 6ba381343..b3703be1e 100644 --- a/pkg/templates/crds/hive-operator/hive.openshift.io_machinepools.yaml +++ b/pkg/templates/crds/hive-operator/hive.openshift.io_machinepools.yaml @@ -603,6 +603,15 @@ spec: - type type: object type: array + controlledByReplica: + description: ControlledByReplica indicates which replica of the hive-machinepool + StatefulSet is responsible for this MachinePool. Note that this + value indicates the replica that most recently handled the MachinePool. + If the hive-machinepool statefulset is scaled up or down, the controlling + replica can change, potentially causing logs to be spread across + multiple pods. + format: int64 + type: integer machineSets: description: MachineSets is the status of the machine sets for the machine pool on the remote cluster.