From 827d0b1561f45da7a44373f889afc493384a1f3e Mon Sep 17 00:00:00 2001 From: aggarwalakshun Date: Thu, 2 Oct 2025 19:03:42 +0530 Subject: [PATCH] sync with latest source --- .../cluster-upgrade/cluster-upgrade.yml | 4 +- cluster/config/cluster-upgrade/crd.yaml | 922 ++++++++++++++---- .../system-upgrade-controller.yaml | 2 +- 3 files changed, 733 insertions(+), 195 deletions(-) diff --git a/cluster/config/cluster-upgrade/cluster-upgrade.yml b/cluster/config/cluster-upgrade/cluster-upgrade.yml index d15f090..cbf64b5 100644 --- a/cluster/config/cluster-upgrade/cluster-upgrade.yml +++ b/cluster/config/cluster-upgrade/cluster-upgrade.yml @@ -5,7 +5,6 @@ metadata: name: server-plan namespace: system-upgrade spec: - channel: https://update.k3s.io/v1-release/channels/stable concurrency: 1 cordon: true nodeSelector: @@ -17,6 +16,7 @@ spec: serviceAccountName: system-upgrade upgrade: image: rancher/k3s-upgrade + channel: https://update.k3s.io/v1-release/channels/stable --- # Agent plan apiVersion: upgrade.cattle.io/v1 @@ -25,7 +25,6 @@ metadata: name: agent-plan namespace: system-upgrade spec: - channel: https://update.k3s.io/v1-release/channels/stable concurrency: 1 cordon: true nodeSelector: @@ -40,3 +39,4 @@ spec: serviceAccountName: system-upgrade upgrade: image: rancher/k3s-upgrade + channel: https://update.k3s.io/v1-release/channels/stable diff --git a/cluster/config/cluster-upgrade/crd.yaml b/cluster/config/cluster-upgrade/crd.yaml index 927a8ca..44f3e25 100644 --- a/cluster/config/cluster-upgrade/crd.yaml +++ b/cluster/config/cluster-upgrade/crd.yaml @@ -1,16 +1,17 @@ +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.17.3 name: plans.upgrade.cattle.io spec: group: upgrade.cattle.io names: - categories: - - upgrade kind: Plan + listKind: PlanList plural: plans singular: plan - preserveUnknownFields: false scope: Namespaced versions: - additionalPrinterColumns: @@ -23,658 +24,1195 @@ spec: - jsonPath: .spec.version name: Version type: string + - jsonPath: .status.conditions[?(@.type=='Complete')].status + name: Complete + type: string + - jsonPath: .status.conditions[?(@.message!='')].message + name: Message + type: string + - jsonPath: .status.applying + name: Applying + priority: 10 + type: string name: v1 schema: openAPIV3Schema: + description: Plan represents a set of Jobs to apply an upgrade (or other operation) + to set of Nodes. 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: PlanSpec represents the user-configurable details of a Plan. properties: channel: - nullable: true + description: A URL that returns HTTP 302 with the last path element + of the value returned in the Location header assumed to be an image + tag (after munging "+" to "-"). type: string concurrency: + description: The maximum number of concurrent nodes to apply this + update on. + format: int64 type: integer cordon: + description: |- + If Cordon is true, the node is cordoned before the upgrade container is run. + If drain is specified, the value for cordon is ignored, and the node is cordoned. + If neither drain nor cordon are specified and the node is marked as schedulable=false it will not be marked as schedulable=true when the Job completes. type: boolean drain: - nullable: true + description: Configuration for draining nodes prior to upgrade. If + left unspecified, no drain will be performed. properties: deleteEmptydirData: - nullable: true type: boolean deleteLocalData: - nullable: true type: boolean disableEviction: type: boolean force: type: boolean gracePeriod: - nullable: true + format: int32 type: integer ignoreDaemonSets: - nullable: true type: boolean podSelector: - nullable: true + description: |- + A label selector is a label query over a set of resources. The result of matchLabels and + matchExpressions are ANDed. An empty label selector matches all objects. A null + label selector matches no objects. properties: matchExpressions: + description: matchExpressions is a list of label selector + requirements. The requirements are ANDed. items: + description: |- + A label selector requirement is a selector that contains values, a key, and an operator that + relates the key and values. properties: key: - nullable: true + description: key is the label key that the selector + applies to. type: string operator: - nullable: true + description: |- + operator represents a key's relationship to a set of values. + Valid operators are In, NotIn, Exists and DoesNotExist. type: string values: + description: |- + values is an array of string values. If the operator is In or NotIn, + the values array must be non-empty. If the operator is Exists or DoesNotExist, + the values array must be empty. This array is replaced during a strategic + merge patch. items: - nullable: true type: string - nullable: true type: array + x-kubernetes-list-type: atomic + required: + - key + - operator type: object - nullable: true type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: - nullable: true type: string - nullable: true + description: |- + matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels + map is equivalent to an element of matchExpressions, whose key field is "key", the + operator is "In", and the values array contains only "value". The requirements are ANDed. type: object type: object + x-kubernetes-map-type: atomic skipWaitForDeleteTimeout: type: integer timeout: - nullable: true - type: integer + anyOf: + - type: integer + - type: string + description: |- + If a string, this is passed through directly to the `kubectl drain` command. + If an int, this represents the duration as a count of nanoseconds, and will be converted to a duration string when passed to the `kubectl drain` command. + x-kubernetes-int-or-string: true type: object exclusive: + description: Jobs for exclusive plans cannot be run alongside any + other exclusive plan. type: boolean imagePullSecrets: + description: Image Pull Secrets, used to pull images for the Job. items: + description: |- + LocalObjectReference contains enough information to let you locate the + referenced object inside the same namespace. properties: name: - nullable: true + default: "" + description: |- + Name of the referent. + This field is effectively required, but due to backwards compatibility is + allowed to be empty. Instances of this type with an empty value here are + almost certainly wrong. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names type: string type: object - nullable: true + x-kubernetes-map-type: atomic type: array jobActiveDeadlineSecs: + description: |- + Sets ActiveDeadlineSeconds on Jobs generated to apply this Plan. + If the Job does not complete within this time, the Plan will stop processing until it is updated to trigger a redeploy. + If set to 0, Jobs have no deadline. If not set, the controller default value is used. + format: int64 type: integer nodeSelector: - nullable: true + description: Select which nodes this plan can be applied to. properties: matchExpressions: + description: matchExpressions is a list of label selector requirements. + The requirements are ANDed. items: + description: |- + A label selector requirement is a selector that contains values, a key, and an operator that + relates the key and values. properties: key: - nullable: true + description: key is the label key that the selector applies + to. type: string operator: - nullable: true + description: |- + operator represents a key's relationship to a set of values. + Valid operators are In, NotIn, Exists and DoesNotExist. type: string values: + description: |- + values is an array of string values. If the operator is In or NotIn, + the values array must be non-empty. If the operator is Exists or DoesNotExist, + the values array must be empty. This array is replaced during a strategic + merge patch. items: - nullable: true type: string - nullable: true type: array + x-kubernetes-list-type: atomic + required: + - key + - operator type: object - nullable: true type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: - nullable: true type: string - nullable: true + description: |- + matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels + map is equivalent to an element of matchExpressions, whose key field is "key", the + operator is "In", and the values array contains only "value". The requirements are ANDed. type: object type: object + x-kubernetes-map-type: atomic postCompleteDelay: - nullable: true + description: Time after a Job for one Node is complete before a new + Job will be created for the next Node. type: string prepare: - nullable: true + description: The prepare init container, if specified, is run before + cordon/drain which is run before the upgrade container. properties: args: items: - nullable: true type: string - nullable: true type: array command: items: - nullable: true type: string - nullable: true type: array envFrom: items: + description: EnvFromSource represents the source of a set of + ConfigMaps or Secrets properties: configMapRef: - nullable: true + description: The ConfigMap to select from properties: name: - nullable: true + default: "" + description: |- + Name of the referent. + This field is effectively required, but due to backwards compatibility is + allowed to be empty. Instances of this type with an empty value here are + almost certainly wrong. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names type: string optional: - nullable: true + description: Specify whether the ConfigMap must be defined type: boolean type: object + x-kubernetes-map-type: atomic prefix: - nullable: true + description: Optional text to prepend to the name of each + environment variable. Must be a C_IDENTIFIER. type: string secretRef: - nullable: true + description: The Secret to select from properties: name: - nullable: true + default: "" + description: |- + Name of the referent. + This field is effectively required, but due to backwards compatibility is + allowed to be empty. Instances of this type with an empty value here are + almost certainly wrong. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names type: string optional: - nullable: true + description: Specify whether the Secret must be defined type: boolean type: object + x-kubernetes-map-type: atomic type: object - nullable: true type: array envs: items: + description: EnvVar represents an environment variable present + in a Container. properties: name: - nullable: true + description: Name of the environment variable. Must be a + C_IDENTIFIER. type: string value: - nullable: true + 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: - nullable: true + description: Source for the environment variable's value. + Cannot be used if value is not empty. properties: configMapKeyRef: - nullable: true + description: Selects a key of a ConfigMap. properties: key: - nullable: true + description: The key to select. type: string name: - nullable: true + default: "" + description: |- + Name of the referent. + This field is effectively required, but due to backwards compatibility is + allowed to be empty. Instances of this type with an empty value here are + almost certainly wrong. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names type: string optional: - nullable: true + description: Specify whether the ConfigMap or its + key must be defined type: boolean + required: + - key type: object + x-kubernetes-map-type: atomic fieldRef: - nullable: true + 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: - nullable: true + description: Version of the schema the FieldPath + is written in terms of, defaults to "v1". type: string fieldPath: - nullable: true + description: Path of the field to select in the + specified API version. type: string + required: + - fieldPath type: object + x-kubernetes-map-type: atomic resourceFieldRef: - nullable: true + 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: - nullable: true + description: 'Container name: required for volumes, + optional for env vars' type: string divisor: - nullable: true - type: string + 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: - nullable: true + description: 'Required: resource to select' type: string + required: + - resource type: object + x-kubernetes-map-type: atomic secretKeyRef: - nullable: true + description: Selects a key of a secret in the pod's + namespace properties: key: - nullable: true + description: The key of the secret to select from. Must + be a valid secret key. type: string name: - nullable: true + default: "" + description: |- + Name of the referent. + This field is effectively required, but due to backwards compatibility is + allowed to be empty. Instances of this type with an empty value here are + almost certainly wrong. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names type: string optional: - nullable: true + 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 - nullable: true type: array image: - nullable: true + description: Image name. If the tag is omitted, the value from + .status.latestVersion will be used. type: string securityContext: - nullable: true + description: |- + SecurityContext holds security configuration that will be applied to a container. + Some fields are present in both SecurityContext and PodSecurityContext. When both + are set, the values in SecurityContext take precedence. properties: allowPrivilegeEscalation: - nullable: true + description: |- + AllowPrivilegeEscalation controls whether a process can gain more + privileges than its parent process. This bool directly controls if + the no_new_privs flag will be set on the container process. + AllowPrivilegeEscalation is true always when the container is: + 1) run as Privileged + 2) has CAP_SYS_ADMIN + Note that this field cannot be set when spec.os.name is windows. type: boolean appArmorProfile: - nullable: true + description: |- + appArmorProfile is the AppArmor options to use by this container. If set, this profile + overrides the pod's appArmorProfile. + Note that this field cannot be set when spec.os.name is windows. properties: localhostProfile: - nullable: true + description: |- + localhostProfile indicates a profile loaded on the node that should be used. + The profile must be preconfigured on the node to work. + Must match the loaded name of the profile. + Must be set if and only if type is "Localhost". type: string type: - nullable: true + description: |- + type indicates which kind of AppArmor profile will be applied. + Valid options are: + Localhost - a profile pre-loaded on the node. + RuntimeDefault - the container runtime's default profile. + Unconfined - no AppArmor enforcement. type: string + required: + - type type: object capabilities: - nullable: true + description: |- + The capabilities to add/drop when running containers. + Defaults to the default set of capabilities granted by the container runtime. + Note that this field cannot be set when spec.os.name is windows. properties: add: + description: Added capabilities items: - nullable: true + description: Capability represent POSIX capabilities + type type: string - nullable: true type: array + x-kubernetes-list-type: atomic drop: + description: Removed capabilities items: - nullable: true + description: Capability represent POSIX capabilities + type type: string - nullable: true type: array + x-kubernetes-list-type: atomic type: object privileged: - nullable: true + description: |- + Run container in privileged mode. + Processes in privileged containers are essentially equivalent to root on the host. + Defaults to false. + Note that this field cannot be set when spec.os.name is windows. type: boolean procMount: - nullable: true + description: |- + procMount denotes the type of proc mount to use for the containers. + The default value is Default which uses the container runtime defaults for + readonly paths and masked paths. + This requires the ProcMountType feature flag to be enabled. + Note that this field cannot be set when spec.os.name is windows. type: string readOnlyRootFilesystem: - nullable: true + description: |- + Whether this container has a read-only root filesystem. + Default is false. + Note that this field cannot be set when spec.os.name is windows. type: boolean runAsGroup: - nullable: true + description: |- + The GID to run the entrypoint of the container process. + Uses runtime default if unset. + May also be set in PodSecurityContext. If set in both SecurityContext and + PodSecurityContext, the value specified in SecurityContext takes precedence. + Note that this field cannot be set when spec.os.name is windows. + format: int64 type: integer runAsNonRoot: - nullable: true + description: |- + Indicates that the container must run as a non-root user. + If true, the Kubelet will validate the image at runtime to ensure that it + does not run as UID 0 (root) and fail to start the container if it does. + If unset or false, no such validation will be performed. + May also be set in PodSecurityContext. If set in both SecurityContext and + PodSecurityContext, the value specified in SecurityContext takes precedence. type: boolean runAsUser: - nullable: true + description: |- + The UID to run the entrypoint of the container process. + Defaults to user specified in image metadata if unspecified. + May also be set in PodSecurityContext. If set in both SecurityContext and + PodSecurityContext, the value specified in SecurityContext takes precedence. + Note that this field cannot be set when spec.os.name is windows. + format: int64 type: integer seLinuxOptions: - nullable: true + description: |- + The SELinux context to be applied to the container. + If unspecified, the container runtime will allocate a random SELinux context for each + container. May also be set in PodSecurityContext. If set in both SecurityContext and + PodSecurityContext, the value specified in SecurityContext takes precedence. + Note that this field cannot be set when spec.os.name is windows. properties: level: - nullable: true + description: Level is SELinux level label that applies + to the container. type: string role: - nullable: true + description: Role is a SELinux role label that applies + to the container. type: string type: - nullable: true + description: Type is a SELinux type label that applies + to the container. type: string user: - nullable: true + description: User is a SELinux user label that applies + to the container. type: string type: object seccompProfile: - nullable: true + description: |- + The seccomp options to use by this container. If seccomp options are + provided at both the pod & container level, the container options + override the pod options. + Note that this field cannot be set when spec.os.name is windows. properties: localhostProfile: - nullable: true + description: |- + localhostProfile indicates a profile defined in a file on the node should be used. + The profile must be preconfigured on the node to work. + Must be a descending path, relative to the kubelet's configured seccomp profile location. + Must be set if type is "Localhost". Must NOT be set for any other type. type: string type: - nullable: true + description: |- + type indicates which kind of seccomp profile will be applied. + Valid options are: + + Localhost - a profile defined in a file on the node should be used. + RuntimeDefault - the container runtime default profile should be used. + Unconfined - no profile should be applied. type: string + required: + - type type: object windowsOptions: - nullable: true + description: |- + The Windows specific settings applied to all containers. + If unspecified, the options from the PodSecurityContext will be used. + If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. + Note that this field cannot be set when spec.os.name is linux. properties: gmsaCredentialSpec: - nullable: true + description: |- + GMSACredentialSpec is where the GMSA admission webhook + (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the + GMSA credential spec named by the GMSACredentialSpecName field. type: string gmsaCredentialSpecName: - nullable: true + description: GMSACredentialSpecName is the name of the + GMSA credential spec to use. type: string hostProcess: - nullable: true + description: |- + HostProcess determines if a container should be run as a 'Host Process' container. + All of a Pod's containers must have the same effective HostProcess value + (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers). + In addition, if HostProcess is true then HostNetwork must also be set to true. type: boolean runAsUserName: - nullable: true + description: |- + The UserName in Windows to run the entrypoint of the container process. + Defaults to the user specified in image metadata if unspecified. + May also be set in PodSecurityContext. If set in both SecurityContext and + PodSecurityContext, the value specified in SecurityContext takes precedence. type: string type: object type: object volumes: items: + description: HostPath volume to mount into the pod properties: destination: - nullable: true + description: Path to mount the Volume at within the Pod. type: string name: - nullable: true + description: Name of the Volume as it will appear within + the Pod spec. type: string source: - nullable: true + description: Path on the host to mount. type: string + required: + - destination + - name + - source type: object - nullable: true type: array + required: + - image type: object + priorityClassName: + description: Priority Class Name of Job, if specified. + type: string secrets: + description: Secrets to be mounted into the Job Pod. items: + description: SecretSpec describes a Secret to be mounted for prepare/upgrade + containers. properties: + defaultMode: + description: Mode to mount the Secret volume with. + format: int32 + type: integer ignoreUpdates: + description: If set to true, the Secret contents will not be + hashed, and changes to the Secret will not trigger new application + of the Plan. type: boolean name: - nullable: true + description: Secret name type: string path: - nullable: true + description: Path to mount the Secret volume within the Pod. type: string + required: + - name + - path type: object - nullable: true type: array serviceAccountName: - nullable: true + description: The service account for the pod to use. As with normal + pods, if not specified the default service account from the namespace + will be assigned. type: string tolerations: + description: |- + Specify which node taints should be tolerated by pods applying the upgrade. + Anything specified here is appended to the default of: + - `{key: node.kubernetes.io/unschedulable, effect: NoSchedule, operator: Exists}` items: + description: |- + The pod this Toleration is attached to tolerates any taint that matches + the triple using the matching operator . properties: effect: - nullable: true + description: |- + Effect indicates the taint effect to match. Empty means match all taint effects. + When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute. type: string key: - nullable: true + description: |- + Key is the taint key that the toleration applies to. Empty means match all taint keys. + If the key is empty, operator must be Exists; this combination means to match all values and all keys. type: string operator: - nullable: true + description: |- + Operator represents a key's relationship to the value. + Valid operators are Exists and Equal. Defaults to Equal. + Exists is equivalent to wildcard for value, so that a pod can + tolerate all taints of a particular category. type: string tolerationSeconds: - nullable: true + description: |- + TolerationSeconds represents the period of time the toleration (which must be + of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default, + it is not set, which means tolerate the taint forever (do not evict). Zero and + negative values will be treated as 0 (evict immediately) by the system. + format: int64 type: integer value: - nullable: true + description: |- + Value is the taint value the toleration matches to. + If the operator is Exists, the value should be empty, otherwise just a regular string. type: string type: object - nullable: true type: array upgrade: - nullable: true + description: The upgrade container; must be specified. properties: args: items: - nullable: true type: string - nullable: true type: array command: items: - nullable: true type: string - nullable: true type: array envFrom: items: + description: EnvFromSource represents the source of a set of + ConfigMaps or Secrets properties: configMapRef: - nullable: true + description: The ConfigMap to select from properties: name: - nullable: true + default: "" + description: |- + Name of the referent. + This field is effectively required, but due to backwards compatibility is + allowed to be empty. Instances of this type with an empty value here are + almost certainly wrong. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names type: string optional: - nullable: true + description: Specify whether the ConfigMap must be defined type: boolean type: object + x-kubernetes-map-type: atomic prefix: - nullable: true + description: Optional text to prepend to the name of each + environment variable. Must be a C_IDENTIFIER. type: string secretRef: - nullable: true + description: The Secret to select from properties: name: - nullable: true + default: "" + description: |- + Name of the referent. + This field is effectively required, but due to backwards compatibility is + allowed to be empty. Instances of this type with an empty value here are + almost certainly wrong. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names type: string optional: - nullable: true + description: Specify whether the Secret must be defined type: boolean type: object + x-kubernetes-map-type: atomic type: object - nullable: true type: array envs: items: + description: EnvVar represents an environment variable present + in a Container. properties: name: - nullable: true + description: Name of the environment variable. Must be a + C_IDENTIFIER. type: string value: - nullable: true + 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: - nullable: true + description: Source for the environment variable's value. + Cannot be used if value is not empty. properties: configMapKeyRef: - nullable: true + description: Selects a key of a ConfigMap. properties: key: - nullable: true + description: The key to select. type: string name: - nullable: true + default: "" + description: |- + Name of the referent. + This field is effectively required, but due to backwards compatibility is + allowed to be empty. Instances of this type with an empty value here are + almost certainly wrong. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names type: string optional: - nullable: true + description: Specify whether the ConfigMap or its + key must be defined type: boolean + required: + - key type: object + x-kubernetes-map-type: atomic fieldRef: - nullable: true + 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: - nullable: true + description: Version of the schema the FieldPath + is written in terms of, defaults to "v1". type: string fieldPath: - nullable: true + description: Path of the field to select in the + specified API version. type: string + required: + - fieldPath type: object + x-kubernetes-map-type: atomic resourceFieldRef: - nullable: true + 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: - nullable: true + description: 'Container name: required for volumes, + optional for env vars' type: string divisor: - nullable: true - type: string + 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: - nullable: true + description: 'Required: resource to select' type: string + required: + - resource type: object + x-kubernetes-map-type: atomic secretKeyRef: - nullable: true + description: Selects a key of a secret in the pod's + namespace properties: key: - nullable: true + description: The key of the secret to select from. Must + be a valid secret key. type: string name: - nullable: true + default: "" + description: |- + Name of the referent. + This field is effectively required, but due to backwards compatibility is + allowed to be empty. Instances of this type with an empty value here are + almost certainly wrong. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names type: string optional: - nullable: true + 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 - nullable: true type: array image: - nullable: true + description: Image name. If the tag is omitted, the value from + .status.latestVersion will be used. type: string securityContext: - nullable: true + description: |- + SecurityContext holds security configuration that will be applied to a container. + Some fields are present in both SecurityContext and PodSecurityContext. When both + are set, the values in SecurityContext take precedence. properties: allowPrivilegeEscalation: - nullable: true + description: |- + AllowPrivilegeEscalation controls whether a process can gain more + privileges than its parent process. This bool directly controls if + the no_new_privs flag will be set on the container process. + AllowPrivilegeEscalation is true always when the container is: + 1) run as Privileged + 2) has CAP_SYS_ADMIN + Note that this field cannot be set when spec.os.name is windows. type: boolean appArmorProfile: - nullable: true + description: |- + appArmorProfile is the AppArmor options to use by this container. If set, this profile + overrides the pod's appArmorProfile. + Note that this field cannot be set when spec.os.name is windows. properties: localhostProfile: - nullable: true + description: |- + localhostProfile indicates a profile loaded on the node that should be used. + The profile must be preconfigured on the node to work. + Must match the loaded name of the profile. + Must be set if and only if type is "Localhost". type: string type: - nullable: true + description: |- + type indicates which kind of AppArmor profile will be applied. + Valid options are: + Localhost - a profile pre-loaded on the node. + RuntimeDefault - the container runtime's default profile. + Unconfined - no AppArmor enforcement. type: string + required: + - type type: object capabilities: - nullable: true + description: |- + The capabilities to add/drop when running containers. + Defaults to the default set of capabilities granted by the container runtime. + Note that this field cannot be set when spec.os.name is windows. properties: add: + description: Added capabilities items: - nullable: true + description: Capability represent POSIX capabilities + type type: string - nullable: true type: array + x-kubernetes-list-type: atomic drop: + description: Removed capabilities items: - nullable: true + description: Capability represent POSIX capabilities + type type: string - nullable: true type: array + x-kubernetes-list-type: atomic type: object privileged: - nullable: true + description: |- + Run container in privileged mode. + Processes in privileged containers are essentially equivalent to root on the host. + Defaults to false. + Note that this field cannot be set when spec.os.name is windows. type: boolean procMount: - nullable: true + description: |- + procMount denotes the type of proc mount to use for the containers. + The default value is Default which uses the container runtime defaults for + readonly paths and masked paths. + This requires the ProcMountType feature flag to be enabled. + Note that this field cannot be set when spec.os.name is windows. type: string readOnlyRootFilesystem: - nullable: true + description: |- + Whether this container has a read-only root filesystem. + Default is false. + Note that this field cannot be set when spec.os.name is windows. type: boolean runAsGroup: - nullable: true + description: |- + The GID to run the entrypoint of the container process. + Uses runtime default if unset. + May also be set in PodSecurityContext. If set in both SecurityContext and + PodSecurityContext, the value specified in SecurityContext takes precedence. + Note that this field cannot be set when spec.os.name is windows. + format: int64 type: integer runAsNonRoot: - nullable: true + description: |- + Indicates that the container must run as a non-root user. + If true, the Kubelet will validate the image at runtime to ensure that it + does not run as UID 0 (root) and fail to start the container if it does. + If unset or false, no such validation will be performed. + May also be set in PodSecurityContext. If set in both SecurityContext and + PodSecurityContext, the value specified in SecurityContext takes precedence. type: boolean runAsUser: - nullable: true + description: |- + The UID to run the entrypoint of the container process. + Defaults to user specified in image metadata if unspecified. + May also be set in PodSecurityContext. If set in both SecurityContext and + PodSecurityContext, the value specified in SecurityContext takes precedence. + Note that this field cannot be set when spec.os.name is windows. + format: int64 type: integer seLinuxOptions: - nullable: true + description: |- + The SELinux context to be applied to the container. + If unspecified, the container runtime will allocate a random SELinux context for each + container. May also be set in PodSecurityContext. If set in both SecurityContext and + PodSecurityContext, the value specified in SecurityContext takes precedence. + Note that this field cannot be set when spec.os.name is windows. properties: level: - nullable: true + description: Level is SELinux level label that applies + to the container. type: string role: - nullable: true + description: Role is a SELinux role label that applies + to the container. type: string type: - nullable: true + description: Type is a SELinux type label that applies + to the container. type: string user: - nullable: true + description: User is a SELinux user label that applies + to the container. type: string type: object seccompProfile: - nullable: true + description: |- + The seccomp options to use by this container. If seccomp options are + provided at both the pod & container level, the container options + override the pod options. + Note that this field cannot be set when spec.os.name is windows. properties: localhostProfile: - nullable: true + description: |- + localhostProfile indicates a profile defined in a file on the node should be used. + The profile must be preconfigured on the node to work. + Must be a descending path, relative to the kubelet's configured seccomp profile location. + Must be set if type is "Localhost". Must NOT be set for any other type. type: string type: - nullable: true + description: |- + type indicates which kind of seccomp profile will be applied. + Valid options are: + + Localhost - a profile defined in a file on the node should be used. + RuntimeDefault - the container runtime default profile should be used. + Unconfined - no profile should be applied. type: string + required: + - type type: object windowsOptions: - nullable: true + description: |- + The Windows specific settings applied to all containers. + If unspecified, the options from the PodSecurityContext will be used. + If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. + Note that this field cannot be set when spec.os.name is linux. properties: gmsaCredentialSpec: - nullable: true + description: |- + GMSACredentialSpec is where the GMSA admission webhook + (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the + GMSA credential spec named by the GMSACredentialSpecName field. type: string gmsaCredentialSpecName: - nullable: true + description: GMSACredentialSpecName is the name of the + GMSA credential spec to use. type: string hostProcess: - nullable: true + description: |- + HostProcess determines if a container should be run as a 'Host Process' container. + All of a Pod's containers must have the same effective HostProcess value + (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers). + In addition, if HostProcess is true then HostNetwork must also be set to true. type: boolean runAsUserName: - nullable: true + description: |- + The UserName in Windows to run the entrypoint of the container process. + Defaults to the user specified in image metadata if unspecified. + May also be set in PodSecurityContext. If set in both SecurityContext and + PodSecurityContext, the value specified in SecurityContext takes precedence. type: string type: object type: object volumes: items: + description: HostPath volume to mount into the pod properties: destination: - nullable: true + description: Path to mount the Volume at within the Pod. type: string name: - nullable: true + description: Name of the Volume as it will appear within + the Pod spec. type: string source: - nullable: true + description: Path on the host to mount. type: string + required: + - destination + - name + - source type: object - nullable: true type: array + required: + - image type: object version: - nullable: true + description: Providing a value for version will prevent polling/resolution + of the channel if specified. type: string window: - nullable: true + description: |- + A time window in which to execute Jobs for this Plan. + Jobs will not be generated outside this time window, but may continue executing into the window once started. properties: days: + description: Days that this time window is valid for items: - nullable: true + enum: + - "0" + - su + - sun + - sunday + - "1" + - mo + - mon + - monday + - "2" + - tu + - tue + - tuesday + - "3" + - we + - wed + - wednesday + - "4" + - th + - thu + - thursday + - "5" + - fr + - fri + - friday + - "6" + - sa + - sat + - saturday type: string - nullable: true + minItems: 1 type: array endTime: - nullable: true + description: End of the time window. type: string startTime: - nullable: true + description: Start of the time window. type: string timeZone: - nullable: true + description: Time zone for the time window; if not specified UTC + will be used. type: string type: object required: - upgrade type: object status: + description: PlanStatus represents the resulting state from processing + Plan events. properties: applying: + description: List of Node names that the Plan is currently being applied + on. items: - nullable: true type: string - nullable: true type: array conditions: + description: |- + `LatestResolved` indicates that the latest version as per the spec has been determined. + `Validated` indicates that the plan spec has been validated. + `Complete` indicates that the latest version of the plan has completed on all selected nodes. If any Jobs for the Plan fail to complete, this condition will remain false, and the reason and message will reflect the source of the error. items: properties: lastTransitionTime: - nullable: true + description: Last time the condition transitioned from one status + to another. type: string lastUpdateTime: - nullable: true + description: The last time this condition was updated. type: string message: - nullable: true + description: Human-readable message indicating details about + last transition type: string reason: - nullable: true + description: The reason for the condition's last transition. type: string status: - nullable: true + description: Status of the condition, one of True, False, Unknown. type: string type: - nullable: true + description: Type of cluster condition. type: string + required: + - status + - type type: object - nullable: true type: array + x-kubernetes-list-map-keys: + - type + x-kubernetes-list-type: map latestHash: - nullable: true + description: The hash of the most recently applied plan .spec. type: string latestVersion: - nullable: true + description: The latest version, as resolved from .spec.version, or + the channel server. type: string type: object type: object diff --git a/cluster/config/cluster-upgrade/system-upgrade-controller.yaml b/cluster/config/cluster-upgrade/system-upgrade-controller.yaml index d8da40c..3a178e3 100644 --- a/cluster/config/cluster-upgrade/system-upgrade-controller.yaml +++ b/cluster/config/cluster-upgrade/system-upgrade-controller.yaml @@ -264,7 +264,7 @@ spec: envFrom: - configMapRef: name: default-controller-env - image: rancher/system-upgrade-controller:v0.15.2 + image: rancher/system-upgrade-controller:v0.16.3 imagePullPolicy: IfNotPresent name: system-upgrade-controller securityContext: