diff --git a/bundle/manifests/argoproj.io_argocds.yaml b/bundle/manifests/argoproj.io_argocds.yaml index 169315c0b..678a7f75f 100644 --- a/bundle/manifests/argoproj.io_argocds.yaml +++ b/bundle/manifests/argoproj.io_argocds.yaml @@ -5916,54 +5916,53 @@ spec: this volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret' properties: defaultMode: - description: 'defaultMode is Optional: mode bits used - to set permissions on created files by default. Must - be an octal value between 0000 and 0777 or a decimal - value between 0 and 511. YAML accepts both octal and - decimal values, JSON requires decimal values for mode - bits. Defaults to 0644. Directories within the path - are not affected by this setting. This might be in - conflict with other options that affect the file mode, - like fsGroup, and the result can be other mode bits - set.' + description: 'Optional: mode bits used to set permissions + on created files by default. Must be an octal value + between 0000 and 0777 or a decimal value between 0 + and 511. YAML accepts both octal and decimal values, + JSON requires decimal values for mode bits. Defaults + to 0644. Directories within the path are not affected + by this setting. This might be in conflict with other + options that affect the file mode, like fsGroup, and + the result can be other mode bits set.' format: int32 type: integer items: - description: items If unspecified, each key-value pair - in the Data field of the referenced Secret will be - projected into the volume as a file whose name is - the key and content is the value. If specified, the - listed keys will be projected into the specified paths, - and unlisted keys will not be present. If a key is - specified which is not present in the Secret, the - volume setup will error unless it is marked optional. - Paths must be relative and may not contain the '..' - path or start with '..'. + description: If unspecified, each key-value pair in + the Data field of the referenced Secret will be projected + into the volume as a file whose name is the key and + content is the value. If specified, the listed keys + will be projected into the specified paths, and unlisted + keys will not be present. If a key is specified which + is not present in the Secret, the volume setup will + error unless it is marked optional. Paths must be + relative and may not contain the '..' path or start + with '..'. items: description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. + description: The key to project. type: string mode: - description: 'mode is Optional: mode bits used - to set permissions on this file. Must be an - octal value between 0000 and 0777 or a decimal - value between 0 and 511. YAML accepts both octal - and decimal values, JSON requires decimal values - for mode bits. If not specified, the volume - defaultMode will be used. This might be in conflict - with other options that affect the file mode, - like fsGroup, and the result can be other mode - bits set.' + description: 'Optional: mode bits used to set + permissions on this file. Must be an octal value + between 0000 and 0777 or a decimal value between + 0 and 511. YAML accepts both octal and decimal + values, JSON requires decimal values for mode + bits. If not specified, the volume defaultMode + will be used. This might be in conflict with + other options that affect the file mode, like + fsGroup, and the result can be other mode bits + set.' format: int32 type: integer path: - description: path is the relative path of the - file to map the key to. May not be an absolute - path. May not contain the path element '..'. - May not start with the string '..'. + description: The relative path of the file to + map the key to. May not be an absolute path. + May not contain the path element '..'. May not + start with the string '..'. type: string required: - key @@ -5971,30 +5970,30 @@ spec: type: object type: array optional: - description: optional field specify whether the Secret - or its keys must be defined + description: Specify whether the Secret or its keys + must be defined type: boolean secretName: - description: 'secretName is the name of the secret in - the pod''s namespace to use. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret' + description: 'Name of the secret in the pod''s namespace + to use. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret' type: string type: object storageos: - description: storageOS represents a StorageOS volume attached + description: StorageOS represents a StorageOS volume attached and mounted on Kubernetes nodes. properties: fsType: - description: fsType is the filesystem type to mount. - Must be a filesystem type supported by the host operating - system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred - to be "ext4" if unspecified. + description: Filesystem type to mount. Must be a filesystem + type supported by the host operating system. Ex. "ext4", + "xfs", "ntfs". Implicitly inferred to be "ext4" if + unspecified. type: string readOnly: - description: readOnly defaults to false (read/write). - ReadOnly here will force the ReadOnly setting in VolumeMounts. + description: Defaults to false (read/write). ReadOnly + here will force the ReadOnly setting in VolumeMounts. type: boolean secretRef: - description: secretRef specifies the secret to use for + description: SecretRef specifies the secret to use for obtaining the StorageOS API credentials. If not specified, default values will be attempted. properties: @@ -6005,12 +6004,12 @@ spec: type: string type: object volumeName: - description: volumeName is the human-readable name of + description: VolumeName is the human-readable name of the StorageOS volume. Volume names are only unique within a namespace. type: string volumeNamespace: - description: volumeNamespace specifies the scope of + description: VolumeNamespace specifies the scope of the volume within StorageOS. If no namespace is specified then the Pod's namespace will be used. This allows the Kubernetes name scoping to be mirrored within @@ -6022,26 +6021,25 @@ spec: type: string type: object vsphereVolume: - description: vsphereVolume represents a vSphere volume attached + description: VsphereVolume represents a vSphere volume attached and mounted on kubelets host machine properties: fsType: - description: fsType is filesystem type to mount. Must - be a filesystem type supported by the host operating - system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred - to be "ext4" if unspecified. + description: Filesystem type to mount. Must be a filesystem + type supported by the host operating system. Ex. "ext4", + "xfs", "ntfs". Implicitly inferred to be "ext4" if + unspecified. type: string storagePolicyID: - description: storagePolicyID is the storage Policy Based - Management (SPBM) profile ID associated with the StoragePolicyName. + description: Storage Policy Based Management (SPBM) + profile ID associated with the StoragePolicyName. type: string storagePolicyName: - description: storagePolicyName is the storage Policy - Based Management (SPBM) profile name. + description: Storage Policy Based Management (SPBM) + profile name. type: string volumePath: - description: volumePath is the path that identifies - vSphere volume vmdk + description: Path that identifies vSphere volume vmdk type: string required: - volumePath diff --git a/common/notifications.go b/common/notifications.go index 2b47088e1..dade5a663 100644 --- a/common/notifications.go +++ b/common/notifications.go @@ -2,7 +2,7 @@ package common // notifications const ( - NotificationsControllerComponent = "notifications-controller" + NotificationsControllerComponent = "argocd-notifications-controller" NotificationsSecretName = "argocd-notifications-secret" NotificationsConfigMapName = "argocd-notifications-cm" ) diff --git a/config/crd/bases/argoproj.io_argocds.yaml b/config/crd/bases/argoproj.io_argocds.yaml index d8738369f..0e9b9b300 100644 --- a/config/crd/bases/argoproj.io_argocds.yaml +++ b/config/crd/bases/argoproj.io_argocds.yaml @@ -5907,54 +5907,53 @@ spec: this volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret' properties: defaultMode: - description: 'defaultMode is Optional: mode bits used - to set permissions on created files by default. Must - be an octal value between 0000 and 0777 or a decimal - value between 0 and 511. YAML accepts both octal and - decimal values, JSON requires decimal values for mode - bits. Defaults to 0644. Directories within the path - are not affected by this setting. This might be in - conflict with other options that affect the file mode, - like fsGroup, and the result can be other mode bits - set.' + description: 'Optional: mode bits used to set permissions + on created files by default. Must be an octal value + between 0000 and 0777 or a decimal value between 0 + and 511. YAML accepts both octal and decimal values, + JSON requires decimal values for mode bits. Defaults + to 0644. Directories within the path are not affected + by this setting. This might be in conflict with other + options that affect the file mode, like fsGroup, and + the result can be other mode bits set.' format: int32 type: integer items: - description: items If unspecified, each key-value pair - in the Data field of the referenced Secret will be - projected into the volume as a file whose name is - the key and content is the value. If specified, the - listed keys will be projected into the specified paths, - and unlisted keys will not be present. If a key is - specified which is not present in the Secret, the - volume setup will error unless it is marked optional. - Paths must be relative and may not contain the '..' - path or start with '..'. + description: If unspecified, each key-value pair in + the Data field of the referenced Secret will be projected + into the volume as a file whose name is the key and + content is the value. If specified, the listed keys + will be projected into the specified paths, and unlisted + keys will not be present. If a key is specified which + is not present in the Secret, the volume setup will + error unless it is marked optional. Paths must be + relative and may not contain the '..' path or start + with '..'. items: description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. + description: The key to project. type: string mode: - description: 'mode is Optional: mode bits used - to set permissions on this file. Must be an - octal value between 0000 and 0777 or a decimal - value between 0 and 511. YAML accepts both octal - and decimal values, JSON requires decimal values - for mode bits. If not specified, the volume - defaultMode will be used. This might be in conflict - with other options that affect the file mode, - like fsGroup, and the result can be other mode - bits set.' + description: 'Optional: mode bits used to set + permissions on this file. Must be an octal value + between 0000 and 0777 or a decimal value between + 0 and 511. YAML accepts both octal and decimal + values, JSON requires decimal values for mode + bits. If not specified, the volume defaultMode + will be used. This might be in conflict with + other options that affect the file mode, like + fsGroup, and the result can be other mode bits + set.' format: int32 type: integer path: - description: path is the relative path of the - file to map the key to. May not be an absolute - path. May not contain the path element '..'. - May not start with the string '..'. + description: The relative path of the file to + map the key to. May not be an absolute path. + May not contain the path element '..'. May not + start with the string '..'. type: string required: - key @@ -5962,30 +5961,30 @@ spec: type: object type: array optional: - description: optional field specify whether the Secret - or its keys must be defined + description: Specify whether the Secret or its keys + must be defined type: boolean secretName: - description: 'secretName is the name of the secret in - the pod''s namespace to use. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret' + description: 'Name of the secret in the pod''s namespace + to use. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret' type: string type: object storageos: - description: storageOS represents a StorageOS volume attached + description: StorageOS represents a StorageOS volume attached and mounted on Kubernetes nodes. properties: fsType: - description: fsType is the filesystem type to mount. - Must be a filesystem type supported by the host operating - system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred - to be "ext4" if unspecified. + description: Filesystem type to mount. Must be a filesystem + type supported by the host operating system. Ex. "ext4", + "xfs", "ntfs". Implicitly inferred to be "ext4" if + unspecified. type: string readOnly: - description: readOnly defaults to false (read/write). - ReadOnly here will force the ReadOnly setting in VolumeMounts. + description: Defaults to false (read/write). ReadOnly + here will force the ReadOnly setting in VolumeMounts. type: boolean secretRef: - description: secretRef specifies the secret to use for + description: SecretRef specifies the secret to use for obtaining the StorageOS API credentials. If not specified, default values will be attempted. properties: @@ -5996,12 +5995,12 @@ spec: type: string type: object volumeName: - description: volumeName is the human-readable name of + description: VolumeName is the human-readable name of the StorageOS volume. Volume names are only unique within a namespace. type: string volumeNamespace: - description: volumeNamespace specifies the scope of + description: VolumeNamespace specifies the scope of the volume within StorageOS. If no namespace is specified then the Pod's namespace will be used. This allows the Kubernetes name scoping to be mirrored within @@ -6013,26 +6012,25 @@ spec: type: string type: object vsphereVolume: - description: vsphereVolume represents a vSphere volume attached + description: VsphereVolume represents a vSphere volume attached and mounted on kubelets host machine properties: fsType: - description: fsType is filesystem type to mount. Must - be a filesystem type supported by the host operating - system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred - to be "ext4" if unspecified. + description: Filesystem type to mount. Must be a filesystem + type supported by the host operating system. Ex. "ext4", + "xfs", "ntfs". Implicitly inferred to be "ext4" if + unspecified. type: string storagePolicyID: - description: storagePolicyID is the storage Policy Based - Management (SPBM) profile ID associated with the StoragePolicyName. + description: Storage Policy Based Management (SPBM) + profile ID associated with the StoragePolicyName. type: string storagePolicyName: - description: storagePolicyName is the storage Policy - Based Management (SPBM) profile name. + description: Storage Policy Based Management (SPBM) + profile name. type: string volumePath: - description: volumePath is the path that identifies - vSphere volume vmdk + description: Path that identifies vSphere volume vmdk type: string required: - volumePath diff --git a/controllers/argocd/applicationset/applicationset.go b/controllers/argocd/applicationset/applicationset.go index 12b5edd0b..1e7d6b16d 100644 --- a/controllers/argocd/applicationset/applicationset.go +++ b/controllers/argocd/applicationset/applicationset.go @@ -3,7 +3,7 @@ package applicationset import ( argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1" "github.com/argoproj-labs/argocd-operator/common" - "github.com/argoproj-labs/argocd-operator/pkg/util" + "github.com/argoproj-labs/argocd-operator/pkg/argoutil" "github.com/go-logr/logr" "k8s.io/apimachinery/pkg/runtime" ctrl "sigs.k8s.io/controller-runtime" @@ -26,7 +26,7 @@ func (asr *ApplicationSetReconciler) Reconcile() error { asr.Logger = ctrl.Log.WithName(AppSetControllerComponent).WithValues("instance", asr.Instance.Name, "instance-namespace", asr.Instance.Namespace) - resourceName = util.GenerateUniqueResourceName(asr.Instance.Name, asr.Instance.Namespace, AppSetControllerComponent) + resourceName = argoutil.GenerateUniqueResourceName(asr.Instance.Name, asr.Instance.Namespace, AppSetControllerComponent) resourceLabels = common.DefaultResourceLabels(resourceName, asr.Instance.Name, AppSetControllerComponent) if err := asr.reconcileServiceAccount(); err != nil { diff --git a/controllers/argocd/applicationset/deployment.go b/controllers/argocd/applicationset/deployment.go index 7e8932fb2..3b45288dd 100644 --- a/controllers/argocd/applicationset/deployment.go +++ b/controllers/argocd/applicationset/deployment.go @@ -6,6 +6,7 @@ import ( "github.com/argoproj-labs/argocd-operator/common" "github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon" "github.com/argoproj-labs/argocd-operator/controllers/argocd/reposerver" + "github.com/argoproj-labs/argocd-operator/pkg/argoutil" "github.com/argoproj-labs/argocd-operator/pkg/cluster" "github.com/argoproj-labs/argocd-operator/pkg/mutation" "github.com/argoproj-labs/argocd-operator/pkg/util" @@ -125,7 +126,7 @@ func (asr *ApplicationSetReconciler) getDesiredDeployment() *appsv1.Deployment { if err != nil { asr.Logger.Error(err, "failed to get SCM Root CA ConfigMap") } - if util.IsObjectFound(asr.Client, asr.Instance.Namespace, asr.Instance.Spec.ApplicationSet.SCMRootCAConfigMap, cm) { + if argoutil.IsObjectFound(asr.Client, asr.Instance.Namespace, asr.Instance.Spec.ApplicationSet.SCMRootCAConfigMap, cm) { addSCMGitlabVolumeMount = true } } @@ -183,11 +184,11 @@ func (asr *ApplicationSetReconciler) getArgoApplicationSetCommand() []string { cmd = append(cmd, reposerver.GetRepoServerAddress(resourceName, asr.Instance.Namespace)) cmd = append(cmd, common.LogLevel) - cmd = append(cmd, util.GetLogLevel(asr.Instance.Spec.ApplicationSet.LogLevel)) + cmd = append(cmd, argoutil.GetLogLevel(asr.Instance.Spec.ApplicationSet.LogLevel)) // ApplicationSet command arguments provided by the user extraArgs := asr.Instance.Spec.ApplicationSet.ExtraCommandArgs - err := util.IsMergable(extraArgs, cmd) + err := argocdcommon.IsMergable(extraArgs, cmd) if err != nil { return cmd } diff --git a/controllers/argocd/applicationset/webhookroute.go b/controllers/argocd/applicationset/webhookroute.go index 8e6de8a95..c1bfa2280 100644 --- a/controllers/argocd/applicationset/webhookroute.go +++ b/controllers/argocd/applicationset/webhookroute.go @@ -3,10 +3,10 @@ package applicationset import ( "github.com/argoproj-labs/argocd-operator/common" "github.com/argoproj-labs/argocd-operator/controllers/argocd/argocdcommon" + "github.com/argoproj-labs/argocd-operator/pkg/argoutil" "github.com/argoproj-labs/argocd-operator/pkg/cluster" "github.com/argoproj-labs/argocd-operator/pkg/mutation" "github.com/argoproj-labs/argocd-operator/pkg/networking" - "github.com/argoproj-labs/argocd-operator/pkg/util" routev1 "github.com/openshift/api/route/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -110,7 +110,7 @@ func (asr *ApplicationSetReconciler) getWebhookRouteSpec() routev1.RouteSpec { }, To: routev1.RouteTargetReference{ Kind: common.ServiceKind, - Name: util.NameWithSuffix(asr.Instance.Name, AppSetControllerComponent), + Name: argoutil.NameWithSuffix(asr.Instance.Name, AppSetControllerComponent), }, } diff --git a/controllers/argocd/argocdcommon/helper.go b/controllers/argocd/argocdcommon/helper.go index 64a5c34ca..0481ef655 100644 --- a/controllers/argocd/argocdcommon/helper.go +++ b/controllers/argocd/argocdcommon/helper.go @@ -1,6 +1,11 @@ package argocdcommon -import "reflect" +import ( + "errors" + "reflect" + + "github.com/argoproj-labs/argocd-operator/pkg/util" +) func UpdateIfChanged(existingVal, desiredVal interface{}, extraAction func(), changed *bool) { if !reflect.DeepEqual(existingVal, desiredVal) { @@ -11,3 +16,18 @@ func UpdateIfChanged(existingVal, desiredVal interface{}, extraAction func(), ch *changed = true } } + +// IsMergable returns error if any of the extraArgs is already part of the default command Arguments. +func IsMergable(extraArgs []string, cmd []string) error { + if len(extraArgs) > 0 { + for _, arg := range extraArgs { + if len(arg) > 2 && arg[:2] == "--" { + if ok := util.ContainsString(cmd, arg); ok { + err := errors.New("duplicate argument error") + return err + } + } + } + } + return nil +} diff --git a/controllers/argocd/argocdcommon/testing.go b/controllers/argocd/argocdcommon/testing.go index 24deed41e..11b5b0f50 100644 --- a/controllers/argocd/argocdcommon/testing.go +++ b/controllers/argocd/argocdcommon/testing.go @@ -1,11 +1,12 @@ package argocdcommon import ( - argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1" - "github.com/argoproj-labs/argocd-operator/common" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1" + "github.com/argoproj-labs/argocd-operator/common" ) const ( diff --git a/controllers/argocd/reposerver/util.go b/controllers/argocd/reposerver/util.go index af52a0529..395de6e7a 100644 --- a/controllers/argocd/reposerver/util.go +++ b/controllers/argocd/reposerver/util.go @@ -2,10 +2,10 @@ package reposerver import ( "github.com/argoproj-labs/argocd-operator/common" - "github.com/argoproj-labs/argocd-operator/pkg/util" + "github.com/argoproj-labs/argocd-operator/pkg/argoutil" ) // GetRepoServerAddress will return the Argo CD repo server address. func GetRepoServerAddress(name string, namespace string) string { - return util.FqdnServiceRef(util.NameWithSuffix(name, ArgoCDRepoServerControllerComponent), namespace, common.ArgoCDDefaultRepoServerPort) + return argoutil.FqdnServiceRef(argoutil.NameWithSuffix(name, ArgoCDRepoServerControllerComponent), namespace, common.ArgoCDDefaultRepoServerPort) } diff --git a/deploy/olm-catalog/argocd-operator/0.9.0/argoproj.io_argocdexports.yaml b/deploy/olm-catalog/argocd-operator/0.9.0/argoproj.io_argocdexports.yaml index eb7610ba5..7cbb58242 100644 --- a/deploy/olm-catalog/argocd-operator/0.9.0/argoproj.io_argocdexports.yaml +++ b/deploy/olm-catalog/argocd-operator/0.9.0/argoproj.io_argocdexports.yaml @@ -55,6 +55,7 @@ spec: properties: accessModes: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'accessModes contains the desired access modes ======= @@ -63,12 +64,16 @@ spec: ======= description: 'accessModes contains the desired access modes >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'AccessModes contains the desired access modes +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1' items: type: string type: array dataSource: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'dataSource field can be used to specify either: * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot) @@ -104,6 +109,16 @@ spec: If the namespace is specified, then dataSourceRef will not be copied to dataSource.' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'This field can be used to specify either: * + An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot) + * An existing PVC (PersistentVolumeClaim) If the provisioner + or an external controller can support the specified data + source, it will create a new volume based on the contents + of the specified data source. If the AnyVolumeDataSource + feature gate is enabled, this field will always have the + same contents as the DataSourceRef field.' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: apiGroup: description: APIGroup is the group for the resource being @@ -124,6 +139,7 @@ spec: dataSourceRef: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: 'dataSourceRef specifies the object from which @@ -132,10 +148,18 @@ spec: group (non core object) or a PersistentVolumeClaim object. When this field is specified, volume binding will only succeed <<<<<<< HEAD +======= + description: 'Specifies the object from which to populate + the volume with data, if a non-empty volume is desired. + This may be any local object from a non-empty API group + (non core object) or a PersistentVolumeClaim object. When + this field is specified, volume binding will only succeed +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) if the type of the specified object matches some installed volume populator or dynamic provisioner. This field will - replace the functionality of the dataSource field and as + replace the functionality of the DataSource field and as such if both fields are non-empty, they must have the same +<<<<<<< HEAD value. For backwards compatibility, when namespace isn''t specified in dataSourceRef, both fields (dataSource and dataSourceRef) will be set to the same value automatically @@ -166,6 +190,8 @@ spec: replace the functionality of the dataSource field and as such if both fields are non-empty, they must have the same <<<<<<< HEAD +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) value. For backwards compatibility, both fields (DataSource and DataSourceRef) will be set to the same value automatically if one of them is empty and the other is non-empty. There @@ -177,6 +203,7 @@ spec: an error if a disallowed value is specified. (Alpha) Using this field requires the AnyVolumeDataSource feature gate to be enabled.' +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= value. For backwards compatibility, when namespace isn''t @@ -197,6 +224,8 @@ spec: field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: apiGroup: description: APIGroup is the group for the resource being @@ -212,6 +241,7 @@ spec: type: string <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) namespace: @@ -229,12 +259,15 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) required: - kind - name type: object resources: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'resources represents the minimum resources the ======= @@ -243,6 +276,9 @@ spec: ======= description: 'resources represents the minimum resources the >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Resources represents the minimum resources the +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) volume should have. If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements that are lower than previous value but must still be higher @@ -251,6 +287,7 @@ spec: properties: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) claims: @@ -280,6 +317,8 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) limits: additionalProperties: anyOf: @@ -302,6 +341,7 @@ spec: a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' type: object @@ -324,6 +364,13 @@ spec: description: selector is a label query over volumes to consider for binding. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' + type: object + type: object + selector: + description: A label query over volumes to consider for binding. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: matchExpressions: description: matchExpressions is a list of label selector @@ -369,6 +416,7 @@ spec: type: object storageClassName: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'storageClassName is the name of the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' @@ -380,6 +428,10 @@ spec: description: 'storageClassName is the name of the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Name of the StorageClass required by the claim. + More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string volumeMode: description: volumeMode defines what type of volume is required @@ -388,6 +440,7 @@ spec: type: string volumeName: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: volumeName is the binding reference to the PersistentVolume ======= @@ -396,6 +449,9 @@ spec: ======= description: volumeName is the binding reference to the PersistentVolume >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: VolumeName is the binding reference to the PersistentVolume +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) backing this claim. type: string type: object diff --git a/deploy/olm-catalog/argocd-operator/0.9.0/argoproj.io_argocds.yaml b/deploy/olm-catalog/argocd-operator/0.9.0/argoproj.io_argocds.yaml index e88ef804e..915a6a79f 100644 --- a/deploy/olm-catalog/argocd-operator/0.9.0/argoproj.io_argocds.yaml +++ b/deploy/olm-catalog/argocd-operator/0.9.0/argoproj.io_argocds.yaml @@ -191,6 +191,7 @@ spec: properties: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) claims: @@ -220,6 +221,8 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) limits: additionalProperties: anyOf: @@ -241,6 +244,7 @@ spec: resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' @@ -251,6 +255,9 @@ spec: to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: object type: object version: @@ -294,6 +301,7 @@ spec: items: description: IngressTLS describes the transport layer <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD security associated with an ingress. properties: @@ -317,6 +325,14 @@ spec: the TLS certificate. The values in this list must match the name/s used in the tlsSecret. Defaults >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + security associated with an Ingress. + properties: + hosts: + description: Hosts are a list of hosts included + in the TLS certificate. The values in this list + must match the name/s used in the tlsSecret. Defaults +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) to the wildcard host setting for the loadbalancer controller fulfilling this Ingress, if left unspecified. items: @@ -325,6 +341,7 @@ spec: x-kubernetes-list-type: atomic secretName: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: secretName is the name of the secret ======= @@ -333,12 +350,16 @@ spec: ======= description: secretName is the name of the secret >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: SecretName is the name of the secret +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) used to terminate TLS traffic on port 443. Field is left optional to allow TLS routing based on SNI hostname alone. If the SNI host in a listener conflicts with the "Host" header field used by an IngressRule, the SNI host is used for termination <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD and value of the "Host" header is used for routing. ======= @@ -347,6 +368,9 @@ spec: ======= and value of the "Host" header is used for routing. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + and value of the Host header is used for routing. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string type: object type: array @@ -602,6 +626,7 @@ spec: properties: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) claims: @@ -631,6 +656,8 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) limits: additionalProperties: anyOf: @@ -652,6 +679,7 @@ spec: resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' @@ -662,6 +690,9 @@ spec: to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: object type: object sharding: @@ -726,6 +757,7 @@ spec: properties: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) claims: @@ -755,6 +787,8 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) limits: additionalProperties: anyOf: @@ -776,6 +810,7 @@ spec: resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' @@ -786,6 +821,9 @@ spec: to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: object type: object version: @@ -859,6 +897,7 @@ spec: items: description: IngressTLS describes the transport layer security <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD associated with an ingress. properties: @@ -876,6 +915,12 @@ spec: hosts: description: hosts is a list of hosts included in the >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + associated with an Ingress. + properties: + hosts: + description: Hosts are a list of hosts included in the +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) TLS certificate. The values in this list must match the name/s used in the tlsSecret. Defaults to the wildcard host setting for the loadbalancer controller @@ -886,6 +931,7 @@ spec: x-kubernetes-list-type: atomic secretName: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: secretName is the name of the secret used ======= @@ -894,12 +940,16 @@ spec: ======= description: secretName is the name of the secret used >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: SecretName is the name of the secret used +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) to terminate TLS traffic on port 443. Field is left optional to allow TLS routing based on SNI hostname alone. If the SNI host in a listener conflicts with the "Host" header field used by an IngressRule, the SNI host is used for termination and value of the <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "Host" header is used for routing. ======= @@ -908,6 +958,9 @@ spec: ======= "Host" header is used for routing. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + Host header is used for routing. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string type: object type: array @@ -920,6 +973,7 @@ spec: properties: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) claims: @@ -949,6 +1003,8 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) limits: additionalProperties: anyOf: @@ -970,6 +1026,7 @@ spec: resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' @@ -980,6 +1037,9 @@ spec: to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: object type: object route: @@ -1085,6 +1145,7 @@ spec: properties: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) claims: @@ -1114,6 +1175,8 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) limits: additionalProperties: anyOf: @@ -1135,6 +1198,7 @@ spec: resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' @@ -1145,6 +1209,9 @@ spec: to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: object type: object required: @@ -1415,6 +1482,7 @@ spec: properties: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) claims: @@ -1444,6 +1512,8 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) limits: additionalProperties: anyOf: @@ -1465,6 +1535,7 @@ spec: resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' @@ -1475,6 +1546,9 @@ spec: to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: object type: object version: @@ -1527,6 +1601,7 @@ spec: items: description: IngressTLS describes the transport layer security <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD associated with an ingress. properties: @@ -1544,6 +1619,12 @@ spec: hosts: description: hosts is a list of hosts included in the >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + associated with an Ingress. + properties: + hosts: + description: Hosts are a list of hosts included in the +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) TLS certificate. The values in this list must match the name/s used in the tlsSecret. Defaults to the wildcard host setting for the loadbalancer controller @@ -1554,6 +1635,7 @@ spec: x-kubernetes-list-type: atomic secretName: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: secretName is the name of the secret used ======= @@ -1562,12 +1644,16 @@ spec: ======= description: secretName is the name of the secret used >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: SecretName is the name of the secret used +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) to terminate TLS traffic on port 443. Field is left optional to allow TLS routing based on SNI hostname alone. If the SNI host in a listener conflicts with the "Host" header field used by an IngressRule, the SNI host is used for termination and value of the <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "Host" header is used for routing. ======= @@ -1576,6 +1662,9 @@ spec: ======= "Host" header is used for routing. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + Host header is used for routing. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string type: object type: array @@ -1710,6 +1799,7 @@ spec: properties: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) claims: @@ -1739,6 +1829,8 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) limits: additionalProperties: anyOf: @@ -1760,6 +1852,7 @@ spec: resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' @@ -1770,6 +1863,9 @@ spec: to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: object type: object version: @@ -1922,6 +2018,7 @@ spec: args: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: 'Arguments to the entrypoint. The container @@ -1931,14 +2028,19 @@ spec: in the input string will be unchanged. Double $$ are reduced <<<<<<< HEAD ======= +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) description: 'Arguments to the entrypoint. The docker image''s CMD is used if this is not provided. Variable references $(VAR_NAME) are expanded using the container''s environment. If a variable cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) 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, @@ -1950,6 +2052,7 @@ spec: command: description: 'Entrypoint array. Not executed within a shell. <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD The container image''s ENTRYPOINT is used if this is not ======= @@ -1958,6 +2061,9 @@ spec: ======= The container image''s ENTRYPOINT is used if this is not >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + The docker image''s ENTRYPOINT is used if this is not +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) provided. Variable references $(VAR_NAME) are expanded using the container''s environment. If a variable cannot be resolved, the reference in the input string will be @@ -2134,6 +2240,7 @@ spec: type: array image: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'Container image name. More info: https://kubernetes.io/docs/concepts/containers/images ======= @@ -2142,6 +2249,9 @@ spec: ======= description: 'Container image name. More info: https://kubernetes.io/docs/concepts/containers/images >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets.' @@ -2198,6 +2308,7 @@ spec: name: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: The header field name. This @@ -2210,6 +2321,9 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: The header field name +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string value: description: The header field value @@ -2310,6 +2424,7 @@ spec: name: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: The header field name. This @@ -2322,6 +2437,9 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: The header field name +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string value: description: The header field value @@ -2404,6 +2522,7 @@ spec: grpc: description: GRPC specifies an action involving a GRPC <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD port. ======= @@ -2413,6 +2532,10 @@ spec: ======= port. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + port. This is an alpha field and requires enabling + GRPCContainerProbe feature gate. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: port: description: Port number of the gRPC service. Number @@ -2445,6 +2568,7 @@ spec: properties: name: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: The header field name. This will be canonicalized upon output, so case-variant @@ -2457,6 +2581,9 @@ spec: be canonicalized upon output, so case-variant names will be understood as the same header. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: The header field name +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string value: description: The header field value @@ -2555,6 +2682,7 @@ spec: description: List of ports to expose from the container. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) Not specifying a port here DOES NOT prevent that port @@ -2566,6 +2694,8 @@ spec: Cannot be updated. <<<<<<< HEAD ======= +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) Exposing a port here gives the system additional information about the network connections a container uses, but is primarily informational. Not specifying a port here DOES @@ -2573,9 +2703,12 @@ spec: is listening on the default "0.0.0.0" address inside a container will be accessible from the network. Cannot be updated. +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) items: description: ContainerPort represents a network port in a single container. @@ -2648,6 +2781,7 @@ spec: grpc: description: GRPC specifies an action involving a GRPC <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD port. ======= @@ -2657,6 +2791,10 @@ spec: ======= port. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + port. This is an alpha field and requires enabling + GRPCContainerProbe feature gate. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: port: description: Port number of the gRPC service. Number @@ -2689,6 +2827,7 @@ spec: properties: name: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: The header field name. This will be canonicalized upon output, so case-variant @@ -2701,6 +2840,9 @@ spec: be canonicalized upon output, so case-variant names will be understood as the same header. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: The header field name +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string value: description: The header field value @@ -2792,6 +2934,7 @@ spec: type: object <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) resizePolicy: @@ -2820,12 +2963,15 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) resources: description: 'Compute Resources required by this container. Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' properties: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) claims: @@ -2856,6 +3002,8 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) limits: additionalProperties: anyOf: @@ -2878,6 +3026,7 @@ spec: for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' type: object @@ -2934,6 +3083,11 @@ spec: successfully completed.' type: string >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' + type: object + type: object +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) securityContext: description: 'SecurityContext defines the security options the container should be run with. If set, the fields of @@ -3059,6 +3213,7 @@ spec: to work. Must be a descending path, relative to the kubelet's configured seccomp profile location. <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Must be set if type is "Localhost". Must NOT be set for any other type. @@ -3069,6 +3224,9 @@ spec: Must be set if type is "Localhost". Must NOT be set for any other type. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + Must only be set if type is "Localhost". +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string type: description: "type indicates which kind of seccomp @@ -3103,6 +3261,7 @@ spec: description: HostProcess determines if a container <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) should be run as a 'Host Process' container. All @@ -3112,6 +3271,8 @@ spec: containers). In addition, if HostProcess is true <<<<<<< HEAD ======= +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) should be run as a 'Host Process' container. This field is alpha-level and will only be honored by components that enable the WindowsHostProcessContainers @@ -3121,9 +3282,12 @@ spec: effective HostProcess value (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers). In addition, if HostProcess is true +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) then HostNetwork must also be set to true. type: boolean runAsUserName: @@ -3173,6 +3337,7 @@ spec: grpc: description: GRPC specifies an action involving a GRPC <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD port. ======= @@ -3182,6 +3347,10 @@ spec: ======= port. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + port. This is an alpha field and requires enabling + GRPCContainerProbe feature gate. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: port: description: Port number of the gRPC service. Number @@ -3214,6 +3383,7 @@ spec: properties: name: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: The header field name. This will be canonicalized upon output, so case-variant @@ -3226,6 +3396,9 @@ spec: be canonicalized upon output, so case-variant names will be understood as the same header. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: The header field name +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string value: description: The header field value @@ -3455,6 +3628,7 @@ spec: properties: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) claims: @@ -3484,6 +3658,8 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) limits: additionalProperties: anyOf: @@ -3505,6 +3681,7 @@ spec: resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' @@ -3515,6 +3692,9 @@ spec: to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: object type: object serviceaccount: @@ -3531,6 +3711,7 @@ spec: args: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: 'Arguments to the entrypoint. The container @@ -3540,14 +3721,19 @@ spec: in the input string will be unchanged. Double $$ are reduced <<<<<<< HEAD ======= +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) description: 'Arguments to the entrypoint. The docker image''s CMD is used if this is not provided. Variable references $(VAR_NAME) are expanded using the container''s environment. If a variable cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) 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, @@ -3559,6 +3745,7 @@ spec: command: description: 'Entrypoint array. Not executed within a shell. <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD The container image''s ENTRYPOINT is used if this is not ======= @@ -3567,6 +3754,9 @@ spec: ======= The container image''s ENTRYPOINT is used if this is not >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + The docker image''s ENTRYPOINT is used if this is not +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) provided. Variable references $(VAR_NAME) are expanded using the container''s environment. If a variable cannot be resolved, the reference in the input string will be @@ -3743,6 +3933,7 @@ spec: type: array image: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'Container image name. More info: https://kubernetes.io/docs/concepts/containers/images ======= @@ -3751,6 +3942,9 @@ spec: ======= description: 'Container image name. More info: https://kubernetes.io/docs/concepts/containers/images >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets.' @@ -3807,6 +4001,7 @@ spec: name: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: The header field name. This @@ -3819,6 +4014,9 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: The header field name +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string value: description: The header field value @@ -3919,6 +4117,7 @@ spec: name: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: The header field name. This @@ -3931,6 +4130,9 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: The header field name +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string value: description: The header field value @@ -4013,6 +4215,7 @@ spec: grpc: description: GRPC specifies an action involving a GRPC <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD port. ======= @@ -4022,6 +4225,10 @@ spec: ======= port. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + port. This is an alpha field and requires enabling + GRPCContainerProbe feature gate. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: port: description: Port number of the gRPC service. Number @@ -4054,6 +4261,7 @@ spec: properties: name: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: The header field name. This will be canonicalized upon output, so case-variant @@ -4066,6 +4274,9 @@ spec: be canonicalized upon output, so case-variant names will be understood as the same header. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: The header field name +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string value: description: The header field value @@ -4164,6 +4375,7 @@ spec: description: List of ports to expose from the container. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) Not specifying a port here DOES NOT prevent that port @@ -4175,6 +4387,8 @@ spec: Cannot be updated. <<<<<<< HEAD ======= +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) Exposing a port here gives the system additional information about the network connections a container uses, but is primarily informational. Not specifying a port here DOES @@ -4182,9 +4396,12 @@ spec: is listening on the default "0.0.0.0" address inside a container will be accessible from the network. Cannot be updated. +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) items: description: ContainerPort represents a network port in a single container. @@ -4257,6 +4474,7 @@ spec: grpc: description: GRPC specifies an action involving a GRPC <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD port. ======= @@ -4266,6 +4484,10 @@ spec: ======= port. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + port. This is an alpha field and requires enabling + GRPCContainerProbe feature gate. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: port: description: Port number of the gRPC service. Number @@ -4298,6 +4520,7 @@ spec: properties: name: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: The header field name. This will be canonicalized upon output, so case-variant @@ -4310,6 +4533,9 @@ spec: be canonicalized upon output, so case-variant names will be understood as the same header. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: The header field name +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string value: description: The header field value @@ -4401,6 +4627,7 @@ spec: type: object <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) resizePolicy: @@ -4429,12 +4656,15 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) resources: description: 'Compute Resources required by this container. Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' properties: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) claims: @@ -4465,6 +4695,8 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) limits: additionalProperties: anyOf: @@ -4487,6 +4719,7 @@ spec: for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' type: object @@ -4543,6 +4776,11 @@ spec: successfully completed.' type: string >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' + type: object + type: object +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) securityContext: description: 'SecurityContext defines the security options the container should be run with. If set, the fields of @@ -4668,6 +4906,7 @@ spec: to work. Must be a descending path, relative to the kubelet's configured seccomp profile location. <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Must be set if type is "Localhost". Must NOT be set for any other type. @@ -4678,6 +4917,9 @@ spec: Must be set if type is "Localhost". Must NOT be set for any other type. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + Must only be set if type is "Localhost". +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string type: description: "type indicates which kind of seccomp @@ -4712,6 +4954,7 @@ spec: description: HostProcess determines if a container <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) should be run as a 'Host Process' container. All @@ -4721,6 +4964,8 @@ spec: containers). In addition, if HostProcess is true <<<<<<< HEAD ======= +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) should be run as a 'Host Process' container. This field is alpha-level and will only be honored by components that enable the WindowsHostProcessContainers @@ -4730,9 +4975,12 @@ spec: effective HostProcess value (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers). In addition, if HostProcess is true +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) then HostNetwork must also be set to true. type: boolean runAsUserName: @@ -4782,6 +5030,7 @@ spec: grpc: description: GRPC specifies an action involving a GRPC <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD port. ======= @@ -4791,6 +5040,10 @@ spec: ======= port. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + port. This is an alpha field and requires enabling + GRPCContainerProbe feature gate. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: port: description: Port number of the gRPC service. Number @@ -4823,6 +5076,7 @@ spec: properties: name: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: The header field name. This will be canonicalized upon output, so case-variant @@ -4835,6 +5089,9 @@ spec: be canonicalized upon output, so case-variant names will be understood as the same header. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: The header field name +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string value: description: The header field value @@ -5096,6 +5353,7 @@ spec: properties: awsElasticBlockStore: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'awsElasticBlockStore represents an AWS Disk ======= @@ -5104,11 +5362,15 @@ spec: ======= description: 'awsElasticBlockStore represents an AWS Disk >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'AWSElasticBlockStore represents an AWS Disk +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) resource that is attached to a kubelet''s host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' properties: fsType: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'fsType is the filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem @@ -5123,6 +5385,11 @@ spec: that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Filesystem type of the volume that you + want to mount. Tip: Ensure that the filesystem type + is supported by the host operating system. Examples: +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore TODO: how do we prevent errors in the filesystem from @@ -5131,6 +5398,7 @@ spec: partition: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: 'partition is the partition in the volume @@ -5140,13 +5408,23 @@ spec: partition for /dev/sda is "0" (or you can leave the property empty).' <<<<<<< HEAD +======= + description: 'The partition in the volume that you want + to mount. If omitted, the default is to mount by volume + name. Examples: For volume /dev/sda1, you specify + the partition as "1". Similarly, the volume partition + for /dev/sda is "0" (or you can leave the property + empty).' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) format: int32 type: integer readOnly: - description: 'readOnly value true will force the readOnly - setting in VolumeMounts. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' + description: 'Specify "true" to force and set the ReadOnly + property in VolumeMounts to "true". If omitted, the + default is "false". More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' type: boolean volumeID: +<<<<<<< HEAD description: 'volumeID is unique ID of the persistent disk resource in AWS (Amazon EBS volume). More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' @@ -5175,42 +5453,49 @@ spec: disk resource in AWS (Amazon EBS volume). More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Unique ID of the persistent disk resource + in AWS (Amazon EBS volume). More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string required: - volumeID type: object azureDisk: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: azureDisk represents an Azure Data Disk mount +======= + description: AzureDisk represents an Azure Data Disk mount +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) on the host and bind mount to the pod. properties: cachingMode: - description: 'cachingMode is the Host Caching mode: - None, Read Only, Read Write.' + description: 'Host Caching mode: None, Read Only, Read + Write.' type: string diskName: - description: diskName is the Name of the data disk in - the blob storage + description: The Name of the data disk in the blob storage type: string diskURI: - description: diskURI is the URI of data disk in the - blob storage + description: The URI the data disk in the blob storage type: string fsType: - description: fsType is Filesystem type to mount. Must - be a filesystem type supported by the host operating - system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred - to be "ext4" if unspecified. + description: Filesystem type to mount. Must be a filesystem + type supported by the host operating system. Ex. "ext4", + "xfs", "ntfs". Implicitly inferred to be "ext4" if + unspecified. type: string kind: - description: 'kind expected values are Shared: multiple - blob disks per storage account Dedicated: single - blob disk per storage account Managed: azure managed - data disk (only in managed availability set). defaults + description: 'Expected values Shared: multiple blob + disks per storage account Dedicated: single blob + disk per storage account Managed: azure managed data + disk (only in managed availability set). defaults to shared' type: string readOnly: +<<<<<<< HEAD description: readOnly Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. ======= @@ -5254,6 +5539,10 @@ spec: description: readOnly Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Defaults to false (read/write). ReadOnly + here will force the ReadOnly setting in VolumeMounts. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: boolean required: - diskName @@ -5261,19 +5550,24 @@ spec: type: object azureFile: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: azureFile represents an Azure File Service +======= + description: AzureFile represents an Azure File Service +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) mount on the host and bind mount to the pod. properties: readOnly: - description: readOnly defaults to false (read/write). - ReadOnly here will force the ReadOnly setting in VolumeMounts. + description: Defaults to false (read/write). ReadOnly + here will force the ReadOnly setting in VolumeMounts. type: boolean secretName: - description: secretName is the name of secret that - contains Azure Storage Account Name and Key + description: the name of secret that contains Azure + Storage Account Name and Key type: string shareName: +<<<<<<< HEAD description: shareName is the azure share Name ======= description: AzureFile represents an Azure File Service @@ -5297,6 +5591,9 @@ spec: ======= description: shareName is the azure share Name >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Share Name +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string required: - secretName @@ -5304,6 +5601,7 @@ spec: type: object cephfs: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: cephFS represents a Ceph FS mount on the host that shares a pod's lifetime @@ -5327,26 +5625,40 @@ spec: description: 'monitors is Required: Monitors is a collection of Ceph monitors More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) - items: - type: string - type: array - path: +======= + description: CephFS represents a Ceph FS mount on the host + that shares a pod's lifetime + properties: + monitors: + description: 'Required: Monitors is a collection of + Ceph monitors More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) + items: + type: string + type: array + path: +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD description: 'path is Optional: Used as the mounted root, rather than the full Ceph tree, default is /' +======= + description: 'Optional: Used as the mounted root, rather + than the full Ceph tree, default is /' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string readOnly: - description: 'readOnly is Optional: Defaults to false - (read/write). ReadOnly here will force the ReadOnly - setting in VolumeMounts. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' + description: 'Optional: Defaults to false (read/write). + ReadOnly here will force the ReadOnly setting in VolumeMounts. + More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' type: boolean secretFile: - description: 'secretFile is Optional: SecretFile is - the path to key ring for User, default is /etc/ceph/user.secret - More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' + description: 'Optional: SecretFile is the path to key + ring for User, default is /etc/ceph/user.secret More + info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' type: string secretRef: +<<<<<<< HEAD description: 'secretRef is Optional: SecretRef is reference to the authentication secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' @@ -5379,6 +5691,11 @@ spec: to the authentication secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Optional: SecretRef is reference to the + authentication secret for User, default is empty. + More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: name: description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names @@ -5388,6 +5705,7 @@ spec: type: object user: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'user is optional: User is the rados user name, default is admin More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' @@ -5399,23 +5717,32 @@ spec: description: 'user is optional: User is the rados user name, default is admin More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Optional: User is the rados user name, + default is admin More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string required: - monitors type: object cinder: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'cinder represents a cinder volume attached +======= + description: 'Cinder represents a cinder volume attached +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) and mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' properties: fsType: - description: 'fsType is the filesystem type to mount. - Must be a filesystem type supported by the host operating - system. Examples: "ext4", "xfs", "ntfs". Implicitly - inferred to be "ext4" if unspecified. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' + description: 'Filesystem type to mount. Must be a filesystem + type supported by the host operating system. Examples: + "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" + if unspecified. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' type: string readOnly: +<<<<<<< HEAD description: 'readOnly defaults to false (read/write). ======= description: 'Cinder represents a cinder volume attached @@ -5437,11 +5764,15 @@ spec: ======= description: 'readOnly defaults to false (read/write). >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Optional: Defaults to false (read/write). +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' type: boolean secretRef: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'secretRef is optional: points to a secret object containing parameters used to connect to OpenStack.' @@ -5453,6 +5784,10 @@ spec: description: 'secretRef is optional: points to a secret object containing parameters used to connect to OpenStack.' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Optional: points to a secret object containing + parameters used to connect to OpenStack.' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: name: description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names @@ -5462,6 +5797,7 @@ spec: type: object volumeID: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'volumeID used to identify the volume in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' @@ -5473,30 +5809,38 @@ spec: description: 'volumeID used to identify the volume in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'volume id used to identify the volume + in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string required: - volumeID type: object configMap: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: configMap represents a configMap that should +======= + description: ConfigMap represents a configMap that should +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) populate this volume properties: defaultMode: - description: 'defaultMode is optional: mode bits used - to set permissions on created files by default. Must - be an octal value between 0000 and 0777 or a decimal - value between 0 and 511. YAML accepts both octal and - decimal values, JSON requires decimal values for mode - bits. Defaults to 0644. Directories within the path - are not affected by this setting. This might be in - conflict with other options that affect the file mode, - like fsGroup, and the result can be other mode bits - set.' + description: 'Optional: mode bits used to set permissions + on created files by default. Must be an octal value + between 0000 and 0777 or a decimal value between 0 + and 511. YAML accepts both octal and decimal values, + JSON requires decimal values for mode bits. Defaults + to 0644. Directories within the path are not affected + by this setting. This might be in conflict with other + options that affect the file mode, like fsGroup, and + the result can be other mode bits set.' format: int32 type: integer items: +<<<<<<< HEAD description: items if unspecified, each key-value pair in the Data field of the referenced ConfigMap will be projected into the volume as a file whose name @@ -5527,6 +5871,8 @@ spec: type: integer items: <<<<<<< HEAD +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) description: If unspecified, each key-value pair in the Data field of the referenced ConfigMap will be projected into the volume as a file whose name is @@ -5535,6 +5881,7 @@ spec: and unlisted keys will not be present. If a key is specified which is not present in the ConfigMap, the volume setup will error unless it is marked optional. +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= description: items if unspecified, each key-value pair @@ -5546,6 +5893,8 @@ spec: key is specified which is not present in the ConfigMap, the volume setup will error unless it is marked optional. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) Paths must be relative and may not contain the '..' path or start with '..'. items: @@ -5554,23 +5903,28 @@ spec: properties: key: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: key is the key to project. +======= + description: The key to project. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string mode: - description: 'mode is Optional: mode bits used - to set permissions on this file. Must be an - octal value between 0000 and 0777 or a decimal - value between 0 and 511. YAML accepts both octal - and decimal values, JSON requires decimal values - for mode bits. If not specified, the volume - defaultMode will be used. This might be in conflict - with other options that affect the file mode, - like fsGroup, and the result can be other mode - bits set.' + description: 'Optional: mode bits used to set + permissions on this file. Must be an octal value + between 0000 and 0777 or a decimal value between + 0 and 511. YAML accepts both octal and decimal + values, JSON requires decimal values for mode + bits. If not specified, the volume defaultMode + will be used. This might be in conflict with + other options that affect the file mode, like + fsGroup, and the result can be other mode bits + set.' format: int32 type: integer path: +<<<<<<< HEAD description: path is the relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. @@ -5596,10 +5950,13 @@ spec: type: integer path: <<<<<<< HEAD +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) description: The relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. May not start with the string '..'. +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= description: path is the relative path of the @@ -5607,6 +5964,8 @@ spec: path. May not contain the path element '..'. May not start with the string '..'. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string required: - key @@ -5619,6 +5978,7 @@ spec: type: string optional: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: optional specify whether the ConfigMap or its keys must be defined @@ -5642,11 +6002,20 @@ spec: csi: description: csi (Container Storage Interface) represents >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Specify whether the ConfigMap or its keys + must be defined + type: boolean + type: object + csi: + description: CSI (Container Storage Interface) represents +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) ephemeral storage that is handled by certain external CSI drivers (Beta feature). properties: driver: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: driver is the name of the CSI driver that ======= @@ -5655,12 +6024,16 @@ spec: ======= description: driver is the name of the CSI driver that >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Driver is the name of the CSI driver that +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) handles this volume. Consult with your admin for the correct name as registered in the cluster. type: string fsType: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: fsType to mount. Ex. "ext4", "xfs", "ntfs". @@ -5685,6 +6058,15 @@ spec: nodePublishSecretRef: description: nodePublishSecretRef is a reference to >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Filesystem type to mount. Ex. "ext4", "xfs", + "ntfs". If not provided, the empty value is passed + to the associated CSI driver which will determine + the default filesystem to apply. + type: string + nodePublishSecretRef: + description: NodePublishSecretRef is a reference to +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) the secret object containing sensitive information to pass to the CSI driver to complete the CSI NodePublishVolume and NodeUnpublishVolume calls. This field is optional, @@ -5700,6 +6082,7 @@ spec: type: object readOnly: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: readOnly specifies a read-only configuration for the volume. Defaults to false (read/write). @@ -5711,11 +6094,16 @@ spec: description: readOnly specifies a read-only configuration for the volume. Defaults to false (read/write). >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Specifies a read-only configuration for + the volume. Defaults to false (read/write). +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: boolean volumeAttributes: additionalProperties: type: string <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: volumeAttributes stores driver-specific ======= @@ -5724,6 +6112,9 @@ spec: ======= description: volumeAttributes stores driver-specific >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: VolumeAttributes stores driver-specific +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties that are passed to the CSI driver. Consult your driver's documentation for supported values. type: object @@ -5732,6 +6123,7 @@ spec: type: object downwardAPI: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: downwardAPI represents downward API about the ======= @@ -5740,6 +6132,9 @@ spec: ======= description: downwardAPI represents downward API about the >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: DownwardAPI represents downward API about the +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) pod that should populate this volume properties: defaultMode: @@ -5830,6 +6225,7 @@ spec: type: object emptyDir: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'emptyDir represents a temporary directory that shares a pod''s lifetime. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' @@ -5845,10 +6241,17 @@ spec: that shares a pod''s lifetime. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' properties: medium: +======= + description: 'EmptyDir represents a temporary directory + that shares a pod''s lifetime. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' + properties: + medium: +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) description: 'What type of storage medium should back this directory. The default is "" which means to use the node''s default medium. Must be an empty string (default) or Memory. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= description: 'emptyDir represents a temporary directory @@ -5861,6 +6264,8 @@ spec: Must be an empty string (default) or Memory. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string sizeLimit: anyOf: @@ -5868,6 +6273,7 @@ spec: - type: string <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: 'sizeLimit is the total amount of local @@ -5880,6 +6286,8 @@ spec: More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' <<<<<<< HEAD ======= +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) description: 'Total amount of local storage required for this EmptyDir volume. The size limit is also applicable for memory medium. The maximum usage on memory medium @@ -5887,14 +6295,18 @@ spec: specified here and the sum of memory limits of all containers in a pod. The default is nil which means that the limit is undefined. More info: http://kubernetes.io/docs/user-guide/volumes#emptydir' +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true type: object ephemeral: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: "ephemeral represents a volume that is handled ======= @@ -5903,6 +6315,9 @@ spec: ======= description: "ephemeral represents a volume that is handled >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: "Ephemeral represents a volume that is handled +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) by a cluster storage driver. The volume's lifecycle is tied to the pod that defines it - it will be created before the pod starts, and deleted when the pod is removed. \n @@ -5959,6 +6374,7 @@ spec: properties: accessModes: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'accessModes contains the desired ======= @@ -5967,6 +6383,9 @@ spec: ======= description: 'accessModes contains the desired >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'AccessModes contains the desired +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) access modes the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1' items: @@ -5975,6 +6394,7 @@ spec: dataSource: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: 'dataSource field can be used to @@ -6000,10 +6420,20 @@ spec: the provisioner or an external controller can support the specified data source, it will create a new volume based on the contents +======= + description: 'This field can be used to specify + either: * An existing VolumeSnapshot object + (snapshot.storage.k8s.io/VolumeSnapshot) * + An existing PVC (PersistentVolumeClaim) If + the provisioner or an external controller + can support the specified data source, it + will create a new volume based on the contents +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) of the specified data source. If the AnyVolumeDataSource feature gate is enabled, this field will always have the same contents as the DataSourceRef field.' +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= can support the specified data source, it @@ -6016,6 +6446,8 @@ spec: If the namespace is specified, then dataSourceRef will not be copied to dataSource.' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: apiGroup: description: APIGroup is the group for the @@ -6039,6 +6471,7 @@ spec: dataSourceRef: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: 'dataSourceRef specifies the object @@ -6052,23 +6485,32 @@ spec: or dynamic provisioner. This field will replace the functionality of the dataSource field <<<<<<< HEAD +======= + description: 'Specifies the object from which + to populate the volume with data, if a non-empty + volume is desired. This may be any local object + from a non-empty API group (non core object) + or a PersistentVolumeClaim object. When this + field is specified, volume binding will only + succeed if the type of the specified object + matches some installed volume populator or + dynamic provisioner. This field will replace + the functionality of the DataSource field +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) and as such if both fields are non-empty, they must have the same value. For backwards - compatibility, when namespace isn''t specified - in dataSourceRef, both fields (dataSource - and dataSourceRef) will be set to the same - value automatically if one of them is empty - and the other is non-empty. When namespace - is specified in dataSourceRef, dataSource - isn''t set to the same value and must be empty. - There are three important differences between - dataSource and dataSourceRef: * While dataSource - only allows two specific types of objects, - dataSourceRef allows any non-core object, - as well as PersistentVolumeClaim objects. - * While dataSource ignores disallowed values - (dropping them), dataSourceRef preserves + compatibility, both fields (DataSource and + DataSourceRef) will be set to the same value + automatically if one of them is empty and + the other is non-empty. There are two important + differences between DataSource and DataSourceRef: + * While DataSource only allows two specific + types of objects, DataSourceRef allows any + non-core object, as well as PersistentVolumeClaim + objects. * While DataSource ignores disallowed + values (dropping them), DataSourceRef preserves all values, and generates an error if a disallowed +<<<<<<< HEAD value is specified. * While dataSource only allows local objects, dataSourceRef allows objects in any namespaces. (Beta) Using @@ -6122,6 +6564,11 @@ spec: the CrossNamespaceVolumeDataSource feature gate to be enabled.' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + value is specified. (Alpha) Using this field + requires the AnyVolumeDataSource feature gate + to be enabled.' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: apiGroup: description: APIGroup is the group for the @@ -6140,6 +6587,7 @@ spec: type: string <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) namespace: @@ -6158,12 +6606,15 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) required: - kind - name type: object resources: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'resources represents the minimum ======= @@ -6172,6 +6623,9 @@ spec: ======= description: 'resources represents the minimum >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Resources represents the minimum +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) resources the volume should have. If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements that are lower than @@ -6181,6 +6635,7 @@ spec: properties: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) claims: @@ -6214,6 +6669,8 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) limits: additionalProperties: anyOf: @@ -6238,6 +6695,7 @@ spec: it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' @@ -6263,6 +6721,14 @@ spec: description: selector is a label query over volumes to consider for binding. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' + type: object + type: object + selector: + description: A label query over volumes to consider + for binding. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: matchExpressions: description: matchExpressions is a list @@ -6314,6 +6780,7 @@ spec: type: object storageClassName: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'storageClassName is the name of the StorageClass required by the claim. More @@ -6327,6 +6794,10 @@ spec: the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Name of the StorageClass required + by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string volumeMode: description: volumeMode defines what type of @@ -6336,6 +6807,7 @@ spec: type: string volumeName: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: volumeName is the binding reference ======= @@ -6344,6 +6816,9 @@ spec: ======= description: volumeName is the binding reference >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: VolumeName is the binding reference +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) to the PersistentVolume backing this claim. type: string type: object @@ -6353,6 +6828,7 @@ spec: type: object fc: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: fc represents a Fibre Channel resource that ======= @@ -6361,12 +6837,16 @@ spec: ======= description: fc represents a Fibre Channel resource that >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: FC represents a Fibre Channel resource that +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) is attached to a kubelet's host machine and then exposed to the pod. properties: fsType: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: 'fsType is the filesystem type to mount. @@ -6375,17 +6855,24 @@ spec: to be "ext4" if unspecified. TODO: how do we prevent errors in the filesystem from compromising the machine' <<<<<<< HEAD +======= + description: 'Filesystem type to mount. Must be a filesystem + type supported by the host operating system. Ex. "ext4", + "xfs", "ntfs". Implicitly inferred to be "ext4" if + unspecified. TODO: how do we prevent errors in the + filesystem from compromising the machine' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string lun: - description: 'lun is Optional: FC target lun number' + description: 'Optional: FC target lun number' format: int32 type: integer readOnly: - description: 'readOnly is Optional: Defaults to false - (read/write). ReadOnly here will force the ReadOnly - setting in VolumeMounts.' + description: 'Optional: Defaults to false (read/write). + ReadOnly here will force the ReadOnly setting in VolumeMounts.' type: boolean targetWWNs: +<<<<<<< HEAD description: 'targetWWNs is Optional: FC target worldwide names (WWNs)' ======= @@ -6414,11 +6901,15 @@ spec: description: 'targetWWNs is Optional: FC target worldwide names (WWNs)' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Optional: FC target worldwide names (WWNs)' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) items: type: string type: array wwids: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'wwids Optional: FC volume world wide identifiers ======= @@ -6427,6 +6918,9 @@ spec: ======= description: 'wwids Optional: FC volume world wide identifiers >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Optional: FC volume world wide identifiers +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) (wwids) Either wwids or combination of targetWWNs and lun must be set, but not both simultaneously.' items: @@ -6435,15 +6929,20 @@ spec: type: object flexVolume: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: flexVolume represents a generic volume resource +======= + description: FlexVolume represents a generic volume resource +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) that is provisioned/attached using an exec based plugin. properties: driver: - description: driver is the name of the driver to use + description: Driver is the name of the driver to use for this volume. type: string fsType: +<<<<<<< HEAD description: fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". The default filesystem @@ -6461,10 +6960,13 @@ spec: type: string fsType: <<<<<<< HEAD +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) description: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". The default filesystem depends on FlexVolume script. +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= description: fsType is the filesystem type to mount. @@ -6472,21 +6974,27 @@ spec: system. Ex. "ext4", "xfs", "ntfs". The default filesystem depends on FlexVolume script. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string options: additionalProperties: type: string <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'options is Optional: this field holds extra command options if any.' +======= + description: 'Optional: Extra command options if any.' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: object readOnly: - description: 'readOnly is Optional: defaults to false - (read/write). ReadOnly here will force the ReadOnly - setting in VolumeMounts.' + description: 'Optional: Defaults to false (read/write). + ReadOnly here will force the ReadOnly setting in VolumeMounts.' type: boolean secretRef: +<<<<<<< HEAD description: 'secretRef is Optional: secretRef is reference to the secret object containing sensitive information to pass to the plugin scripts. This may be empty if @@ -6507,12 +7015,15 @@ spec: type: boolean secretRef: <<<<<<< HEAD +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) description: 'Optional: SecretRef is reference to the secret object containing sensitive information to pass to the plugin scripts. This may be empty if no secret object is specified. If the secret object contains more than one secret, all secrets are passed to the plugin scripts.' +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= description: 'secretRef is Optional: secretRef is reference @@ -6522,6 +7033,8 @@ spec: contains more than one secret, all secrets are passed to the plugin scripts.' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: name: description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names @@ -6534,6 +7047,7 @@ spec: type: object flocker: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: flocker represents a Flocker volume attached ======= @@ -6542,22 +7056,32 @@ spec: ======= description: flocker represents a Flocker volume attached >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Flocker represents a Flocker volume attached +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) to a kubelet's host machine. This depends on the Flocker control service being running properties: datasetName: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker should be considered as deprecated +======= + description: Name of the dataset stored as metadata + -> name on the dataset for Flocker should be considered + as deprecated +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string datasetUUID: - description: datasetUUID is the UUID of the dataset. - This is unique identifier of a Flocker dataset + description: UUID of the dataset. This is unique identifier + of a Flocker dataset type: string type: object gcePersistentDisk: +<<<<<<< HEAD description: 'gcePersistentDisk represents a GCE Disk resource ======= description: Name of the dataset stored as metadata @@ -6581,11 +7105,15 @@ spec: ======= description: 'gcePersistentDisk represents a GCE Disk resource >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'GCEPersistentDisk represents a GCE Disk resource +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) that is attached to a kubelet''s host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' properties: fsType: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'fsType is filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem @@ -6600,6 +7128,11 @@ spec: that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Filesystem type of the volume that you + want to mount. Tip: Ensure that the filesystem type + is supported by the host operating system. Examples: +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk TODO: how do we prevent errors in the filesystem from @@ -6608,6 +7141,7 @@ spec: partition: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: 'partition is the partition in the volume @@ -6617,14 +7151,22 @@ spec: partition for /dev/sda is "0" (or you can leave the property empty). More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' <<<<<<< HEAD +======= + description: 'The partition in the volume that you want + to mount. If omitted, the default is to mount by volume + name. Examples: For volume /dev/sda1, you specify + the partition as "1". Similarly, the volume partition + for /dev/sda is "0" (or you can leave the property + empty). More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) format: int32 type: integer pdName: - description: 'pdName is unique name of the PD resource - in GCE. Used to identify the disk in GCE. More info: - https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' + description: 'Unique name of the PD resource in GCE. + Used to identify the disk in GCE. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' type: string readOnly: +<<<<<<< HEAD description: 'readOnly here will force the ReadOnly ======= description: 'The partition in the volume that you want @@ -6649,6 +7191,9 @@ spec: ======= description: 'readOnly here will force the ReadOnly >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'ReadOnly here will force the ReadOnly +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) setting in VolumeMounts. Defaults to false. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' type: boolean @@ -6657,6 +7202,7 @@ spec: type: object gitRepo: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'gitRepo represents a git repository at a particular ======= @@ -6665,6 +7211,9 @@ spec: ======= description: 'gitRepo represents a git repository at a particular >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'GitRepo represents a git repository at a particular +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) revision. DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an EmptyDir into an InitContainer that clones the repo using git, then mount @@ -6672,6 +7221,7 @@ spec: properties: directory: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: directory is the target directory name. Must not contain or start with '..'. If '.' is supplied, @@ -6686,11 +7236,17 @@ spec: Must not contain or start with '..'. If '.' is supplied, the volume directory will be the git repository. Otherwise, >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Target directory name. Must not contain + or start with '..'. If '.' is supplied, the volume + directory will be the git repository. Otherwise, +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) if specified, the volume will contain the git repository in the subdirectory with the given name. type: string repository: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: repository is the URL type: string @@ -6710,25 +7266,36 @@ spec: description: revision is the commit hash for the specified revision. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Repository URL + type: string + revision: + description: Commit hash for the specified revision. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string required: - repository type: object glusterfs: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'glusterfs represents a Glusterfs mount on +======= + description: 'Glusterfs represents a Glusterfs mount on +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) the host that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/glusterfs/README.md' properties: endpoints: - description: 'endpoints is the endpoint name that details - Glusterfs topology. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod' + description: 'EndpointsName is the endpoint name that + details Glusterfs topology. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod' type: string path: - description: 'path is the Glusterfs volume path. More + description: 'Path is the Glusterfs volume path. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod' type: string readOnly: +<<<<<<< HEAD description: 'readOnly here will force the Glusterfs ======= description: 'Glusterfs represents a Glusterfs mount on @@ -6752,6 +7319,9 @@ spec: ======= description: 'readOnly here will force the Glusterfs >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'ReadOnly here will force the Glusterfs +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) volume to be mounted with read-only permissions. Defaults to false. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod' type: boolean @@ -6761,6 +7331,7 @@ spec: type: object hostPath: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'hostPath represents a pre-existing file or ======= @@ -6769,6 +7340,9 @@ spec: ======= description: 'hostPath represents a pre-existing file or >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'HostPath represents a pre-existing file or +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) directory on the host machine that is directly exposed to the container. This is generally used for system agents or other privileged things that are allowed to see the @@ -6780,6 +7354,7 @@ spec: properties: path: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'path of the directory on the host. If ======= @@ -6788,11 +7363,15 @@ spec: ======= description: 'path of the directory on the host. If >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Path of the directory on the host. If +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) the path is a symlink, it will follow the link to the real path. More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath' type: string type: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'type for HostPath Volume Defaults to "" ======= @@ -6801,6 +7380,9 @@ spec: ======= description: 'type for HostPath Volume Defaults to "" >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Type for HostPath Volume Defaults to "" +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath' type: string required: @@ -6808,6 +7390,7 @@ spec: type: object iscsi: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'iscsi represents an ISCSI Disk resource that ======= @@ -6816,20 +7399,27 @@ spec: ======= description: 'iscsi represents an ISCSI Disk resource that >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'ISCSI represents an ISCSI Disk resource that +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) is attached to a kubelet''s host machine and then exposed to the pod. More info: https://examples.k8s.io/volumes/iscsi/README.md' properties: chapAuthDiscovery: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: chapAuthDiscovery defines whether support iSCSI Discovery CHAP authentication +======= + description: whether support iSCSI Discovery CHAP authentication +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: boolean chapAuthSession: - description: chapAuthSession defines whether support - iSCSI Session CHAP authentication + description: whether support iSCSI Session CHAP authentication type: boolean fsType: +<<<<<<< HEAD description: 'fsType is the filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: @@ -6855,6 +7445,11 @@ spec: that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Filesystem type of the volume that you + want to mount. Tip: Ensure that the filesystem type + is supported by the host operating system. Examples: +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#iscsi TODO: how do we prevent errors in the filesystem from @@ -6863,6 +7458,7 @@ spec: initiatorName: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: initiatorName is the custom iSCSI Initiator @@ -6870,19 +7466,26 @@ spec: simultaneously, new iSCSI interface : will be created for the connection. <<<<<<< HEAD +======= + description: Custom iSCSI Initiator Name. If initiatorName + is specified with iscsiInterface simultaneously, new + iSCSI interface : will + be created for the connection. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string iqn: - description: iqn is the target iSCSI Qualified Name. + description: Target iSCSI Qualified Name. type: string iscsiInterface: - description: iscsiInterface is the interface Name that - uses an iSCSI transport. Defaults to 'default' (tcp). + description: iSCSI Interface Name that uses an iSCSI + transport. Defaults to 'default' (tcp). type: string lun: - description: lun represents iSCSI Target Lun number. + description: iSCSI Target Lun number. format: int32 type: integer portals: +<<<<<<< HEAD description: portals is the iSCSI Target Portal List. The portal is either an IP or ip_addr:port if the port is other than default (typically TCP ports 860 @@ -6918,11 +7521,17 @@ spec: port is other than default (typically TCP ports 860 and 3260). >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: iSCSI Target Portal List. The portal is + either an IP or ip_addr:port if the port is other + than default (typically TCP ports 860 and 3260). +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) items: type: string type: array readOnly: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: readOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. @@ -6946,6 +7555,14 @@ spec: description: secretRef is the CHAP Secret for iSCSI target and initiator authentication >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: ReadOnly here will force the ReadOnly setting + in VolumeMounts. Defaults to false. + type: boolean + secretRef: + description: CHAP Secret for iSCSI target and initiator + authentication +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: name: description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names @@ -6956,6 +7573,7 @@ spec: targetPortal: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: targetPortal is iSCSI Target Portal. The @@ -6970,6 +7588,11 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: iSCSI Target Portal. The Portal is either + an IP or ip_addr:port if the port is other than default + (typically TCP ports 860 and 3260). +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string required: - iqn @@ -6978,19 +7601,25 @@ spec: type: object name: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'name of the volume. Must be a DNS_LABEL and unique within the pod. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' +======= + description: 'Volume''s name. Must be a DNS_LABEL and unique + within the pod. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string nfs: - description: 'nfs represents an NFS mount on the host that + description: 'NFS represents an NFS mount on the host that shares a pod''s lifetime More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' properties: path: - description: 'path that is exported by the NFS server. + description: 'Path that is exported by the NFS server. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' type: string readOnly: +<<<<<<< HEAD description: 'readOnly here will force the NFS export ======= description: 'Volume''s name. Must be a DNS_LABEL and unique @@ -7015,11 +7644,15 @@ spec: ======= description: 'readOnly here will force the NFS export >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'ReadOnly here will force the NFS export +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) to be mounted with read-only permissions. Defaults to false. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' type: boolean server: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'server is the hostname or IP address of ======= @@ -7028,6 +7661,9 @@ spec: ======= description: 'server is the hostname or IP address of >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Server is the hostname or IP address of +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) the NFS server. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' type: string required: @@ -7036,6 +7672,7 @@ spec: type: object persistentVolumeClaim: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'persistentVolumeClaimVolumeSource represents ======= @@ -7044,11 +7681,15 @@ spec: ======= description: 'persistentVolumeClaimVolumeSource represents >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'PersistentVolumeClaimVolumeSource represents +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) a reference to a PersistentVolumeClaim in the same namespace. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' properties: claimName: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'claimName is the name of a PersistentVolumeClaim ======= @@ -7057,11 +7698,15 @@ spec: ======= description: 'claimName is the name of a PersistentVolumeClaim >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'ClaimName is the name of a PersistentVolumeClaim +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) in the same namespace as the pod using this volume. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' type: string readOnly: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: readOnly Will force the ReadOnly setting in VolumeMounts. Default false. @@ -7073,12 +7718,17 @@ spec: description: readOnly Will force the ReadOnly setting in VolumeMounts. Default false. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Will force the ReadOnly setting in VolumeMounts. + Default false. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: boolean required: - claimName type: object photonPersistentDisk: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: photonPersistentDisk represents a PhotonController ======= @@ -7087,12 +7737,16 @@ spec: ======= description: photonPersistentDisk represents a PhotonController >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: PhotonPersistentDisk represents a PhotonController +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) persistent disk attached and mounted on kubelets host machine properties: fsType: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: fsType is the filesystem type to mount. @@ -7120,12 +7774,23 @@ spec: description: pdID is the ID that identifies Photon Controller persistent disk >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Filesystem type to mount. Must be a filesystem + type supported by the host operating system. Ex. "ext4", + "xfs", "ntfs". Implicitly inferred to be "ext4" if + unspecified. + type: string + pdID: + description: ID that identifies Photon Controller persistent + disk +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string required: - pdID type: object portworxVolume: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: portworxVolume represents a portworx volume attached and mounted on kubelets host machine @@ -7146,12 +7811,20 @@ spec: fsType: description: fSType represents the filesystem type to >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: PortworxVolume represents a portworx volume + attached and mounted on kubelets host machine + properties: + fsType: + description: FSType represents the filesystem type to +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) mount Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs". Implicitly inferred to be "ext4" if unspecified. type: string readOnly: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: readOnly defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. @@ -7172,6 +7845,13 @@ spec: volumeID: description: volumeID uniquely identifies a Portworx >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Defaults to false (read/write). ReadOnly + here will force the ReadOnly setting in VolumeMounts. + type: boolean + volumeID: + description: VolumeID uniquely identifies a Portworx +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) volume type: string required: @@ -7179,23 +7859,29 @@ spec: type: object projected: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: projected items for all in one resources secrets, configmaps, and downward API +======= + description: Items for all in one resources secrets, configmaps, + and downward API +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: defaultMode: - description: defaultMode are the mode bits used to set - permissions on created files by default. Must be an - octal value between 0000 and 0777 or a decimal value - between 0 and 511. YAML accepts both octal and decimal - values, JSON requires decimal values for mode bits. - Directories within the path are not affected by this - setting. This might be in conflict with other options - that affect the file mode, like fsGroup, and the result - can be other mode bits set. + description: Mode bits used to set permissions on created + files by default. Must be an octal value between 0000 + and 0777 or a decimal value between 0 and 511. YAML + accepts both octal and decimal values, JSON requires + decimal values for mode bits. Directories within the + path are not affected by this setting. This might + be in conflict with other options that affect the + file mode, like fsGroup, and the result can be other + mode bits set. format: int32 type: integer sources: +<<<<<<< HEAD description: sources is the list of volume projections ======= description: Items for all in one resources secrets, configmaps, @@ -7224,12 +7910,16 @@ spec: ======= description: sources is the list of volume projections >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: list of volume projections +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) items: description: Projection that may be projected along with other supported volume types properties: configMap: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: configMap information about the configMap data to project @@ -7250,6 +7940,13 @@ spec: items: description: items if unspecified, each key-value >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: information about the configMap data + to project + properties: + items: + description: If unspecified, each key-value +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) pair in the Data field of the referenced ConfigMap will be projected into the volume as a file whose name is the key and content @@ -7267,25 +7964,30 @@ spec: properties: key: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: key is the key to project. +======= + description: The key to project. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string mode: - description: 'mode is Optional: mode - bits used to set permissions on this - file. Must be an octal value between - 0000 and 0777 or a decimal value between - 0 and 511. YAML accepts both octal - and decimal values, JSON requires - decimal values for mode bits. If not - specified, the volume defaultMode - will be used. This might be in conflict - with other options that affect the - file mode, like fsGroup, and the result - can be other mode bits set.' + description: 'Optional: mode bits used + to set permissions on this file. Must + be an octal value between 0000 and + 0777 or a decimal value between 0 + and 511. YAML accepts both octal and + decimal values, JSON requires decimal + values for mode bits. If not specified, + the volume defaultMode will be used. + This might be in conflict with other + options that affect the file mode, + like fsGroup, and the result can be + other mode bits set.' format: int32 type: integer path: +<<<<<<< HEAD description: path is the relative path of the file to map the key to. May not be an absolute path. May not contain @@ -7321,6 +8023,11 @@ spec: of the file to map the key to. May not be an absolute path. May not contain >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: The relative path of the + file to map the key to. May not be + an absolute path. May not contain +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) the path element '..'. May not start with the string '..'. type: string @@ -7337,6 +8044,7 @@ spec: type: string optional: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: optional specify whether the ConfigMap or its keys must be defined @@ -7363,6 +8071,15 @@ spec: description: downwardAPI information about the downwardAPI data to project >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Specify whether the ConfigMap + or its keys must be defined + type: boolean + type: object + downwardAPI: + description: information about the downwardAPI + data to project +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: items: description: Items is a list of DownwardAPIVolume @@ -7447,6 +8164,7 @@ spec: type: object secret: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: secret information about the secret data to project @@ -7467,6 +8185,13 @@ spec: items: description: items if unspecified, each key-value >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: information about the secret data + to project + properties: + items: + description: If unspecified, each key-value +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) pair in the Data field of the referenced Secret will be projected into the volume as a file whose name is the key and content @@ -7484,25 +8209,30 @@ spec: properties: key: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: key is the key to project. +======= + description: The key to project. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string mode: - description: 'mode is Optional: mode - bits used to set permissions on this - file. Must be an octal value between - 0000 and 0777 or a decimal value between - 0 and 511. YAML accepts both octal - and decimal values, JSON requires - decimal values for mode bits. If not - specified, the volume defaultMode - will be used. This might be in conflict - with other options that affect the - file mode, like fsGroup, and the result - can be other mode bits set.' + description: 'Optional: mode bits used + to set permissions on this file. Must + be an octal value between 0000 and + 0777 or a decimal value between 0 + and 511. YAML accepts both octal and + decimal values, JSON requires decimal + values for mode bits. If not specified, + the volume defaultMode will be used. + This might be in conflict with other + options that affect the file mode, + like fsGroup, and the result can be + other mode bits set.' format: int32 type: integer path: +<<<<<<< HEAD description: path is the relative path of the file to map the key to. May not be an absolute path. May not contain @@ -7538,6 +8268,11 @@ spec: of the file to map the key to. May not be an absolute path. May not contain >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: The relative path of the + file to map the key to. May not be + an absolute path. May not contain +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) the path element '..'. May not start with the string '..'. type: string @@ -7554,16 +8289,22 @@ spec: type: string optional: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: optional field specify whether the Secret or its key must be defined +======= + description: Specify whether the Secret or + its key must be defined +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: boolean type: object serviceAccountToken: - description: serviceAccountToken is information - about the serviceAccountToken data to project + description: information about the serviceAccountToken + data to project properties: audience: +<<<<<<< HEAD description: audience is the intended audience ======= description: Specify whether the Secret or @@ -7585,7 +8326,10 @@ spec: ======= description: audience is the intended audience >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) - of the token. A recipient of a token must +======= + description: Audience is the intended audience +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) + of the token. A recipient of a token must identify itself with an identifier specified in the audience of the token, and otherwise should reject the token. The audience defaults @@ -7593,6 +8337,7 @@ spec: type: string expirationSeconds: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: expirationSeconds is the requested ======= @@ -7601,6 +8346,9 @@ spec: ======= description: expirationSeconds is the requested >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: ExpirationSeconds is the requested +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) duration of validity of the service account token. As the token approaches expiration, the kubelet volume plugin will proactively @@ -7614,6 +8362,7 @@ spec: type: integer path: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: path is the path relative to ======= @@ -7622,6 +8371,9 @@ spec: ======= description: path is the path relative to >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Path is the path relative to +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) the mount point of the file to project the token into. type: string @@ -7633,15 +8385,20 @@ spec: type: object quobyte: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: quobyte represents a Quobyte mount on the host +======= + description: Quobyte represents a Quobyte mount on the host +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) that shares a pod's lifetime properties: group: - description: group to map volume access to Default is + description: Group to map volume access to Default is no group type: string readOnly: +<<<<<<< HEAD description: readOnly here will force the Quobyte volume ======= description: Quobyte represents a Quobyte mount on the host @@ -7661,11 +8418,15 @@ spec: ======= description: readOnly here will force the Quobyte volume >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: ReadOnly here will force the Quobyte volume +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) to be mounted with read-only permissions. Defaults to false. type: boolean registry: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: registry represents a single or multiple ======= @@ -7674,12 +8435,16 @@ spec: ======= description: registry represents a single or multiple >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Registry represents a single or multiple +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) Quobyte Registry services specified as a string as host:port pair (multiple entries are separated with commas) which acts as the central registry for volumes type: string tenant: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: tenant owning the given Quobyte volume ======= @@ -7688,11 +8453,15 @@ spec: ======= description: tenant owning the given Quobyte volume >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Tenant owning the given Quobyte volume +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) in the Backend Used with dynamically provisioned Quobyte volumes, value is set by the plugin type: string user: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: user to map volume access to Defaults to serivceaccount user @@ -7713,6 +8482,13 @@ spec: volume: description: volume is a string that references an already >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: User to map volume access to Defaults to + serivceaccount user + type: string + volume: + description: Volume is a string that references an already +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) created Quobyte volume by name. type: string required: @@ -7721,6 +8497,7 @@ spec: type: object rbd: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'rbd represents a Rados Block Device mount ======= @@ -7729,11 +8506,15 @@ spec: ======= description: 'rbd represents a Rados Block Device mount >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'RBD represents a Rados Block Device mount +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) on the host that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/rbd/README.md' properties: fsType: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'fsType is the filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem @@ -7748,6 +8529,11 @@ spec: that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Filesystem type of the volume that you + want to mount. Tip: Ensure that the filesystem type + is supported by the host operating system. Examples: +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#rbd TODO: how do we prevent errors in the filesystem from @@ -7755,15 +8541,20 @@ spec: type: string image: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'image is the rados image name. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' +======= + description: 'The rados image name. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string keyring: - description: 'keyring is the path to key ring for RBDUser. + description: 'Keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' type: string monitors: +<<<<<<< HEAD description: 'monitors is a collection of Ceph monitors. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' ======= @@ -7786,11 +8577,16 @@ spec: description: 'monitors is a collection of Ceph monitors. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'A collection of Ceph monitors. More info: + https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) items: type: string type: array pool: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'pool is the rados pool name. Default is rbd. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' @@ -7811,11 +8607,19 @@ spec: readOnly: description: 'readOnly here will force the ReadOnly >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'The rados pool name. Default is rbd. More + info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + type: string + readOnly: + description: 'ReadOnly here will force the ReadOnly +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) setting in VolumeMounts. Defaults to false. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' type: boolean secretRef: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'secretRef is name of the authentication ======= @@ -7824,6 +8628,9 @@ spec: ======= description: 'secretRef is name of the authentication >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'SecretRef is name of the authentication +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) secret for RBDUser. If provided overrides keyring. Default is nil. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' properties: @@ -7835,6 +8642,7 @@ spec: type: object user: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'user is the rados user name. Default is admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' @@ -7846,6 +8654,10 @@ spec: description: 'user is the rados user name. Default is admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'The rados user name. Default is admin. + More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string required: - image @@ -7853,28 +8665,32 @@ spec: type: object scaleIO: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: scaleIO represents a ScaleIO persistent volume +======= + description: ScaleIO represents a ScaleIO persistent volume +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) attached and mounted on Kubernetes nodes. properties: fsType: - description: fsType is the filesystem type to mount. - Must be a filesystem type supported by the host operating - system. Ex. "ext4", "xfs", "ntfs". Default is "xfs". + description: Filesystem type to mount. Must be a filesystem + type supported by the host operating system. Ex. "ext4", + "xfs", "ntfs". Default is "xfs". type: string gateway: - description: gateway is the host address of the ScaleIO - API Gateway. + description: The host address of the ScaleIO API Gateway. type: string protectionDomain: - description: protectionDomain is the name of the ScaleIO - Protection Domain for the configured storage. + description: The name of the ScaleIO Protection Domain + for the configured storage. type: string readOnly: - description: readOnly Defaults to false (read/write). - ReadOnly here will force the ReadOnly setting in VolumeMounts. + description: Defaults to false (read/write). ReadOnly + here will force the ReadOnly setting in VolumeMounts. type: boolean secretRef: +<<<<<<< HEAD description: secretRef references to the secret for ======= description: ScaleIO represents a ScaleIO persistent volume @@ -7907,6 +8723,9 @@ spec: ======= description: secretRef references to the secret for >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: SecretRef references to the secret for +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) ScaleIO user and other sensitive information. If this is not provided, Login operation will fail. properties: @@ -7918,24 +8737,29 @@ spec: type: object sslEnabled: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: sslEnabled Flag enable/disable SSL communication +======= + description: Flag to enable/disable SSL communication +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) with Gateway, default false type: boolean storageMode: - description: storageMode indicates whether the storage - for a volume should be ThickProvisioned or ThinProvisioned. - Default is ThinProvisioned. + description: Indicates whether the storage for a volume + should be ThickProvisioned or ThinProvisioned. Default + is ThinProvisioned. type: string storagePool: - description: storagePool is the ScaleIO Storage Pool - associated with the protection domain. + description: The ScaleIO Storage Pool associated with + the protection domain. type: string system: - description: system is the name of the storage system - as configured in ScaleIO. + description: The name of the storage system as configured + in ScaleIO. type: string volumeName: +<<<<<<< HEAD description: volumeName is the name of a volume already created in the ScaleIO system that is associated with this volume source. @@ -7970,6 +8794,11 @@ spec: created in the ScaleIO system that is associated with this volume source. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: The name of a volume already created in + the ScaleIO system that is associated with this volume + source. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string required: - gateway @@ -7978,24 +8807,28 @@ spec: type: object secret: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'secret represents a secret that should populate +======= + description: 'Secret represents a secret that should populate +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) this volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret' properties: defaultMode: - description: 'defaultMode is Optional: mode bits used - to set permissions on created files by default. Must - be an octal value between 0000 and 0777 or a decimal - value between 0 and 511. YAML accepts both octal and - decimal values, JSON requires decimal values for mode - bits. Defaults to 0644. Directories within the path - are not affected by this setting. This might be in - conflict with other options that affect the file mode, - like fsGroup, and the result can be other mode bits - set.' + description: 'Optional: mode bits used to set permissions + on created files by default. Must be an octal value + between 0000 and 0777 or a decimal value between 0 + and 511. YAML accepts both octal and decimal values, + JSON requires decimal values for mode bits. Defaults + to 0644. Directories within the path are not affected + by this setting. This might be in conflict with other + options that affect the file mode, like fsGroup, and + the result can be other mode bits set.' format: int32 type: integer items: +<<<<<<< HEAD description: items If unspecified, each key-value pair in the Data field of the referenced Secret will be projected into the volume as a file whose name is @@ -8028,6 +8861,8 @@ spec: type: integer items: <<<<<<< HEAD +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) description: If unspecified, each key-value pair in the Data field of the referenced Secret will be projected into the volume as a file whose name is the key and @@ -8038,6 +8873,7 @@ spec: error unless it is marked optional. Paths must be relative and may not contain the '..' path or start with '..'. +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= description: items If unspecified, each key-value pair @@ -8051,29 +8887,36 @@ spec: Paths must be relative and may not contain the '..' path or start with '..'. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) items: description: Maps a string key to a path within a volume. properties: key: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: key is the key to project. +======= + description: The key to project. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string mode: - description: 'mode is Optional: mode bits used - to set permissions on this file. Must be an - octal value between 0000 and 0777 or a decimal - value between 0 and 511. YAML accepts both octal - and decimal values, JSON requires decimal values - for mode bits. If not specified, the volume - defaultMode will be used. This might be in conflict - with other options that affect the file mode, - like fsGroup, and the result can be other mode - bits set.' + description: 'Optional: mode bits used to set + permissions on this file. Must be an octal value + between 0000 and 0777 or a decimal value between + 0 and 511. YAML accepts both octal and decimal + values, JSON requires decimal values for mode + bits. If not specified, the volume defaultMode + will be used. This might be in conflict with + other options that affect the file mode, like + fsGroup, and the result can be other mode bits + set.' format: int32 type: integer path: +<<<<<<< HEAD description: path is the relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. @@ -8099,10 +8942,13 @@ spec: type: integer path: <<<<<<< HEAD +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) description: The relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. May not start with the string '..'. +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= description: path is the relative path of the @@ -8110,6 +8956,8 @@ spec: path. May not contain the path element '..'. May not start with the string '..'. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string required: - key @@ -8118,30 +8966,36 @@ spec: type: array optional: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: optional field specify whether the Secret or its keys must be defined +======= + description: Specify whether the Secret or its keys + must be defined +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: boolean secretName: - description: 'secretName is the name of the secret in - the pod''s namespace to use. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret' + description: 'Name of the secret in the pod''s namespace + to use. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret' type: string type: object storageos: - description: storageOS represents a StorageOS volume attached + description: StorageOS represents a StorageOS volume attached and mounted on Kubernetes nodes. properties: fsType: - description: fsType is the filesystem type to mount. - Must be a filesystem type supported by the host operating - system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred - to be "ext4" if unspecified. + description: Filesystem type to mount. Must be a filesystem + type supported by the host operating system. Ex. "ext4", + "xfs", "ntfs". Implicitly inferred to be "ext4" if + unspecified. type: string readOnly: - description: readOnly defaults to false (read/write). - ReadOnly here will force the ReadOnly setting in VolumeMounts. + description: Defaults to false (read/write). ReadOnly + here will force the ReadOnly setting in VolumeMounts. type: boolean secretRef: +<<<<<<< HEAD description: secretRef specifies the secret to use for ======= description: Specify whether the Secret or its keys @@ -8177,6 +9031,9 @@ spec: ======= description: secretRef specifies the secret to use for >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: SecretRef specifies the secret to use for +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) obtaining the StorageOS API credentials. If not specified, default values will be attempted. properties: @@ -8188,6 +9045,7 @@ spec: type: object volumeName: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: volumeName is the human-readable name of ======= @@ -8196,11 +9054,15 @@ spec: ======= description: volumeName is the human-readable name of >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: VolumeName is the human-readable name of +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) the StorageOS volume. Volume names are only unique within a namespace. type: string volumeNamespace: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: volumeNamespace specifies the scope of ======= @@ -8209,6 +9071,9 @@ spec: ======= description: volumeNamespace specifies the scope of >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: VolumeNamespace specifies the scope of +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) the volume within StorageOS. If no namespace is specified then the Pod's namespace will be used. This allows the Kubernetes name scoping to be mirrored within @@ -8221,25 +9086,30 @@ spec: type: object vsphereVolume: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: vsphereVolume represents a vSphere volume attached +======= + description: VsphereVolume represents a vSphere volume attached +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) and mounted on kubelets host machine properties: fsType: - description: fsType is filesystem type to mount. Must - be a filesystem type supported by the host operating - system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred - to be "ext4" if unspecified. + description: Filesystem type to mount. Must be a filesystem + type supported by the host operating system. Ex. "ext4", + "xfs", "ntfs". Implicitly inferred to be "ext4" if + unspecified. type: string storagePolicyID: - description: storagePolicyID is the storage Policy Based - Management (SPBM) profile ID associated with the StoragePolicyName. + description: Storage Policy Based Management (SPBM) + profile ID associated with the StoragePolicyName. type: string storagePolicyName: - description: storagePolicyName is the storage Policy - Based Management (SPBM) profile name. + description: Storage Policy Based Management (SPBM) + profile name. type: string volumePath: +<<<<<<< HEAD description: volumePath is the path that identifies vSphere volume vmdk ======= @@ -8271,6 +9141,9 @@ spec: description: volumePath is the path that identifies vSphere volume vmdk >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Path that identifies vSphere volume vmdk +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string required: - volumePath @@ -8392,6 +9265,7 @@ spec: properties: maxReplicas: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: maxReplicas is the upper limit for the number of pods that can be set by the autoscaler; cannot be @@ -8405,6 +9279,10 @@ spec: of pods that can be set by the autoscaler; cannot be smaller than MinReplicas. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: upper limit for the number of pods that can + be set by the autoscaler; cannot be smaller than MinReplicas. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) format: int32 type: integer minReplicas: @@ -8424,15 +9302,19 @@ spec: properties: apiVersion: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: apiVersion is the API version of the referent +======= + description: API version of the referent +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string kind: - description: 'kind is the kind of the referent; More - info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: 'Kind of the referent; More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"' type: string name: +<<<<<<< HEAD description: 'name is the name of the referent; More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' ======= @@ -8454,6 +9336,9 @@ spec: description: 'name is the name of the referent; More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Name of the referent; More info: http://kubernetes.io/docs/user-guide/identifiers#names' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string required: - kind @@ -8462,6 +9347,7 @@ spec: targetCPUUtilizationPercentage: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: targetCPUUtilizationPercentage is the target @@ -8470,13 +9356,18 @@ spec: the default autoscaling policy will be used. <<<<<<< HEAD ======= +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) description: target average CPU utilization (represented as a percentage of requested CPU) over all the pods; if not specified the default autoscaling policy will be used. +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) format: int32 type: integer required: @@ -8641,6 +9532,7 @@ spec: items: description: IngressTLS describes the transport layer <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD security associated with an ingress. properties: @@ -8664,6 +9556,14 @@ spec: the TLS certificate. The values in this list must match the name/s used in the tlsSecret. Defaults >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + security associated with an Ingress. + properties: + hosts: + description: Hosts are a list of hosts included + in the TLS certificate. The values in this list + must match the name/s used in the tlsSecret. Defaults +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) to the wildcard host setting for the loadbalancer controller fulfilling this Ingress, if left unspecified. items: @@ -8672,6 +9572,7 @@ spec: x-kubernetes-list-type: atomic secretName: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: secretName is the name of the secret ======= @@ -8680,12 +9581,16 @@ spec: ======= description: secretName is the name of the secret >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: SecretName is the name of the secret +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) used to terminate TLS traffic on port 443. Field is left optional to allow TLS routing based on SNI hostname alone. If the SNI host in a listener conflicts with the "Host" header field used by an IngressRule, the SNI host is used for termination <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD and value of the "Host" header is used for routing. ======= @@ -8694,6 +9599,9 @@ spec: ======= and value of the "Host" header is used for routing. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + and value of the Host header is used for routing. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string type: object type: array @@ -8733,6 +9641,7 @@ spec: items: description: IngressTLS describes the transport layer security <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD associated with an ingress. properties: @@ -8750,6 +9659,12 @@ spec: hosts: description: hosts is a list of hosts included in the >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + associated with an Ingress. + properties: + hosts: + description: Hosts are a list of hosts included in the +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) TLS certificate. The values in this list must match the name/s used in the tlsSecret. Defaults to the wildcard host setting for the loadbalancer controller @@ -8760,6 +9675,7 @@ spec: x-kubernetes-list-type: atomic secretName: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: secretName is the name of the secret used ======= @@ -8768,12 +9684,16 @@ spec: ======= description: secretName is the name of the secret used >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: SecretName is the name of the secret used +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) to terminate TLS traffic on port 443. Field is left optional to allow TLS routing based on SNI hostname alone. If the SNI host in a listener conflicts with the "Host" header field used by an IngressRule, the SNI host is used for termination and value of the <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "Host" header is used for routing. ======= @@ -8782,6 +9702,9 @@ spec: ======= "Host" header is used for routing. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + Host header is used for routing. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string type: object type: array @@ -8813,6 +9736,7 @@ spec: properties: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) claims: @@ -8842,6 +9766,8 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) limits: additionalProperties: anyOf: @@ -8863,6 +9789,7 @@ spec: resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' @@ -8873,6 +9800,9 @@ spec: to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: object type: object route: @@ -8994,6 +9924,7 @@ spec: properties: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) claims: @@ -9023,6 +9954,8 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) limits: additionalProperties: anyOf: @@ -9045,6 +9978,7 @@ spec: a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' ======= @@ -9053,6 +9987,9 @@ spec: ======= Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: object type: object version: @@ -9076,6 +10013,7 @@ spec: properties: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) claims: @@ -9105,6 +10043,8 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) limits: additionalProperties: anyOf: @@ -9127,6 +10067,7 @@ spec: a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' ======= @@ -9135,6 +10076,9 @@ spec: ======= Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: object type: object rootCA: @@ -9159,6 +10103,7 @@ spec: properties: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) claims: @@ -9188,6 +10133,8 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) limits: additionalProperties: anyOf: @@ -9209,6 +10156,7 @@ spec: resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' @@ -9219,6 +10167,9 @@ spec: to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: object type: object verifyTLS: @@ -9538,6 +10489,7 @@ spec: properties: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) claims: @@ -9567,6 +10519,8 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) limits: additionalProperties: anyOf: @@ -9588,9 +10542,13 @@ spec: resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' +======= + to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: object type: object scmProviders: @@ -9663,6 +10621,7 @@ spec: items: description: IngressTLS describes the transport layer <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD security associated with an ingress. properties: @@ -9686,14 +10645,23 @@ spec: the TLS certificate. The values in this list must match the name/s used in the tlsSecret. Defaults >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) - to the wildcard host setting for the loadbalancer - controller fulfilling this Ingress, if left unspecified. - items: - type: string - type: array - x-kubernetes-list-type: atomic +======= + security associated with an Ingress. + properties: + hosts: + description: Hosts are a list of hosts included + in the TLS certificate. The values in this list + must match the name/s used in the tlsSecret. Defaults +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) + to the wildcard host setting for the loadbalancer + controller fulfilling this Ingress, if left unspecified. + items: + type: string + type: array + x-kubernetes-list-type: atomic secretName: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: secretName is the name of the secret ======= @@ -9702,12 +10670,16 @@ spec: ======= description: secretName is the name of the secret >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: SecretName is the name of the secret +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) used to terminate TLS traffic on port 443. Field is left optional to allow TLS routing based on SNI hostname alone. If the SNI host in a listener conflicts with the "Host" header field used by an IngressRule, the SNI host is used for termination <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD and value of the "Host" header is used for routing. ======= @@ -9716,6 +10688,9 @@ spec: ======= and value of the "Host" header is used for routing. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + and value of the Host header is used for routing. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string type: object type: array @@ -9975,6 +10950,7 @@ spec: properties: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) claims: @@ -10004,6 +10980,8 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) limits: additionalProperties: anyOf: @@ -10025,6 +11003,7 @@ spec: resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' @@ -10035,6 +11014,9 @@ spec: to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: object type: object sharding: @@ -10140,6 +11122,7 @@ spec: items: description: IngressTLS describes the transport layer security <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD associated with an ingress. properties: @@ -10157,6 +11140,12 @@ spec: hosts: description: hosts is a list of hosts included in the >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + associated with an Ingress. + properties: + hosts: + description: Hosts are a list of hosts included in the +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) TLS certificate. The values in this list must match the name/s used in the tlsSecret. Defaults to the wildcard host setting for the loadbalancer controller @@ -10167,6 +11156,7 @@ spec: x-kubernetes-list-type: atomic secretName: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: secretName is the name of the secret used ======= @@ -10175,12 +11165,16 @@ spec: ======= description: secretName is the name of the secret used >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: SecretName is the name of the secret used +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) to terminate TLS traffic on port 443. Field is left optional to allow TLS routing based on SNI hostname alone. If the SNI host in a listener conflicts with the "Host" header field used by an IngressRule, the SNI host is used for termination and value of the <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "Host" header is used for routing. ======= @@ -10189,6 +11183,9 @@ spec: ======= "Host" header is used for routing. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + Host header is used for routing. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string type: object type: array @@ -10201,6 +11198,7 @@ spec: properties: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) claims: @@ -10230,6 +11228,8 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) limits: additionalProperties: anyOf: @@ -10251,6 +11251,7 @@ spec: resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' @@ -10261,6 +11262,9 @@ spec: to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: object type: object route: @@ -10366,6 +11370,7 @@ spec: properties: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) claims: @@ -10395,6 +11400,8 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) limits: additionalProperties: anyOf: @@ -10416,6 +11423,7 @@ spec: resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' @@ -10426,6 +11434,9 @@ spec: to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: object type: object required: @@ -10696,6 +11707,7 @@ spec: properties: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) claims: @@ -10725,6 +11737,8 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) limits: additionalProperties: anyOf: @@ -10746,6 +11760,7 @@ spec: resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' @@ -10756,6 +11771,9 @@ spec: to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: object type: object version: @@ -10808,6 +11826,7 @@ spec: items: description: IngressTLS describes the transport layer security <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD associated with an ingress. properties: @@ -10825,6 +11844,12 @@ spec: hosts: description: hosts is a list of hosts included in the >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + associated with an Ingress. + properties: + hosts: + description: Hosts are a list of hosts included in the +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) TLS certificate. The values in this list must match the name/s used in the tlsSecret. Defaults to the wildcard host setting for the loadbalancer controller @@ -10835,6 +11860,7 @@ spec: x-kubernetes-list-type: atomic secretName: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: secretName is the name of the secret used ======= @@ -10843,12 +11869,16 @@ spec: ======= description: secretName is the name of the secret used >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: SecretName is the name of the secret used +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) to terminate TLS traffic on port 443. Field is left optional to allow TLS routing based on SNI hostname alone. If the SNI host in a listener conflicts with the "Host" header field used by an IngressRule, the SNI host is used for termination and value of the <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "Host" header is used for routing. ======= @@ -10857,6 +11887,9 @@ spec: ======= "Host" header is used for routing. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + Host header is used for routing. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string type: object type: array @@ -11000,6 +12033,7 @@ spec: properties: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) claims: @@ -11029,6 +12063,8 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) limits: additionalProperties: anyOf: @@ -11050,6 +12086,7 @@ spec: resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' @@ -11060,6 +12097,9 @@ spec: to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: object type: object version: @@ -11216,6 +12256,7 @@ spec: args: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: 'Arguments to the entrypoint. The container @@ -11225,14 +12266,19 @@ spec: in the input string will be unchanged. Double $$ are reduced <<<<<<< HEAD ======= +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) description: 'Arguments to the entrypoint. The docker image''s CMD is used if this is not provided. Variable references $(VAR_NAME) are expanded using the container''s environment. If a variable cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) 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, @@ -11244,6 +12290,7 @@ spec: command: description: 'Entrypoint array. Not executed within a shell. <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD The container image''s ENTRYPOINT is used if this is not ======= @@ -11252,6 +12299,9 @@ spec: ======= The container image''s ENTRYPOINT is used if this is not >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + The docker image''s ENTRYPOINT is used if this is not +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) provided. Variable references $(VAR_NAME) are expanded using the container''s environment. If a variable cannot be resolved, the reference in the input string will be @@ -11428,6 +12478,7 @@ spec: type: array image: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'Container image name. More info: https://kubernetes.io/docs/concepts/containers/images ======= @@ -11436,6 +12487,9 @@ spec: ======= description: 'Container image name. More info: https://kubernetes.io/docs/concepts/containers/images >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets.' @@ -11492,6 +12546,7 @@ spec: name: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: The header field name. This @@ -11504,6 +12559,9 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: The header field name +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string value: description: The header field value @@ -11604,6 +12662,7 @@ spec: name: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: The header field name. This @@ -11616,6 +12675,9 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: The header field name +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string value: description: The header field value @@ -11698,6 +12760,7 @@ spec: grpc: description: GRPC specifies an action involving a GRPC <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD port. ======= @@ -11707,6 +12770,10 @@ spec: ======= port. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + port. This is an alpha field and requires enabling + GRPCContainerProbe feature gate. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: port: description: Port number of the gRPC service. Number @@ -11739,6 +12806,7 @@ spec: properties: name: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: The header field name. This will be canonicalized upon output, so case-variant @@ -11751,6 +12819,9 @@ spec: be canonicalized upon output, so case-variant names will be understood as the same header. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: The header field name +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string value: description: The header field value @@ -11849,6 +12920,7 @@ spec: description: List of ports to expose from the container. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) Not specifying a port here DOES NOT prevent that port @@ -11860,6 +12932,8 @@ spec: Cannot be updated. <<<<<<< HEAD ======= +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) Exposing a port here gives the system additional information about the network connections a container uses, but is primarily informational. Not specifying a port here DOES @@ -11867,9 +12941,12 @@ spec: is listening on the default "0.0.0.0" address inside a container will be accessible from the network. Cannot be updated. +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) items: description: ContainerPort represents a network port in a single container. @@ -11942,6 +13019,7 @@ spec: grpc: description: GRPC specifies an action involving a GRPC <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD port. ======= @@ -11951,6 +13029,10 @@ spec: ======= port. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + port. This is an alpha field and requires enabling + GRPCContainerProbe feature gate. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: port: description: Port number of the gRPC service. Number @@ -11983,6 +13065,7 @@ spec: properties: name: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: The header field name. This will be canonicalized upon output, so case-variant @@ -11995,6 +13078,9 @@ spec: be canonicalized upon output, so case-variant names will be understood as the same header. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: The header field name +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string value: description: The header field value @@ -12086,6 +13172,7 @@ spec: type: object <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) resizePolicy: @@ -12114,12 +13201,15 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) resources: description: 'Compute Resources required by this container. Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' properties: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) claims: @@ -12150,6 +13240,8 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) limits: additionalProperties: anyOf: @@ -12172,6 +13264,7 @@ spec: for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' type: object @@ -12228,6 +13321,11 @@ spec: successfully completed.' type: string >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' + type: object + type: object +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) securityContext: description: 'SecurityContext defines the security options the container should be run with. If set, the fields of @@ -12353,6 +13451,7 @@ spec: to work. Must be a descending path, relative to the kubelet's configured seccomp profile location. <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Must be set if type is "Localhost". Must NOT be set for any other type. @@ -12363,6 +13462,9 @@ spec: Must be set if type is "Localhost". Must NOT be set for any other type. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + Must only be set if type is "Localhost". +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string type: description: "type indicates which kind of seccomp @@ -12397,6 +13499,7 @@ spec: description: HostProcess determines if a container <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) should be run as a 'Host Process' container. All @@ -12406,6 +13509,8 @@ spec: containers). In addition, if HostProcess is true <<<<<<< HEAD ======= +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) should be run as a 'Host Process' container. This field is alpha-level and will only be honored by components that enable the WindowsHostProcessContainers @@ -12415,9 +13520,12 @@ spec: effective HostProcess value (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers). In addition, if HostProcess is true +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) then HostNetwork must also be set to true. type: boolean runAsUserName: @@ -12467,6 +13575,7 @@ spec: grpc: description: GRPC specifies an action involving a GRPC <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD port. ======= @@ -12476,6 +13585,10 @@ spec: ======= port. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + port. This is an alpha field and requires enabling + GRPCContainerProbe feature gate. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: port: description: Port number of the gRPC service. Number @@ -12508,6 +13621,7 @@ spec: properties: name: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: The header field name. This will be canonicalized upon output, so case-variant @@ -12520,6 +13634,9 @@ spec: be canonicalized upon output, so case-variant names will be understood as the same header. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: The header field name +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string value: description: The header field value @@ -12754,6 +13871,7 @@ spec: properties: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) claims: @@ -12783,6 +13901,8 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) limits: additionalProperties: anyOf: @@ -12804,6 +13924,7 @@ spec: resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' @@ -12814,6 +13935,9 @@ spec: to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: object type: object serviceaccount: @@ -12830,6 +13954,7 @@ spec: args: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: 'Arguments to the entrypoint. The container @@ -12839,14 +13964,19 @@ spec: in the input string will be unchanged. Double $$ are reduced <<<<<<< HEAD ======= +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) description: 'Arguments to the entrypoint. The docker image''s CMD is used if this is not provided. Variable references $(VAR_NAME) are expanded using the container''s environment. If a variable cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) 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, @@ -12858,6 +13988,7 @@ spec: command: description: 'Entrypoint array. Not executed within a shell. <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD The container image''s ENTRYPOINT is used if this is not ======= @@ -12866,6 +13997,9 @@ spec: ======= The container image''s ENTRYPOINT is used if this is not >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + The docker image''s ENTRYPOINT is used if this is not +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) provided. Variable references $(VAR_NAME) are expanded using the container''s environment. If a variable cannot be resolved, the reference in the input string will be @@ -13042,6 +14176,7 @@ spec: type: array image: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'Container image name. More info: https://kubernetes.io/docs/concepts/containers/images ======= @@ -13050,6 +14185,9 @@ spec: ======= description: 'Container image name. More info: https://kubernetes.io/docs/concepts/containers/images >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets.' @@ -13106,6 +14244,7 @@ spec: name: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: The header field name. This @@ -13118,6 +14257,9 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: The header field name +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string value: description: The header field value @@ -13218,6 +14360,7 @@ spec: name: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: The header field name. This @@ -13230,6 +14373,9 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: The header field name +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string value: description: The header field value @@ -13312,6 +14458,7 @@ spec: grpc: description: GRPC specifies an action involving a GRPC <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD port. ======= @@ -13321,6 +14468,10 @@ spec: ======= port. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + port. This is an alpha field and requires enabling + GRPCContainerProbe feature gate. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: port: description: Port number of the gRPC service. Number @@ -13353,6 +14504,7 @@ spec: properties: name: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: The header field name. This will be canonicalized upon output, so case-variant @@ -13365,6 +14517,9 @@ spec: be canonicalized upon output, so case-variant names will be understood as the same header. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: The header field name +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string value: description: The header field value @@ -13463,6 +14618,7 @@ spec: description: List of ports to expose from the container. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) Not specifying a port here DOES NOT prevent that port @@ -13474,6 +14630,8 @@ spec: Cannot be updated. <<<<<<< HEAD ======= +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) Exposing a port here gives the system additional information about the network connections a container uses, but is primarily informational. Not specifying a port here DOES @@ -13481,9 +14639,12 @@ spec: is listening on the default "0.0.0.0" address inside a container will be accessible from the network. Cannot be updated. +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) items: description: ContainerPort represents a network port in a single container. @@ -13556,6 +14717,7 @@ spec: grpc: description: GRPC specifies an action involving a GRPC <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD port. ======= @@ -13565,6 +14727,10 @@ spec: ======= port. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + port. This is an alpha field and requires enabling + GRPCContainerProbe feature gate. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: port: description: Port number of the gRPC service. Number @@ -13597,6 +14763,7 @@ spec: properties: name: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: The header field name. This will be canonicalized upon output, so case-variant @@ -13609,6 +14776,9 @@ spec: be canonicalized upon output, so case-variant names will be understood as the same header. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: The header field name +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string value: description: The header field value @@ -13700,6 +14870,7 @@ spec: type: object <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) resizePolicy: @@ -13728,12 +14899,15 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) resources: description: 'Compute Resources required by this container. Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' properties: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) claims: @@ -13764,6 +14938,8 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) limits: additionalProperties: anyOf: @@ -13786,6 +14962,7 @@ spec: for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' type: object @@ -13842,6 +15019,11 @@ spec: successfully completed.' type: string >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' + type: object + type: object +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) securityContext: description: 'SecurityContext defines the security options the container should be run with. If set, the fields of @@ -13967,6 +15149,7 @@ spec: to work. Must be a descending path, relative to the kubelet's configured seccomp profile location. <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Must be set if type is "Localhost". Must NOT be set for any other type. @@ -13977,6 +15160,9 @@ spec: Must be set if type is "Localhost". Must NOT be set for any other type. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + Must only be set if type is "Localhost". +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string type: description: "type indicates which kind of seccomp @@ -14011,6 +15197,7 @@ spec: description: HostProcess determines if a container <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) should be run as a 'Host Process' container. All @@ -14020,6 +15207,8 @@ spec: containers). In addition, if HostProcess is true <<<<<<< HEAD ======= +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) should be run as a 'Host Process' container. This field is alpha-level and will only be honored by components that enable the WindowsHostProcessContainers @@ -14029,9 +15218,12 @@ spec: effective HostProcess value (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers). In addition, if HostProcess is true +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) then HostNetwork must also be set to true. type: boolean runAsUserName: @@ -14081,6 +15273,7 @@ spec: grpc: description: GRPC specifies an action involving a GRPC <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD port. ======= @@ -14090,6 +15283,10 @@ spec: ======= port. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + port. This is an alpha field and requires enabling + GRPCContainerProbe feature gate. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: port: description: Port number of the gRPC service. Number @@ -14122,6 +15319,7 @@ spec: properties: name: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: The header field name. This will be canonicalized upon output, so case-variant @@ -14134,6 +15332,9 @@ spec: be canonicalized upon output, so case-variant names will be understood as the same header. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: The header field name +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string value: description: The header field value @@ -14395,6 +15596,7 @@ spec: properties: awsElasticBlockStore: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'awsElasticBlockStore represents an AWS Disk ======= @@ -14403,11 +15605,15 @@ spec: ======= description: 'awsElasticBlockStore represents an AWS Disk >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'AWSElasticBlockStore represents an AWS Disk +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) resource that is attached to a kubelet''s host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' properties: fsType: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'fsType is the filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem @@ -14422,6 +15628,11 @@ spec: that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Filesystem type of the volume that you + want to mount. Tip: Ensure that the filesystem type + is supported by the host operating system. Examples: +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore TODO: how do we prevent errors in the filesystem from @@ -14430,6 +15641,7 @@ spec: partition: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: 'partition is the partition in the volume @@ -14439,13 +15651,23 @@ spec: partition for /dev/sda is "0" (or you can leave the property empty).' <<<<<<< HEAD +======= + description: 'The partition in the volume that you want + to mount. If omitted, the default is to mount by volume + name. Examples: For volume /dev/sda1, you specify + the partition as "1". Similarly, the volume partition + for /dev/sda is "0" (or you can leave the property + empty).' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) format: int32 type: integer readOnly: - description: 'readOnly value true will force the readOnly - setting in VolumeMounts. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' + description: 'Specify "true" to force and set the ReadOnly + property in VolumeMounts to "true". If omitted, the + default is "false". More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' type: boolean volumeID: +<<<<<<< HEAD description: 'volumeID is unique ID of the persistent disk resource in AWS (Amazon EBS volume). More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' @@ -14474,42 +15696,49 @@ spec: disk resource in AWS (Amazon EBS volume). More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Unique ID of the persistent disk resource + in AWS (Amazon EBS volume). More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string required: - volumeID type: object azureDisk: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: azureDisk represents an Azure Data Disk mount +======= + description: AzureDisk represents an Azure Data Disk mount +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) on the host and bind mount to the pod. properties: cachingMode: - description: 'cachingMode is the Host Caching mode: - None, Read Only, Read Write.' + description: 'Host Caching mode: None, Read Only, Read + Write.' type: string diskName: - description: diskName is the Name of the data disk in - the blob storage + description: The Name of the data disk in the blob storage type: string diskURI: - description: diskURI is the URI of data disk in the - blob storage + description: The URI the data disk in the blob storage type: string fsType: - description: fsType is Filesystem type to mount. Must - be a filesystem type supported by the host operating - system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred - to be "ext4" if unspecified. + description: Filesystem type to mount. Must be a filesystem + type supported by the host operating system. Ex. "ext4", + "xfs", "ntfs". Implicitly inferred to be "ext4" if + unspecified. type: string kind: - description: 'kind expected values are Shared: multiple - blob disks per storage account Dedicated: single - blob disk per storage account Managed: azure managed - data disk (only in managed availability set). defaults + description: 'Expected values Shared: multiple blob + disks per storage account Dedicated: single blob + disk per storage account Managed: azure managed data + disk (only in managed availability set). defaults to shared' type: string readOnly: +<<<<<<< HEAD description: readOnly Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. ======= @@ -14553,6 +15782,10 @@ spec: description: readOnly Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Defaults to false (read/write). ReadOnly + here will force the ReadOnly setting in VolumeMounts. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: boolean required: - diskName @@ -14560,19 +15793,24 @@ spec: type: object azureFile: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: azureFile represents an Azure File Service +======= + description: AzureFile represents an Azure File Service +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) mount on the host and bind mount to the pod. properties: readOnly: - description: readOnly defaults to false (read/write). - ReadOnly here will force the ReadOnly setting in VolumeMounts. + description: Defaults to false (read/write). ReadOnly + here will force the ReadOnly setting in VolumeMounts. type: boolean secretName: - description: secretName is the name of secret that - contains Azure Storage Account Name and Key + description: the name of secret that contains Azure + Storage Account Name and Key type: string shareName: +<<<<<<< HEAD description: shareName is the azure share Name ======= description: AzureFile represents an Azure File Service @@ -14596,6 +15834,9 @@ spec: ======= description: shareName is the azure share Name >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Share Name +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string required: - secretName @@ -14603,6 +15844,7 @@ spec: type: object cephfs: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: cephFS represents a Ceph FS mount on the host that shares a pod's lifetime @@ -14626,26 +15868,40 @@ spec: description: 'monitors is Required: Monitors is a collection of Ceph monitors More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: CephFS represents a Ceph FS mount on the host + that shares a pod's lifetime + properties: + monitors: + description: 'Required: Monitors is a collection of + Ceph monitors More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) items: type: string type: array path: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'path is Optional: Used as the mounted root, rather than the full Ceph tree, default is /' - type: string +======= + description: 'Optional: Used as the mounted root, rather + than the full Ceph tree, default is /' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) + type: string readOnly: - description: 'readOnly is Optional: Defaults to false - (read/write). ReadOnly here will force the ReadOnly - setting in VolumeMounts. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' + description: 'Optional: Defaults to false (read/write). + ReadOnly here will force the ReadOnly setting in VolumeMounts. + More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' type: boolean secretFile: - description: 'secretFile is Optional: SecretFile is - the path to key ring for User, default is /etc/ceph/user.secret - More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' + description: 'Optional: SecretFile is the path to key + ring for User, default is /etc/ceph/user.secret More + info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' type: string secretRef: +<<<<<<< HEAD description: 'secretRef is Optional: SecretRef is reference to the authentication secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' @@ -14678,6 +15934,11 @@ spec: to the authentication secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Optional: SecretRef is reference to the + authentication secret for User, default is empty. + More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: name: description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names @@ -14687,6 +15948,7 @@ spec: type: object user: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'user is optional: User is the rados user name, default is admin More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' @@ -14698,23 +15960,32 @@ spec: description: 'user is optional: User is the rados user name, default is admin More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Optional: User is the rados user name, + default is admin More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string required: - monitors type: object cinder: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'cinder represents a cinder volume attached +======= + description: 'Cinder represents a cinder volume attached +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) and mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' properties: fsType: - description: 'fsType is the filesystem type to mount. - Must be a filesystem type supported by the host operating - system. Examples: "ext4", "xfs", "ntfs". Implicitly - inferred to be "ext4" if unspecified. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' + description: 'Filesystem type to mount. Must be a filesystem + type supported by the host operating system. Examples: + "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" + if unspecified. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' type: string readOnly: +<<<<<<< HEAD description: 'readOnly defaults to false (read/write). ======= description: 'Cinder represents a cinder volume attached @@ -14736,11 +16007,15 @@ spec: ======= description: 'readOnly defaults to false (read/write). >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Optional: Defaults to false (read/write). +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' type: boolean secretRef: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'secretRef is optional: points to a secret object containing parameters used to connect to OpenStack.' @@ -14752,6 +16027,10 @@ spec: description: 'secretRef is optional: points to a secret object containing parameters used to connect to OpenStack.' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Optional: points to a secret object containing + parameters used to connect to OpenStack.' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: name: description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names @@ -14761,6 +16040,7 @@ spec: type: object volumeID: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'volumeID used to identify the volume in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' @@ -14772,30 +16052,38 @@ spec: description: 'volumeID used to identify the volume in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'volume id used to identify the volume + in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string required: - volumeID type: object configMap: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: configMap represents a configMap that should +======= + description: ConfigMap represents a configMap that should +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) populate this volume properties: defaultMode: - description: 'defaultMode is optional: mode bits used - to set permissions on created files by default. Must - be an octal value between 0000 and 0777 or a decimal - value between 0 and 511. YAML accepts both octal and - decimal values, JSON requires decimal values for mode - bits. Defaults to 0644. Directories within the path - are not affected by this setting. This might be in - conflict with other options that affect the file mode, - like fsGroup, and the result can be other mode bits - set.' + description: 'Optional: mode bits used to set permissions + on created files by default. Must be an octal value + between 0000 and 0777 or a decimal value between 0 + and 511. YAML accepts both octal and decimal values, + JSON requires decimal values for mode bits. Defaults + to 0644. Directories within the path are not affected + by this setting. This might be in conflict with other + options that affect the file mode, like fsGroup, and + the result can be other mode bits set.' format: int32 type: integer items: +<<<<<<< HEAD description: items if unspecified, each key-value pair in the Data field of the referenced ConfigMap will be projected into the volume as a file whose name @@ -14826,6 +16114,8 @@ spec: type: integer items: <<<<<<< HEAD +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) description: If unspecified, each key-value pair in the Data field of the referenced ConfigMap will be projected into the volume as a file whose name is @@ -14834,6 +16124,7 @@ spec: and unlisted keys will not be present. If a key is specified which is not present in the ConfigMap, the volume setup will error unless it is marked optional. +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= description: items if unspecified, each key-value pair @@ -14845,6 +16136,8 @@ spec: key is specified which is not present in the ConfigMap, the volume setup will error unless it is marked optional. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) Paths must be relative and may not contain the '..' path or start with '..'. items: @@ -14853,23 +16146,28 @@ spec: properties: key: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: key is the key to project. +======= + description: The key to project. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string mode: - description: 'mode is Optional: mode bits used - to set permissions on this file. Must be an - octal value between 0000 and 0777 or a decimal - value between 0 and 511. YAML accepts both octal - and decimal values, JSON requires decimal values - for mode bits. If not specified, the volume - defaultMode will be used. This might be in conflict - with other options that affect the file mode, - like fsGroup, and the result can be other mode - bits set.' + description: 'Optional: mode bits used to set + permissions on this file. Must be an octal value + between 0000 and 0777 or a decimal value between + 0 and 511. YAML accepts both octal and decimal + values, JSON requires decimal values for mode + bits. If not specified, the volume defaultMode + will be used. This might be in conflict with + other options that affect the file mode, like + fsGroup, and the result can be other mode bits + set.' format: int32 type: integer path: +<<<<<<< HEAD description: path is the relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. @@ -14895,10 +16193,13 @@ spec: type: integer path: <<<<<<< HEAD +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) description: The relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. May not start with the string '..'. +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= description: path is the relative path of the @@ -14906,6 +16207,8 @@ spec: path. May not contain the path element '..'. May not start with the string '..'. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string required: - key @@ -14918,6 +16221,7 @@ spec: type: string optional: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: optional specify whether the ConfigMap or its keys must be defined @@ -14941,11 +16245,20 @@ spec: csi: description: csi (Container Storage Interface) represents >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Specify whether the ConfigMap or its keys + must be defined + type: boolean + type: object + csi: + description: CSI (Container Storage Interface) represents +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) ephemeral storage that is handled by certain external CSI drivers (Beta feature). properties: driver: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: driver is the name of the CSI driver that ======= @@ -14954,12 +16267,16 @@ spec: ======= description: driver is the name of the CSI driver that >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Driver is the name of the CSI driver that +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) handles this volume. Consult with your admin for the correct name as registered in the cluster. type: string fsType: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: fsType to mount. Ex. "ext4", "xfs", "ntfs". @@ -14984,6 +16301,15 @@ spec: nodePublishSecretRef: description: nodePublishSecretRef is a reference to >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Filesystem type to mount. Ex. "ext4", "xfs", + "ntfs". If not provided, the empty value is passed + to the associated CSI driver which will determine + the default filesystem to apply. + type: string + nodePublishSecretRef: + description: NodePublishSecretRef is a reference to +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) the secret object containing sensitive information to pass to the CSI driver to complete the CSI NodePublishVolume and NodeUnpublishVolume calls. This field is optional, @@ -14999,6 +16325,7 @@ spec: type: object readOnly: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: readOnly specifies a read-only configuration for the volume. Defaults to false (read/write). @@ -15010,11 +16337,16 @@ spec: description: readOnly specifies a read-only configuration for the volume. Defaults to false (read/write). >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Specifies a read-only configuration for + the volume. Defaults to false (read/write). +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: boolean volumeAttributes: additionalProperties: type: string <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: volumeAttributes stores driver-specific ======= @@ -15023,6 +16355,9 @@ spec: ======= description: volumeAttributes stores driver-specific >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: VolumeAttributes stores driver-specific +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties that are passed to the CSI driver. Consult your driver's documentation for supported values. type: object @@ -15031,6 +16366,7 @@ spec: type: object downwardAPI: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: downwardAPI represents downward API about the ======= @@ -15039,6 +16375,9 @@ spec: ======= description: downwardAPI represents downward API about the >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: DownwardAPI represents downward API about the +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) pod that should populate this volume properties: defaultMode: @@ -15129,6 +16468,7 @@ spec: type: object emptyDir: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'emptyDir represents a temporary directory that shares a pod''s lifetime. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' @@ -15144,10 +16484,17 @@ spec: that shares a pod''s lifetime. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' properties: medium: +======= + description: 'EmptyDir represents a temporary directory + that shares a pod''s lifetime. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' + properties: + medium: +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) description: 'What type of storage medium should back this directory. The default is "" which means to use the node''s default medium. Must be an empty string (default) or Memory. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= description: 'emptyDir represents a temporary directory @@ -15160,6 +16507,8 @@ spec: Must be an empty string (default) or Memory. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string sizeLimit: anyOf: @@ -15167,6 +16516,7 @@ spec: - type: string <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: 'sizeLimit is the total amount of local @@ -15179,6 +16529,8 @@ spec: More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir' <<<<<<< HEAD ======= +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) description: 'Total amount of local storage required for this EmptyDir volume. The size limit is also applicable for memory medium. The maximum usage on memory medium @@ -15186,14 +16538,18 @@ spec: specified here and the sum of memory limits of all containers in a pod. The default is nil which means that the limit is undefined. More info: http://kubernetes.io/docs/user-guide/volumes#emptydir' +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true type: object ephemeral: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: "ephemeral represents a volume that is handled ======= @@ -15202,6 +16558,9 @@ spec: ======= description: "ephemeral represents a volume that is handled >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: "Ephemeral represents a volume that is handled +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) by a cluster storage driver. The volume's lifecycle is tied to the pod that defines it - it will be created before the pod starts, and deleted when the pod is removed. \n @@ -15258,6 +16617,7 @@ spec: properties: accessModes: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'accessModes contains the desired ======= @@ -15266,6 +16626,9 @@ spec: ======= description: 'accessModes contains the desired >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'AccessModes contains the desired +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) access modes the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1' items: @@ -15274,6 +16637,7 @@ spec: dataSource: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: 'dataSource field can be used to @@ -15299,10 +16663,20 @@ spec: the provisioner or an external controller can support the specified data source, it will create a new volume based on the contents +======= + description: 'This field can be used to specify + either: * An existing VolumeSnapshot object + (snapshot.storage.k8s.io/VolumeSnapshot) * + An existing PVC (PersistentVolumeClaim) If + the provisioner or an external controller + can support the specified data source, it + will create a new volume based on the contents +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) of the specified data source. If the AnyVolumeDataSource feature gate is enabled, this field will always have the same contents as the DataSourceRef field.' +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= can support the specified data source, it @@ -15315,6 +16689,8 @@ spec: If the namespace is specified, then dataSourceRef will not be copied to dataSource.' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: apiGroup: description: APIGroup is the group for the @@ -15338,6 +16714,7 @@ spec: dataSourceRef: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: 'dataSourceRef specifies the object @@ -15351,23 +16728,32 @@ spec: or dynamic provisioner. This field will replace the functionality of the dataSource field <<<<<<< HEAD +======= + description: 'Specifies the object from which + to populate the volume with data, if a non-empty + volume is desired. This may be any local object + from a non-empty API group (non core object) + or a PersistentVolumeClaim object. When this + field is specified, volume binding will only + succeed if the type of the specified object + matches some installed volume populator or + dynamic provisioner. This field will replace + the functionality of the DataSource field +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) and as such if both fields are non-empty, they must have the same value. For backwards - compatibility, when namespace isn''t specified - in dataSourceRef, both fields (dataSource - and dataSourceRef) will be set to the same - value automatically if one of them is empty - and the other is non-empty. When namespace - is specified in dataSourceRef, dataSource - isn''t set to the same value and must be empty. - There are three important differences between - dataSource and dataSourceRef: * While dataSource - only allows two specific types of objects, - dataSourceRef allows any non-core object, - as well as PersistentVolumeClaim objects. - * While dataSource ignores disallowed values - (dropping them), dataSourceRef preserves + compatibility, both fields (DataSource and + DataSourceRef) will be set to the same value + automatically if one of them is empty and + the other is non-empty. There are two important + differences between DataSource and DataSourceRef: + * While DataSource only allows two specific + types of objects, DataSourceRef allows any + non-core object, as well as PersistentVolumeClaim + objects. * While DataSource ignores disallowed + values (dropping them), DataSourceRef preserves all values, and generates an error if a disallowed +<<<<<<< HEAD value is specified. * While dataSource only allows local objects, dataSourceRef allows objects in any namespaces. (Beta) Using @@ -15421,6 +16807,11 @@ spec: the CrossNamespaceVolumeDataSource feature gate to be enabled.' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + value is specified. (Alpha) Using this field + requires the AnyVolumeDataSource feature gate + to be enabled.' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: apiGroup: description: APIGroup is the group for the @@ -15439,6 +16830,7 @@ spec: type: string <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) namespace: @@ -15457,12 +16849,15 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) required: - kind - name type: object resources: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'resources represents the minimum ======= @@ -15471,6 +16866,9 @@ spec: ======= description: 'resources represents the minimum >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Resources represents the minimum +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) resources the volume should have. If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements that are lower than @@ -15480,6 +16878,7 @@ spec: properties: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) claims: @@ -15513,6 +16912,8 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) limits: additionalProperties: anyOf: @@ -15537,6 +16938,7 @@ spec: it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' @@ -15562,6 +16964,14 @@ spec: description: selector is a label query over volumes to consider for binding. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' + type: object + type: object + selector: + description: A label query over volumes to consider + for binding. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: matchExpressions: description: matchExpressions is a list @@ -15613,6 +17023,7 @@ spec: type: object storageClassName: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'storageClassName is the name of the StorageClass required by the claim. More @@ -15626,6 +17037,10 @@ spec: the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Name of the StorageClass required + by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string volumeMode: description: volumeMode defines what type of @@ -15635,6 +17050,7 @@ spec: type: string volumeName: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: volumeName is the binding reference ======= @@ -15643,6 +17059,9 @@ spec: ======= description: volumeName is the binding reference >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: VolumeName is the binding reference +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) to the PersistentVolume backing this claim. type: string type: object @@ -15652,6 +17071,7 @@ spec: type: object fc: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: fc represents a Fibre Channel resource that ======= @@ -15660,12 +17080,16 @@ spec: ======= description: fc represents a Fibre Channel resource that >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: FC represents a Fibre Channel resource that +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) is attached to a kubelet's host machine and then exposed to the pod. properties: fsType: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: 'fsType is the filesystem type to mount. @@ -15674,17 +17098,24 @@ spec: to be "ext4" if unspecified. TODO: how do we prevent errors in the filesystem from compromising the machine' <<<<<<< HEAD +======= + description: 'Filesystem type to mount. Must be a filesystem + type supported by the host operating system. Ex. "ext4", + "xfs", "ntfs". Implicitly inferred to be "ext4" if + unspecified. TODO: how do we prevent errors in the + filesystem from compromising the machine' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string lun: - description: 'lun is Optional: FC target lun number' + description: 'Optional: FC target lun number' format: int32 type: integer readOnly: - description: 'readOnly is Optional: Defaults to false - (read/write). ReadOnly here will force the ReadOnly - setting in VolumeMounts.' + description: 'Optional: Defaults to false (read/write). + ReadOnly here will force the ReadOnly setting in VolumeMounts.' type: boolean targetWWNs: +<<<<<<< HEAD description: 'targetWWNs is Optional: FC target worldwide names (WWNs)' ======= @@ -15713,11 +17144,15 @@ spec: description: 'targetWWNs is Optional: FC target worldwide names (WWNs)' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Optional: FC target worldwide names (WWNs)' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) items: type: string type: array wwids: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'wwids Optional: FC volume world wide identifiers ======= @@ -15726,6 +17161,9 @@ spec: ======= description: 'wwids Optional: FC volume world wide identifiers >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Optional: FC volume world wide identifiers +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) (wwids) Either wwids or combination of targetWWNs and lun must be set, but not both simultaneously.' items: @@ -15734,15 +17172,20 @@ spec: type: object flexVolume: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: flexVolume represents a generic volume resource +======= + description: FlexVolume represents a generic volume resource +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) that is provisioned/attached using an exec based plugin. properties: driver: - description: driver is the name of the driver to use + description: Driver is the name of the driver to use for this volume. type: string fsType: +<<<<<<< HEAD description: fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". The default filesystem @@ -15760,10 +17203,13 @@ spec: type: string fsType: <<<<<<< HEAD +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) description: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". The default filesystem depends on FlexVolume script. +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= description: fsType is the filesystem type to mount. @@ -15771,21 +17217,27 @@ spec: system. Ex. "ext4", "xfs", "ntfs". The default filesystem depends on FlexVolume script. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string options: additionalProperties: type: string <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'options is Optional: this field holds extra command options if any.' +======= + description: 'Optional: Extra command options if any.' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: object readOnly: - description: 'readOnly is Optional: defaults to false - (read/write). ReadOnly here will force the ReadOnly - setting in VolumeMounts.' + description: 'Optional: Defaults to false (read/write). + ReadOnly here will force the ReadOnly setting in VolumeMounts.' type: boolean secretRef: +<<<<<<< HEAD description: 'secretRef is Optional: secretRef is reference to the secret object containing sensitive information to pass to the plugin scripts. This may be empty if @@ -15806,12 +17258,15 @@ spec: type: boolean secretRef: <<<<<<< HEAD +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) description: 'Optional: SecretRef is reference to the secret object containing sensitive information to pass to the plugin scripts. This may be empty if no secret object is specified. If the secret object contains more than one secret, all secrets are passed to the plugin scripts.' +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= description: 'secretRef is Optional: secretRef is reference @@ -15821,6 +17276,8 @@ spec: contains more than one secret, all secrets are passed to the plugin scripts.' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: name: description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names @@ -15833,6 +17290,7 @@ spec: type: object flocker: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: flocker represents a Flocker volume attached ======= @@ -15841,22 +17299,32 @@ spec: ======= description: flocker represents a Flocker volume attached >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Flocker represents a Flocker volume attached +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) to a kubelet's host machine. This depends on the Flocker control service being running properties: datasetName: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker should be considered as deprecated +======= + description: Name of the dataset stored as metadata + -> name on the dataset for Flocker should be considered + as deprecated +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string datasetUUID: - description: datasetUUID is the UUID of the dataset. - This is unique identifier of a Flocker dataset + description: UUID of the dataset. This is unique identifier + of a Flocker dataset type: string type: object gcePersistentDisk: +<<<<<<< HEAD description: 'gcePersistentDisk represents a GCE Disk resource ======= description: Name of the dataset stored as metadata @@ -15880,11 +17348,15 @@ spec: ======= description: 'gcePersistentDisk represents a GCE Disk resource >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'GCEPersistentDisk represents a GCE Disk resource +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) that is attached to a kubelet''s host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' properties: fsType: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'fsType is filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem @@ -15899,6 +17371,11 @@ spec: that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Filesystem type of the volume that you + want to mount. Tip: Ensure that the filesystem type + is supported by the host operating system. Examples: +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk TODO: how do we prevent errors in the filesystem from @@ -15907,6 +17384,7 @@ spec: partition: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: 'partition is the partition in the volume @@ -15916,14 +17394,22 @@ spec: partition for /dev/sda is "0" (or you can leave the property empty). More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' <<<<<<< HEAD +======= + description: 'The partition in the volume that you want + to mount. If omitted, the default is to mount by volume + name. Examples: For volume /dev/sda1, you specify + the partition as "1". Similarly, the volume partition + for /dev/sda is "0" (or you can leave the property + empty). More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) format: int32 type: integer pdName: - description: 'pdName is unique name of the PD resource - in GCE. Used to identify the disk in GCE. More info: - https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' + description: 'Unique name of the PD resource in GCE. + Used to identify the disk in GCE. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' type: string readOnly: +<<<<<<< HEAD description: 'readOnly here will force the ReadOnly ======= description: 'The partition in the volume that you want @@ -15948,6 +17434,9 @@ spec: ======= description: 'readOnly here will force the ReadOnly >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'ReadOnly here will force the ReadOnly +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) setting in VolumeMounts. Defaults to false. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk' type: boolean @@ -15956,6 +17445,7 @@ spec: type: object gitRepo: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'gitRepo represents a git repository at a particular ======= @@ -15964,6 +17454,9 @@ spec: ======= description: 'gitRepo represents a git repository at a particular >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'GitRepo represents a git repository at a particular +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) revision. DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an EmptyDir into an InitContainer that clones the repo using git, then mount @@ -15971,6 +17464,7 @@ spec: properties: directory: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: directory is the target directory name. Must not contain or start with '..'. If '.' is supplied, @@ -15985,11 +17479,17 @@ spec: Must not contain or start with '..'. If '.' is supplied, the volume directory will be the git repository. Otherwise, >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Target directory name. Must not contain + or start with '..'. If '.' is supplied, the volume + directory will be the git repository. Otherwise, +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) if specified, the volume will contain the git repository in the subdirectory with the given name. type: string repository: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: repository is the URL type: string @@ -16009,25 +17509,36 @@ spec: description: revision is the commit hash for the specified revision. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Repository URL + type: string + revision: + description: Commit hash for the specified revision. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string required: - repository type: object glusterfs: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'glusterfs represents a Glusterfs mount on +======= + description: 'Glusterfs represents a Glusterfs mount on +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) the host that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/glusterfs/README.md' properties: endpoints: - description: 'endpoints is the endpoint name that details - Glusterfs topology. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod' + description: 'EndpointsName is the endpoint name that + details Glusterfs topology. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod' type: string path: - description: 'path is the Glusterfs volume path. More + description: 'Path is the Glusterfs volume path. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod' type: string readOnly: +<<<<<<< HEAD description: 'readOnly here will force the Glusterfs ======= description: 'Glusterfs represents a Glusterfs mount on @@ -16051,6 +17562,9 @@ spec: ======= description: 'readOnly here will force the Glusterfs >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'ReadOnly here will force the Glusterfs +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) volume to be mounted with read-only permissions. Defaults to false. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod' type: boolean @@ -16060,6 +17574,7 @@ spec: type: object hostPath: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'hostPath represents a pre-existing file or ======= @@ -16068,6 +17583,9 @@ spec: ======= description: 'hostPath represents a pre-existing file or >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'HostPath represents a pre-existing file or +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) directory on the host machine that is directly exposed to the container. This is generally used for system agents or other privileged things that are allowed to see the @@ -16079,6 +17597,7 @@ spec: properties: path: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'path of the directory on the host. If ======= @@ -16087,11 +17606,15 @@ spec: ======= description: 'path of the directory on the host. If >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Path of the directory on the host. If +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) the path is a symlink, it will follow the link to the real path. More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath' type: string type: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'type for HostPath Volume Defaults to "" ======= @@ -16100,6 +17623,9 @@ spec: ======= description: 'type for HostPath Volume Defaults to "" >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Type for HostPath Volume Defaults to "" +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath' type: string required: @@ -16107,6 +17633,7 @@ spec: type: object iscsi: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'iscsi represents an ISCSI Disk resource that ======= @@ -16115,20 +17642,27 @@ spec: ======= description: 'iscsi represents an ISCSI Disk resource that >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'ISCSI represents an ISCSI Disk resource that +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) is attached to a kubelet''s host machine and then exposed to the pod. More info: https://examples.k8s.io/volumes/iscsi/README.md' properties: chapAuthDiscovery: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: chapAuthDiscovery defines whether support iSCSI Discovery CHAP authentication +======= + description: whether support iSCSI Discovery CHAP authentication +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: boolean chapAuthSession: - description: chapAuthSession defines whether support - iSCSI Session CHAP authentication + description: whether support iSCSI Session CHAP authentication type: boolean fsType: +<<<<<<< HEAD description: 'fsType is the filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: @@ -16154,6 +17688,11 @@ spec: that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Filesystem type of the volume that you + want to mount. Tip: Ensure that the filesystem type + is supported by the host operating system. Examples: +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#iscsi TODO: how do we prevent errors in the filesystem from @@ -16162,6 +17701,7 @@ spec: initiatorName: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: initiatorName is the custom iSCSI Initiator @@ -16169,19 +17709,26 @@ spec: simultaneously, new iSCSI interface : will be created for the connection. <<<<<<< HEAD +======= + description: Custom iSCSI Initiator Name. If initiatorName + is specified with iscsiInterface simultaneously, new + iSCSI interface : will + be created for the connection. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string iqn: - description: iqn is the target iSCSI Qualified Name. + description: Target iSCSI Qualified Name. type: string iscsiInterface: - description: iscsiInterface is the interface Name that - uses an iSCSI transport. Defaults to 'default' (tcp). + description: iSCSI Interface Name that uses an iSCSI + transport. Defaults to 'default' (tcp). type: string lun: - description: lun represents iSCSI Target Lun number. + description: iSCSI Target Lun number. format: int32 type: integer portals: +<<<<<<< HEAD description: portals is the iSCSI Target Portal List. The portal is either an IP or ip_addr:port if the port is other than default (typically TCP ports 860 @@ -16217,11 +17764,17 @@ spec: port is other than default (typically TCP ports 860 and 3260). >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: iSCSI Target Portal List. The portal is + either an IP or ip_addr:port if the port is other + than default (typically TCP ports 860 and 3260). +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) items: type: string type: array readOnly: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: readOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. @@ -16245,6 +17798,14 @@ spec: description: secretRef is the CHAP Secret for iSCSI target and initiator authentication >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: ReadOnly here will force the ReadOnly setting + in VolumeMounts. Defaults to false. + type: boolean + secretRef: + description: CHAP Secret for iSCSI target and initiator + authentication +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: name: description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names @@ -16255,6 +17816,7 @@ spec: targetPortal: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: targetPortal is iSCSI Target Portal. The @@ -16269,6 +17831,11 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: iSCSI Target Portal. The Portal is either + an IP or ip_addr:port if the port is other than default + (typically TCP ports 860 and 3260). +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string required: - iqn @@ -16277,19 +17844,25 @@ spec: type: object name: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'name of the volume. Must be a DNS_LABEL and unique within the pod. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' +======= + description: 'Volume''s name. Must be a DNS_LABEL and unique + within the pod. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string nfs: - description: 'nfs represents an NFS mount on the host that + description: 'NFS represents an NFS mount on the host that shares a pod''s lifetime More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' properties: path: - description: 'path that is exported by the NFS server. + description: 'Path that is exported by the NFS server. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' type: string readOnly: +<<<<<<< HEAD description: 'readOnly here will force the NFS export ======= description: 'Volume''s name. Must be a DNS_LABEL and unique @@ -16314,11 +17887,15 @@ spec: ======= description: 'readOnly here will force the NFS export >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'ReadOnly here will force the NFS export +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) to be mounted with read-only permissions. Defaults to false. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' type: boolean server: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'server is the hostname or IP address of ======= @@ -16327,6 +17904,9 @@ spec: ======= description: 'server is the hostname or IP address of >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Server is the hostname or IP address of +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) the NFS server. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs' type: string required: @@ -16335,6 +17915,7 @@ spec: type: object persistentVolumeClaim: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'persistentVolumeClaimVolumeSource represents ======= @@ -16343,11 +17924,15 @@ spec: ======= description: 'persistentVolumeClaimVolumeSource represents >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'PersistentVolumeClaimVolumeSource represents +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) a reference to a PersistentVolumeClaim in the same namespace. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' properties: claimName: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'claimName is the name of a PersistentVolumeClaim ======= @@ -16356,11 +17941,15 @@ spec: ======= description: 'claimName is the name of a PersistentVolumeClaim >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'ClaimName is the name of a PersistentVolumeClaim +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) in the same namespace as the pod using this volume. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' type: string readOnly: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: readOnly Will force the ReadOnly setting in VolumeMounts. Default false. @@ -16372,12 +17961,17 @@ spec: description: readOnly Will force the ReadOnly setting in VolumeMounts. Default false. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Will force the ReadOnly setting in VolumeMounts. + Default false. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: boolean required: - claimName type: object photonPersistentDisk: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: photonPersistentDisk represents a PhotonController ======= @@ -16386,12 +17980,16 @@ spec: ======= description: photonPersistentDisk represents a PhotonController >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: PhotonPersistentDisk represents a PhotonController +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) persistent disk attached and mounted on kubelets host machine properties: fsType: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: fsType is the filesystem type to mount. @@ -16419,12 +18017,23 @@ spec: description: pdID is the ID that identifies Photon Controller persistent disk >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Filesystem type to mount. Must be a filesystem + type supported by the host operating system. Ex. "ext4", + "xfs", "ntfs". Implicitly inferred to be "ext4" if + unspecified. + type: string + pdID: + description: ID that identifies Photon Controller persistent + disk +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string required: - pdID type: object portworxVolume: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: portworxVolume represents a portworx volume attached and mounted on kubelets host machine @@ -16445,12 +18054,20 @@ spec: fsType: description: fSType represents the filesystem type to >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: PortworxVolume represents a portworx volume + attached and mounted on kubelets host machine + properties: + fsType: + description: FSType represents the filesystem type to +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) mount Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs". Implicitly inferred to be "ext4" if unspecified. type: string readOnly: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: readOnly defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. @@ -16471,6 +18088,13 @@ spec: volumeID: description: volumeID uniquely identifies a Portworx >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Defaults to false (read/write). ReadOnly + here will force the ReadOnly setting in VolumeMounts. + type: boolean + volumeID: + description: VolumeID uniquely identifies a Portworx +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) volume type: string required: @@ -16478,23 +18102,29 @@ spec: type: object projected: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: projected items for all in one resources secrets, configmaps, and downward API +======= + description: Items for all in one resources secrets, configmaps, + and downward API +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: defaultMode: - description: defaultMode are the mode bits used to set - permissions on created files by default. Must be an - octal value between 0000 and 0777 or a decimal value - between 0 and 511. YAML accepts both octal and decimal - values, JSON requires decimal values for mode bits. - Directories within the path are not affected by this - setting. This might be in conflict with other options - that affect the file mode, like fsGroup, and the result - can be other mode bits set. + description: Mode bits used to set permissions on created + files by default. Must be an octal value between 0000 + and 0777 or a decimal value between 0 and 511. YAML + accepts both octal and decimal values, JSON requires + decimal values for mode bits. Directories within the + path are not affected by this setting. This might + be in conflict with other options that affect the + file mode, like fsGroup, and the result can be other + mode bits set. format: int32 type: integer sources: +<<<<<<< HEAD description: sources is the list of volume projections ======= description: Items for all in one resources secrets, configmaps, @@ -16523,12 +18153,16 @@ spec: ======= description: sources is the list of volume projections >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: list of volume projections +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) items: description: Projection that may be projected along with other supported volume types properties: configMap: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: configMap information about the configMap data to project @@ -16549,6 +18183,13 @@ spec: items: description: items if unspecified, each key-value >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: information about the configMap data + to project + properties: + items: + description: If unspecified, each key-value +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) pair in the Data field of the referenced ConfigMap will be projected into the volume as a file whose name is the key and content @@ -16566,25 +18207,30 @@ spec: properties: key: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: key is the key to project. +======= + description: The key to project. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string mode: - description: 'mode is Optional: mode - bits used to set permissions on this - file. Must be an octal value between - 0000 and 0777 or a decimal value between - 0 and 511. YAML accepts both octal - and decimal values, JSON requires - decimal values for mode bits. If not - specified, the volume defaultMode - will be used. This might be in conflict - with other options that affect the - file mode, like fsGroup, and the result - can be other mode bits set.' + description: 'Optional: mode bits used + to set permissions on this file. Must + be an octal value between 0000 and + 0777 or a decimal value between 0 + and 511. YAML accepts both octal and + decimal values, JSON requires decimal + values for mode bits. If not specified, + the volume defaultMode will be used. + This might be in conflict with other + options that affect the file mode, + like fsGroup, and the result can be + other mode bits set.' format: int32 type: integer path: +<<<<<<< HEAD description: path is the relative path of the file to map the key to. May not be an absolute path. May not contain @@ -16620,6 +18266,11 @@ spec: of the file to map the key to. May not be an absolute path. May not contain >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: The relative path of the + file to map the key to. May not be + an absolute path. May not contain +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) the path element '..'. May not start with the string '..'. type: string @@ -16636,6 +18287,7 @@ spec: type: string optional: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: optional specify whether the ConfigMap or its keys must be defined @@ -16662,6 +18314,15 @@ spec: description: downwardAPI information about the downwardAPI data to project >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Specify whether the ConfigMap + or its keys must be defined + type: boolean + type: object + downwardAPI: + description: information about the downwardAPI + data to project +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) properties: items: description: Items is a list of DownwardAPIVolume @@ -16746,6 +18407,7 @@ spec: type: object secret: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: secret information about the secret data to project @@ -16766,6 +18428,13 @@ spec: items: description: items if unspecified, each key-value >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: information about the secret data + to project + properties: + items: + description: If unspecified, each key-value +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) pair in the Data field of the referenced Secret will be projected into the volume as a file whose name is the key and content @@ -16783,25 +18452,30 @@ spec: properties: key: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: key is the key to project. +======= + description: The key to project. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string mode: - description: 'mode is Optional: mode - bits used to set permissions on this - file. Must be an octal value between - 0000 and 0777 or a decimal value between - 0 and 511. YAML accepts both octal - and decimal values, JSON requires - decimal values for mode bits. If not - specified, the volume defaultMode - will be used. This might be in conflict - with other options that affect the - file mode, like fsGroup, and the result - can be other mode bits set.' + description: 'Optional: mode bits used + to set permissions on this file. Must + be an octal value between 0000 and + 0777 or a decimal value between 0 + and 511. YAML accepts both octal and + decimal values, JSON requires decimal + values for mode bits. If not specified, + the volume defaultMode will be used. + This might be in conflict with other + options that affect the file mode, + like fsGroup, and the result can be + other mode bits set.' format: int32 type: integer path: +<<<<<<< HEAD description: path is the relative path of the file to map the key to. May not be an absolute path. May not contain @@ -16837,6 +18511,11 @@ spec: of the file to map the key to. May not be an absolute path. May not contain >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: The relative path of the + file to map the key to. May not be + an absolute path. May not contain +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) the path element '..'. May not start with the string '..'. type: string @@ -16853,16 +18532,22 @@ spec: type: string optional: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: optional field specify whether the Secret or its key must be defined +======= + description: Specify whether the Secret or + its key must be defined +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: boolean type: object serviceAccountToken: - description: serviceAccountToken is information - about the serviceAccountToken data to project + description: information about the serviceAccountToken + data to project properties: audience: +<<<<<<< HEAD description: audience is the intended audience ======= description: Specify whether the Secret or @@ -16884,6 +18569,9 @@ spec: ======= description: audience is the intended audience >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Audience is the intended audience +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) of the token. A recipient of a token must identify itself with an identifier specified in the audience of the token, and otherwise @@ -16892,6 +18580,7 @@ spec: type: string expirationSeconds: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: expirationSeconds is the requested ======= @@ -16900,6 +18589,9 @@ spec: ======= description: expirationSeconds is the requested >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: ExpirationSeconds is the requested +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) duration of validity of the service account token. As the token approaches expiration, the kubelet volume plugin will proactively @@ -16913,6 +18605,7 @@ spec: type: integer path: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: path is the path relative to ======= @@ -16921,6 +18614,9 @@ spec: ======= description: path is the path relative to >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Path is the path relative to +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) the mount point of the file to project the token into. type: string @@ -16932,15 +18628,20 @@ spec: type: object quobyte: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: quobyte represents a Quobyte mount on the host +======= + description: Quobyte represents a Quobyte mount on the host +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) that shares a pod's lifetime properties: group: - description: group to map volume access to Default is + description: Group to map volume access to Default is no group type: string readOnly: +<<<<<<< HEAD description: readOnly here will force the Quobyte volume ======= description: Quobyte represents a Quobyte mount on the host @@ -16960,11 +18661,15 @@ spec: ======= description: readOnly here will force the Quobyte volume >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: ReadOnly here will force the Quobyte volume +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) to be mounted with read-only permissions. Defaults to false. type: boolean registry: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: registry represents a single or multiple ======= @@ -16973,12 +18678,16 @@ spec: ======= description: registry represents a single or multiple >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Registry represents a single or multiple +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) Quobyte Registry services specified as a string as host:port pair (multiple entries are separated with commas) which acts as the central registry for volumes type: string tenant: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: tenant owning the given Quobyte volume ======= @@ -16987,11 +18696,15 @@ spec: ======= description: tenant owning the given Quobyte volume >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Tenant owning the given Quobyte volume +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) in the Backend Used with dynamically provisioned Quobyte volumes, value is set by the plugin type: string user: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: user to map volume access to Defaults to serivceaccount user @@ -17012,6 +18725,13 @@ spec: volume: description: volume is a string that references an already >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: User to map volume access to Defaults to + serivceaccount user + type: string + volume: + description: Volume is a string that references an already +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) created Quobyte volume by name. type: string required: @@ -17020,6 +18740,7 @@ spec: type: object rbd: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'rbd represents a Rados Block Device mount ======= @@ -17028,11 +18749,15 @@ spec: ======= description: 'rbd represents a Rados Block Device mount >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'RBD represents a Rados Block Device mount +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) on the host that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/rbd/README.md' properties: fsType: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'fsType is the filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem @@ -17047,6 +18772,11 @@ spec: that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Filesystem type of the volume that you + want to mount. Tip: Ensure that the filesystem type + is supported by the host operating system. Examples: +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#rbd TODO: how do we prevent errors in the filesystem from @@ -17054,15 +18784,20 @@ spec: type: string image: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'image is the rados image name. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' +======= + description: 'The rados image name. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string keyring: - description: 'keyring is the path to key ring for RBDUser. + description: 'Keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' type: string monitors: +<<<<<<< HEAD description: 'monitors is a collection of Ceph monitors. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' ======= @@ -17085,11 +18820,16 @@ spec: description: 'monitors is a collection of Ceph monitors. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'A collection of Ceph monitors. More info: + https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) items: type: string type: array pool: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'pool is the rados pool name. Default is rbd. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' @@ -17110,11 +18850,19 @@ spec: readOnly: description: 'readOnly here will force the ReadOnly >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'The rados pool name. Default is rbd. More + info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + type: string + readOnly: + description: 'ReadOnly here will force the ReadOnly +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) setting in VolumeMounts. Defaults to false. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' type: boolean secretRef: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'secretRef is name of the authentication ======= @@ -17123,6 +18871,9 @@ spec: ======= description: 'secretRef is name of the authentication >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'SecretRef is name of the authentication +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) secret for RBDUser. If provided overrides keyring. Default is nil. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' properties: @@ -17134,6 +18885,7 @@ spec: type: object user: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'user is the rados user name. Default is admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' @@ -17145,6 +18897,10 @@ spec: description: 'user is the rados user name. Default is admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'The rados user name. Default is admin. + More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string required: - image @@ -17152,28 +18908,32 @@ spec: type: object scaleIO: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: scaleIO represents a ScaleIO persistent volume +======= + description: ScaleIO represents a ScaleIO persistent volume +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) attached and mounted on Kubernetes nodes. properties: fsType: - description: fsType is the filesystem type to mount. - Must be a filesystem type supported by the host operating - system. Ex. "ext4", "xfs", "ntfs". Default is "xfs". + description: Filesystem type to mount. Must be a filesystem + type supported by the host operating system. Ex. "ext4", + "xfs", "ntfs". Default is "xfs". type: string gateway: - description: gateway is the host address of the ScaleIO - API Gateway. + description: The host address of the ScaleIO API Gateway. type: string protectionDomain: - description: protectionDomain is the name of the ScaleIO - Protection Domain for the configured storage. + description: The name of the ScaleIO Protection Domain + for the configured storage. type: string readOnly: - description: readOnly Defaults to false (read/write). - ReadOnly here will force the ReadOnly setting in VolumeMounts. + description: Defaults to false (read/write). ReadOnly + here will force the ReadOnly setting in VolumeMounts. type: boolean secretRef: +<<<<<<< HEAD description: secretRef references to the secret for ======= description: ScaleIO represents a ScaleIO persistent volume @@ -17206,6 +18966,9 @@ spec: ======= description: secretRef references to the secret for >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: SecretRef references to the secret for +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) ScaleIO user and other sensitive information. If this is not provided, Login operation will fail. properties: @@ -17217,24 +18980,29 @@ spec: type: object sslEnabled: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: sslEnabled Flag enable/disable SSL communication +======= + description: Flag to enable/disable SSL communication +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) with Gateway, default false type: boolean storageMode: - description: storageMode indicates whether the storage - for a volume should be ThickProvisioned or ThinProvisioned. - Default is ThinProvisioned. + description: Indicates whether the storage for a volume + should be ThickProvisioned or ThinProvisioned. Default + is ThinProvisioned. type: string storagePool: - description: storagePool is the ScaleIO Storage Pool - associated with the protection domain. + description: The ScaleIO Storage Pool associated with + the protection domain. type: string system: - description: system is the name of the storage system - as configured in ScaleIO. + description: The name of the storage system as configured + in ScaleIO. type: string volumeName: +<<<<<<< HEAD description: volumeName is the name of a volume already created in the ScaleIO system that is associated with this volume source. @@ -17269,6 +19037,11 @@ spec: created in the ScaleIO system that is associated with this volume source. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: The name of a volume already created in + the ScaleIO system that is associated with this volume + source. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string required: - gateway @@ -17277,24 +19050,28 @@ spec: type: object secret: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: 'secret represents a secret that should populate +======= + description: 'Secret represents a secret that should populate +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) this volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret' properties: defaultMode: - description: 'defaultMode is Optional: mode bits used - to set permissions on created files by default. Must - be an octal value between 0000 and 0777 or a decimal - value between 0 and 511. YAML accepts both octal and - decimal values, JSON requires decimal values for mode - bits. Defaults to 0644. Directories within the path - are not affected by this setting. This might be in - conflict with other options that affect the file mode, - like fsGroup, and the result can be other mode bits - set.' + description: 'Optional: mode bits used to set permissions + on created files by default. Must be an octal value + between 0000 and 0777 or a decimal value between 0 + and 511. YAML accepts both octal and decimal values, + JSON requires decimal values for mode bits. Defaults + to 0644. Directories within the path are not affected + by this setting. This might be in conflict with other + options that affect the file mode, like fsGroup, and + the result can be other mode bits set.' format: int32 type: integer items: +<<<<<<< HEAD description: items If unspecified, each key-value pair in the Data field of the referenced Secret will be projected into the volume as a file whose name is @@ -17327,6 +19104,8 @@ spec: type: integer items: <<<<<<< HEAD +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) description: If unspecified, each key-value pair in the Data field of the referenced Secret will be projected into the volume as a file whose name is the key and @@ -17337,6 +19116,7 @@ spec: error unless it is marked optional. Paths must be relative and may not contain the '..' path or start with '..'. +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= description: items If unspecified, each key-value pair @@ -17350,29 +19130,36 @@ spec: Paths must be relative and may not contain the '..' path or start with '..'. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) items: description: Maps a string key to a path within a volume. properties: key: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: key is the key to project. +======= + description: The key to project. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string mode: - description: 'mode is Optional: mode bits used - to set permissions on this file. Must be an - octal value between 0000 and 0777 or a decimal - value between 0 and 511. YAML accepts both octal - and decimal values, JSON requires decimal values - for mode bits. If not specified, the volume - defaultMode will be used. This might be in conflict - with other options that affect the file mode, - like fsGroup, and the result can be other mode - bits set.' + description: 'Optional: mode bits used to set + permissions on this file. Must be an octal value + between 0000 and 0777 or a decimal value between + 0 and 511. YAML accepts both octal and decimal + values, JSON requires decimal values for mode + bits. If not specified, the volume defaultMode + will be used. This might be in conflict with + other options that affect the file mode, like + fsGroup, and the result can be other mode bits + set.' format: int32 type: integer path: +<<<<<<< HEAD description: path is the relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. @@ -17398,10 +19185,13 @@ spec: type: integer path: <<<<<<< HEAD +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) description: The relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. May not start with the string '..'. +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= description: path is the relative path of the @@ -17409,6 +19199,8 @@ spec: path. May not contain the path element '..'. May not start with the string '..'. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string required: - key @@ -17417,30 +19209,36 @@ spec: type: array optional: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: optional field specify whether the Secret or its keys must be defined +======= + description: Specify whether the Secret or its keys + must be defined +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: boolean secretName: - description: 'secretName is the name of the secret in - the pod''s namespace to use. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret' + description: 'Name of the secret in the pod''s namespace + to use. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret' type: string type: object storageos: - description: storageOS represents a StorageOS volume attached + description: StorageOS represents a StorageOS volume attached and mounted on Kubernetes nodes. properties: fsType: - description: fsType is the filesystem type to mount. - Must be a filesystem type supported by the host operating - system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred - to be "ext4" if unspecified. + description: Filesystem type to mount. Must be a filesystem + type supported by the host operating system. Ex. "ext4", + "xfs", "ntfs". Implicitly inferred to be "ext4" if + unspecified. type: string readOnly: - description: readOnly defaults to false (read/write). - ReadOnly here will force the ReadOnly setting in VolumeMounts. + description: Defaults to false (read/write). ReadOnly + here will force the ReadOnly setting in VolumeMounts. type: boolean secretRef: +<<<<<<< HEAD description: secretRef specifies the secret to use for ======= description: Specify whether the Secret or its keys @@ -17476,6 +19274,9 @@ spec: ======= description: secretRef specifies the secret to use for >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: SecretRef specifies the secret to use for +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) obtaining the StorageOS API credentials. If not specified, default values will be attempted. properties: @@ -17487,6 +19288,7 @@ spec: type: object volumeName: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: volumeName is the human-readable name of ======= @@ -17495,11 +19297,15 @@ spec: ======= description: volumeName is the human-readable name of >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: VolumeName is the human-readable name of +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) the StorageOS volume. Volume names are only unique within a namespace. type: string volumeNamespace: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: volumeNamespace specifies the scope of ======= @@ -17508,6 +19314,9 @@ spec: ======= description: volumeNamespace specifies the scope of >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: VolumeNamespace specifies the scope of +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) the volume within StorageOS. If no namespace is specified then the Pod's namespace will be used. This allows the Kubernetes name scoping to be mirrored within @@ -17520,25 +19329,30 @@ spec: type: object vsphereVolume: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: vsphereVolume represents a vSphere volume attached +======= + description: VsphereVolume represents a vSphere volume attached +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) and mounted on kubelets host machine properties: fsType: - description: fsType is filesystem type to mount. Must - be a filesystem type supported by the host operating - system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred - to be "ext4" if unspecified. + description: Filesystem type to mount. Must be a filesystem + type supported by the host operating system. Ex. "ext4", + "xfs", "ntfs". Implicitly inferred to be "ext4" if + unspecified. type: string storagePolicyID: - description: storagePolicyID is the storage Policy Based - Management (SPBM) profile ID associated with the StoragePolicyName. + description: Storage Policy Based Management (SPBM) + profile ID associated with the StoragePolicyName. type: string storagePolicyName: - description: storagePolicyName is the storage Policy - Based Management (SPBM) profile name. + description: Storage Policy Based Management (SPBM) + profile name. type: string volumePath: +<<<<<<< HEAD description: volumePath is the path that identifies vSphere volume vmdk ======= @@ -17570,6 +19384,9 @@ spec: description: volumePath is the path that identifies vSphere volume vmdk >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: Path that identifies vSphere volume vmdk +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string required: - volumePath @@ -17684,6 +19501,7 @@ spec: properties: maxReplicas: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: maxReplicas is the upper limit for the number of pods that can be set by the autoscaler; cannot be @@ -17697,6 +19515,10 @@ spec: of pods that can be set by the autoscaler; cannot be smaller than MinReplicas. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: upper limit for the number of pods that can + be set by the autoscaler; cannot be smaller than MinReplicas. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) format: int32 type: integer minReplicas: @@ -17716,15 +19538,19 @@ spec: properties: apiVersion: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: apiVersion is the API version of the referent +======= + description: API version of the referent +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string kind: - description: 'kind is the kind of the referent; More - info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: 'Kind of the referent; More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"' type: string name: +<<<<<<< HEAD description: 'name is the name of the referent; More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' ======= @@ -17746,6 +19572,9 @@ spec: description: 'name is the name of the referent; More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: 'Name of the referent; More info: http://kubernetes.io/docs/user-guide/identifiers#names' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string required: - kind @@ -17754,6 +19583,7 @@ spec: targetCPUUtilizationPercentage: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) description: targetCPUUtilizationPercentage is the target @@ -17762,13 +19592,18 @@ spec: the default autoscaling policy will be used. <<<<<<< HEAD ======= +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) description: target average CPU utilization (represented as a percentage of requested CPU) over all the pods; if not specified the default autoscaling policy will be used. +<<<<<<< HEAD >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) format: int32 type: integer required: @@ -17937,6 +19772,7 @@ spec: items: description: IngressTLS describes the transport layer <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD security associated with an ingress. properties: @@ -17960,6 +19796,14 @@ spec: the TLS certificate. The values in this list must match the name/s used in the tlsSecret. Defaults >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + security associated with an Ingress. + properties: + hosts: + description: Hosts are a list of hosts included + in the TLS certificate. The values in this list + must match the name/s used in the tlsSecret. Defaults +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) to the wildcard host setting for the loadbalancer controller fulfilling this Ingress, if left unspecified. items: @@ -17968,6 +19812,7 @@ spec: x-kubernetes-list-type: atomic secretName: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: secretName is the name of the secret ======= @@ -17976,12 +19821,16 @@ spec: ======= description: secretName is the name of the secret >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: SecretName is the name of the secret +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) used to terminate TLS traffic on port 443. Field is left optional to allow TLS routing based on SNI hostname alone. If the SNI host in a listener conflicts with the "Host" header field used by an IngressRule, the SNI host is used for termination <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD and value of the "Host" header is used for routing. ======= @@ -17990,6 +19839,9 @@ spec: ======= and value of the "Host" header is used for routing. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + and value of the Host header is used for routing. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string type: object type: array @@ -18029,6 +19881,7 @@ spec: items: description: IngressTLS describes the transport layer security <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD associated with an ingress. properties: @@ -18046,6 +19899,12 @@ spec: hosts: description: hosts is a list of hosts included in the >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + associated with an Ingress. + properties: + hosts: + description: Hosts are a list of hosts included in the +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) TLS certificate. The values in this list must match the name/s used in the tlsSecret. Defaults to the wildcard host setting for the loadbalancer controller @@ -18056,6 +19915,7 @@ spec: x-kubernetes-list-type: atomic secretName: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description: secretName is the name of the secret used ======= @@ -18064,12 +19924,16 @@ spec: ======= description: secretName is the name of the secret used >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + description: SecretName is the name of the secret used +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) to terminate TLS traffic on port 443. Field is left optional to allow TLS routing based on SNI hostname alone. If the SNI host in a listener conflicts with the "Host" header field used by an IngressRule, the SNI host is used for termination and value of the <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "Host" header is used for routing. ======= @@ -18078,6 +19942,9 @@ spec: ======= "Host" header is used for routing. >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + Host header is used for routing. +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: string type: object type: array @@ -18109,6 +19976,7 @@ spec: properties: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) claims: @@ -18138,6 +20006,8 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) limits: additionalProperties: anyOf: @@ -18159,6 +20029,7 @@ spec: resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' @@ -18169,6 +20040,9 @@ spec: to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: object type: object route: @@ -18405,6 +20279,7 @@ spec: properties: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) claims: @@ -18434,6 +20309,8 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) limits: additionalProperties: anyOf: @@ -18456,6 +20333,7 @@ spec: a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' ======= @@ -18464,6 +20342,9 @@ spec: ======= Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: object type: object version: @@ -18483,6 +20364,7 @@ spec: properties: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) claims: @@ -18512,6 +20394,8 @@ spec: >>>>>>> a6b6fdc (rebase: update dockerfile, makefile, api, config & bundle manifests (2/?) (#1134)) ======= >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) limits: additionalProperties: anyOf: @@ -18534,6 +20418,7 @@ spec: a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' ======= @@ -18542,6 +20427,9 @@ spec: ======= Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' >>>>>>> f1cbb48 (rebase: update main.go, go mod files and docs (3/8) (#1135)) +======= + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) type: object type: object rootCA: diff --git a/docs/install/manual.md b/docs/install/manual.md index 45ae8e045..9cbe16ec0 100644 --- a/docs/install/manual.md +++ b/docs/install/manual.md @@ -52,6 +52,10 @@ metadata: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= + +>>>>>>> fabd487 (rebase: update cluster, mutation, util, argocdcommon and monitoring packages (4/8) (#1136)) Enable `../certmanager` directory under the `resources` section in `config/default/kustomization.yaml` file. ```yaml resources: diff --git a/pkg/cluster/event.go b/pkg/cluster/event.go new file mode 100644 index 000000000..ee3f082eb --- /dev/null +++ b/pkg/cluster/event.go @@ -0,0 +1,79 @@ +package cluster + +import ( + "context" + "fmt" + + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + cntrlClient "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/argoproj-labs/argocd-operator/pkg/argoutil" + "github.com/argoproj-labs/argocd-operator/pkg/mutation" +) + +// EventRequest objects contain all the required information to produce an event object in return +type EventRequest struct { + InvolvedObjectMeta metav1.ObjectMeta + InvolvedObjectTypeMeta metav1.TypeMeta + Action string + Type string + Message string + Reson string + CreationTimestamp metav1.Time + FirstTimestamp metav1.Time + LastTimestamp metav1.Time + + // array of functions to mutate event before returning to requester + Mutations []mutation.MutateFunc + Client cntrlClient.Client +} + +func newEvent(objMeta metav1.ObjectMeta, typeMeta metav1.TypeMeta, eventType, action, message, reason string) *corev1.Event { + return &corev1.Event{ + ObjectMeta: metav1.ObjectMeta{ + GenerateName: argoutil.NameWithSuffix(objMeta.Name, ""), + Labels: objMeta.Labels, + Namespace: objMeta.Namespace, + }, + Action: action, + Type: eventType, + Message: message, + Reason: reason, + InvolvedObject: corev1.ObjectReference{ + Name: objMeta.Name, + Namespace: objMeta.Namespace, + UID: objMeta.UID, + ResourceVersion: objMeta.ResourceVersion, + Kind: typeMeta.Kind, + APIVersion: typeMeta.APIVersion, + }, + FirstTimestamp: metav1.Now(), + LastTimestamp: metav1.Now(), + } +} + +func RequestEvent(request EventRequest) (*corev1.Event, error) { + var ( + mutationErr error + ) + event := newEvent(request.InvolvedObjectMeta, request.InvolvedObjectTypeMeta, request.Type, request.Action, request.Message, request.Reson) + + if len(request.Mutations) > 0 { + for _, mutation := range request.Mutations { + err := mutation(nil, event, request.Client) + if err != nil { + mutationErr = err + } + } + if mutationErr != nil { + return event, fmt.Errorf("RequestEvent: one or more mutation functions could not be applied: %s", mutationErr) + } + } + + return event, nil +} + +func CreateEvent(event *corev1.Event, client cntrlClient.Client) error { + return client.Create(context.TODO(), event) +} diff --git a/pkg/cluster/namespace.go b/pkg/cluster/namespace.go index 2280bd50a..e0a536bbd 100644 --- a/pkg/cluster/namespace.go +++ b/pkg/cluster/namespace.go @@ -4,11 +4,12 @@ import ( "context" "fmt" - "github.com/argoproj-labs/argocd-operator/pkg/mutation" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/argoproj-labs/argocd-operator/pkg/mutation" + cntrlClient "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/cluster/namespace_test.go b/pkg/cluster/namespace_test.go index 51174de9f..63544f950 100644 --- a/pkg/cluster/namespace_test.go +++ b/pkg/cluster/namespace_test.go @@ -6,9 +6,6 @@ import ( "sort" "testing" - argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1" - "github.com/argoproj-labs/argocd-operator/common" - "github.com/argoproj-labs/argocd-operator/pkg/mutation" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" @@ -18,6 +15,10 @@ import ( "k8s.io/apimachinery/pkg/types" cntrlClient "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" + + argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1" + "github.com/argoproj-labs/argocd-operator/common" + "github.com/argoproj-labs/argocd-operator/pkg/mutation" ) var ( diff --git a/pkg/cluster/openshift.go b/pkg/cluster/openshift.go index aabd26128..a80203237 100644 --- a/pkg/cluster/openshift.go +++ b/pkg/cluster/openshift.go @@ -4,27 +4,33 @@ import ( "context" "fmt" - util "github.com/argoproj-labs/argocd-operator/pkg/util" configv1 "github.com/openshift/api/config/v1" "gopkg.in/yaml.v2" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/argoproj-labs/argocd-operator/pkg/argoutil" ) var ( versionAPIFound = false ) -// IsVersionAPIAvailable returns true if the version api is present +// IsVersionAPIAvailable returns true if the OpenShift cluster version api is present func IsVersionAPIAvailable() bool { return versionAPIFound } -// VerifyVersionAPI will verify that the cluster version API is present. +// SetVersionAPIFound sets the value of versionAPIFound to provided input +func SetVersionAPIFound(found bool) { + versionAPIFound = found +} + +// verifyVersionAPI will verify that the template API is present. func VerifyVersionAPI() error { - found, err := util.VerifyAPI(configv1.GroupName, configv1.GroupVersion.Version) + found, err := argoutil.VerifyAPI(configv1.GroupName, configv1.GroupVersion.Version) if err != nil { return err } @@ -49,7 +55,7 @@ func GetClusterVersion(client client.Client) (string, error) { } func GetOpenShiftAPIURL() (string, error) { - k8s, err := util.GetK8sClient() + k8s, err := argoutil.GetK8sClient() if err != nil { return "", fmt.Errorf("GetOpenShiftAPIURL: failed to initialize k8s client: %w", err) } @@ -83,7 +89,7 @@ func GetOpenShiftAPIURL() (string, error) { } func IsProxyCluster() (bool, error) { - configClient, err := util.GetConfigClient() + configClient, err := argoutil.GetConfigClient() if err != nil { return false, fmt.Errorf("IsProxyCluster: could not get config client: %w", err) } diff --git a/pkg/monitoring/monitoring.go b/pkg/monitoring/monitoring.go new file mode 100644 index 000000000..2f2912ae1 --- /dev/null +++ b/pkg/monitoring/monitoring.go @@ -0,0 +1 @@ +package monitoring diff --git a/pkg/monitoring/monitoring_test.go b/pkg/monitoring/monitoring_test.go index 0ec3cff4d..64ff1e1e2 100644 --- a/pkg/monitoring/monitoring_test.go +++ b/pkg/monitoring/monitoring_test.go @@ -3,9 +3,10 @@ package monitoring import ( "errors" - argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1" monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" cntrlClient "sigs.k8s.io/controller-runtime/pkg/client" + + argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1" ) // common test variables used across workloads tests diff --git a/pkg/monitoring/util.go b/pkg/monitoring/prometheus.go similarity index 58% rename from pkg/monitoring/util.go rename to pkg/monitoring/prometheus.go index df966e7e8..d2a778e8d 100644 --- a/pkg/monitoring/util.go +++ b/pkg/monitoring/prometheus.go @@ -1,8 +1,9 @@ package monitoring import ( - "github.com/argoproj-labs/argocd-operator/pkg/util" monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + + "github.com/argoproj-labs/argocd-operator/pkg/argoutil" ) var prometheusAPIFound = false @@ -12,9 +13,14 @@ func IsPrometheusAPIAvailable() bool { return prometheusAPIFound } +// SetPrometheusAPIFound sets the value of prometheusAPIFound to provided input +func SetPrometheusAPIFound(found bool) { + prometheusAPIFound = found +} + // VerifyPrometheusAPI will verify that the Prometheus API is present. func VerifyPrometheusAPI() error { - found, err := util.VerifyAPI(monitoringv1.SchemeGroupVersion.Group, monitoringv1.SchemeGroupVersion.Version) + found, err := argoutil.VerifyAPI(monitoringv1.SchemeGroupVersion.Group, monitoringv1.SchemeGroupVersion.Version) if err != nil { return err } diff --git a/pkg/monitoring/prometheusRule.go b/pkg/monitoring/prometheusRule.go index dd57700e3..c4f717932 100644 --- a/pkg/monitoring/prometheusRule.go +++ b/pkg/monitoring/prometheusRule.go @@ -4,12 +4,13 @@ import ( "context" "fmt" - "github.com/argoproj-labs/argocd-operator/pkg/mutation" monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" cntrlClient "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/argoproj-labs/argocd-operator/pkg/mutation" ) // PrometheusRuleRequest objects contain all the required information to produce a prometheusRule object in return diff --git a/pkg/monitoring/prometheusRule_test.go b/pkg/monitoring/prometheusRule_test.go index a4b24af7a..b2e229d11 100644 --- a/pkg/monitoring/prometheusRule_test.go +++ b/pkg/monitoring/prometheusRule_test.go @@ -5,9 +5,6 @@ import ( "sort" "testing" - "github.com/argoproj-labs/argocd-operator/common" - "github.com/argoproj-labs/argocd-operator/pkg/mutation" - "github.com/argoproj-labs/argocd-operator/pkg/util" monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" "github.com/openshift/client-go/apps/clientset/versioned/scheme" "github.com/stretchr/testify/assert" @@ -19,6 +16,10 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" cntrlClient "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" + + "github.com/argoproj-labs/argocd-operator/common" + "github.com/argoproj-labs/argocd-operator/pkg/mutation" + "github.com/argoproj-labs/argocd-operator/pkg/util" ) type prometheusRuleOpt func(*monitoringv1.PrometheusRule) diff --git a/pkg/monitoring/serviceMonitor.go b/pkg/monitoring/serviceMonitor.go index 40a1720b7..ffc35794f 100644 --- a/pkg/monitoring/serviceMonitor.go +++ b/pkg/monitoring/serviceMonitor.go @@ -4,12 +4,13 @@ import ( "context" "fmt" - "github.com/argoproj-labs/argocd-operator/pkg/mutation" monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" cntrlClient "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/argoproj-labs/argocd-operator/pkg/mutation" ) // ServiceMonitorRequest objects contain all the required information to produce a serviceMonitor object in return diff --git a/pkg/monitoring/serviceMonitor_test.go b/pkg/monitoring/serviceMonitor_test.go index 67a996525..cd7399cab 100644 --- a/pkg/monitoring/serviceMonitor_test.go +++ b/pkg/monitoring/serviceMonitor_test.go @@ -5,9 +5,6 @@ import ( "sort" "testing" - "github.com/argoproj-labs/argocd-operator/common" - "github.com/argoproj-labs/argocd-operator/pkg/mutation" - util "github.com/argoproj-labs/argocd-operator/pkg/util" monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" "github.com/openshift/client-go/apps/clientset/versioned/scheme" "github.com/stretchr/testify/assert" @@ -18,6 +15,11 @@ import ( "k8s.io/apimachinery/pkg/types" cntrlClient "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" + + "github.com/argoproj-labs/argocd-operator/common" + "github.com/argoproj-labs/argocd-operator/pkg/argoutil" + "github.com/argoproj-labs/argocd-operator/pkg/mutation" + util "github.com/argoproj-labs/argocd-operator/pkg/util" ) type serviceMonitorOpt func(*monitoringv1.ServiceMonitor) @@ -41,7 +43,7 @@ func getTestServiceMonitor(opts ...serviceMonitorOpt) *monitoringv1.ServiceMonit Spec: monitoringv1.ServiceMonitorSpec{ Selector: metav1.LabelSelector{ MatchLabels: map[string]string{ - common.AppK8sKeyName: util.GenerateResourceName(testInstance, common.ArgoCDMetrics), + common.AppK8sKeyName: argoutil.GenerateResourceName(testInstance, common.ArgoCDMetrics), }, }, Endpoints: []monitoringv1.Endpoint{ @@ -90,7 +92,7 @@ func TestRequestServiceMonitor(t *testing.T) { Spec: monitoringv1.ServiceMonitorSpec{ Selector: metav1.LabelSelector{ MatchLabels: map[string]string{ - common.AppK8sKeyName: util.GenerateResourceName(testInstance, common.ArgoCDMetrics), + common.AppK8sKeyName: argoutil.GenerateResourceName(testInstance, common.ArgoCDMetrics), }, }, Endpoints: []monitoringv1.Endpoint{ @@ -125,7 +127,7 @@ func TestRequestServiceMonitor(t *testing.T) { Spec: monitoringv1.ServiceMonitorSpec{ Selector: metav1.LabelSelector{ MatchLabels: map[string]string{ - common.AppK8sKeyName: util.GenerateResourceName(testInstance, common.ArgoCDMetrics), + common.AppK8sKeyName: argoutil.GenerateResourceName(testInstance, common.ArgoCDMetrics), }, }, Endpoints: []monitoringv1.Endpoint{ @@ -162,7 +164,7 @@ func TestRequestServiceMonitor(t *testing.T) { Spec: monitoringv1.ServiceMonitorSpec{ Selector: metav1.LabelSelector{ MatchLabels: map[string]string{ - common.AppK8sKeyName: util.GenerateResourceName(testInstance, common.ArgoCDMetrics), + common.AppK8sKeyName: argoutil.GenerateResourceName(testInstance, common.ArgoCDMetrics), }, }, Endpoints: []monitoringv1.Endpoint{ @@ -199,7 +201,7 @@ func TestRequestServiceMonitor(t *testing.T) { Spec: monitoringv1.ServiceMonitorSpec{ Selector: metav1.LabelSelector{ MatchLabels: map[string]string{ - common.AppK8sKeyName: util.GenerateResourceName(testInstance, common.ArgoCDMetrics), + common.AppK8sKeyName: argoutil.GenerateResourceName(testInstance, common.ArgoCDMetrics), }, }, Endpoints: []monitoringv1.Endpoint{ diff --git a/pkg/mutation/mutation.go b/pkg/mutation/mutation.go index 0e6315462..24c32a6cf 100644 --- a/pkg/mutation/mutation.go +++ b/pkg/mutation/mutation.go @@ -3,8 +3,9 @@ package mutation import ( "sync" - argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" + + argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1" ) var ( diff --git a/pkg/mutation/openshift/openshift.go b/pkg/mutation/openshift/openshift.go index a0c5c39a6..4b0692ab2 100644 --- a/pkg/mutation/openshift/openshift.go +++ b/pkg/mutation/openshift/openshift.go @@ -3,12 +3,13 @@ package openshift import ( "fmt" - argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1" - "github.com/argoproj-labs/argocd-operator/pkg/cluster" - "github.com/argoproj-labs/argocd-operator/pkg/mutation" "golang.org/x/mod/semver" corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" + + argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1" + "github.com/argoproj-labs/argocd-operator/pkg/cluster" + "github.com/argoproj-labs/argocd-operator/pkg/mutation" ) func init() { diff --git a/pkg/util/bool.go b/pkg/util/bool.go index 511fae80a..0f290bec6 100644 --- a/pkg/util/bool.go +++ b/pkg/util/bool.go @@ -1,6 +1,6 @@ package util -// util.BoolPtr returns a pointer to val +// BoolPtr returns a pointer to provided boolean value func BoolPtr(val bool) *bool { return &val } diff --git a/pkg/util/int.go b/pkg/util/int.go index ed9966dcd..e305666d9 100644 --- a/pkg/util/int.go +++ b/pkg/util/int.go @@ -1,5 +1,6 @@ package util +// Int64Ptr returns a pointer to the provided int64 value func Int64Ptr(val int64) *int64 { return &val } diff --git a/pkg/util/k8s.go b/pkg/util/k8s.go deleted file mode 100644 index e02ca0d60..000000000 --- a/pkg/util/k8s.go +++ /dev/null @@ -1,39 +0,0 @@ -package util - -import ( - "context" - "fmt" - - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "sigs.k8s.io/controller-runtime/pkg/client" -) - -func newEvent(meta metav1.ObjectMeta) *corev1.Event { - event := &corev1.Event{} - event.ObjectMeta.GenerateName = fmt.Sprintf("%s-", meta.Name) - event.ObjectMeta.Labels = meta.Labels - event.ObjectMeta.Namespace = meta.Namespace - return event -} - -// CreateEvent will create a new Kubernetes Event with the given action, message, reason and involved uid. -func CreateEvent(client client.Client, eventType, action, message, reason string, objectMeta metav1.ObjectMeta, typeMeta metav1.TypeMeta) error { - event := newEvent(objectMeta) - event.Action = action - event.Type = eventType - event.InvolvedObject = corev1.ObjectReference{ - Name: objectMeta.Name, - Namespace: objectMeta.Namespace, - UID: objectMeta.UID, - ResourceVersion: objectMeta.ResourceVersion, - Kind: typeMeta.Kind, - APIVersion: typeMeta.APIVersion, - } - event.Message = message - event.Reason = reason - event.CreationTimestamp = metav1.Now() - event.FirstTimestamp = event.CreationTimestamp - event.LastTimestamp = event.CreationTimestamp - return client.Create(context.TODO(), event) -} diff --git a/pkg/util/log.go b/pkg/util/log.go deleted file mode 100644 index d1caaf612..000000000 --- a/pkg/util/log.go +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright 2019 ArgoCD Operator Developers -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package util - -import ( - "strings" - - "github.com/argoproj-labs/argocd-operator/common" -) - -// GetLogLevel returns the log level for a specified component if it is set or returns the default log level if it is not set -func GetLogLevel(logField string) string { - - switch strings.ToLower(logField) { - case "debug", - "info", - "warn", - "error": - return logField - } - return common.ArgoCDDefaultLogLevel -} - -// getLogFormat returns the log format for a specified component if it is set or returns the default log format if it is not set -func GetLogFormat(logField string) string { - switch strings.ToLower(logField) { - case "text", - "json": - return logField - } - return common.ArgoCDDefaultLogFormat -} diff --git a/pkg/util/map.go b/pkg/util/map.go index 02fcd91f2..f5255180b 100644 --- a/pkg/util/map.go +++ b/pkg/util/map.go @@ -1,5 +1,7 @@ package util +import "sort" + // combines 2 maps and returns the result. In case of conflicts, values in 2nd input overwrite values in 1st input func MergeMaps(a, b map[string]string) map[string]string { mergedMap := make(map[string]string, 0) @@ -13,16 +15,12 @@ func MergeMaps(a, b map[string]string) map[string]string { return mergedMap } -// TO DO: AppendStringMap and MergeMaps do the same thing, get rid of AppendStringMap! - -// AppendStringMap will append the map `add` to the given map `src` and return the result. -func AppendStringMap(src map[string]string, add map[string]string) map[string]string { - res := src - if len(src) <= 0 { - res = make(map[string]string, len(add)) - } - for key, val := range add { - res[key] = val +// StringMapKeys accepts a map with string keys as input and returns a sorted slice of its keys +func StringMapKeys(m map[string]string) []string { + r := []string{} + for k := range m { + r = append(r, k) } - return res + sort.Strings(r) + return r } diff --git a/pkg/util/resource.go b/pkg/util/resource.go deleted file mode 100644 index 0d45d7e20..000000000 --- a/pkg/util/resource.go +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright 2019 ArgoCD Operator Developers -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package util - -import ( - "context" - "fmt" - - apierrors "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/apimachinery/pkg/types" - "sigs.k8s.io/controller-runtime/pkg/client" -) - -// NameWithSuffix will return a string using the Name from the given ObjectMeta with the provded suffix appended. -func NameWithSuffix(name, suffix string) string { - return fmt.Sprintf("%s-%s", name, suffix) -} - -// GenerateResourceName generates names for namespace scoped resources -func GenerateResourceName(instanceName, component string) string { - return NameWithSuffix(instanceName, component) -} - -// GenerateUniqueResourceName generates unique names for cluster scoped resources -func GenerateUniqueResourceName(instanceName, instanceNamespace, component string) string { - return fmt.Sprintf("%s-%s-%s", instanceName, instanceNamespace, component) -} - -// FetchObject will retrieve the object with the given namespace and name using the Kubernetes API. -// The result will be stored in the given object. -func FetchObject(client client.Client, namespace string, name string, obj client.Object) error { - return client.Get(context.TODO(), types.NamespacedName{Namespace: namespace, Name: name}, obj) -} - -// IsObjectFound will perform a basic check that the given object exists via the Kubernetes API. -// If an error occurs as part of the check, the function will return false. -func IsObjectFound(client client.Client, namespace string, name string, obj client.Object) bool { - return !apierrors.IsNotFound(FetchObject(client, namespace, name, obj)) -} - -func FilterObjectsBySelector(c client.Client, objectList client.ObjectList, selector labels.Selector) error { - return c.List(context.TODO(), objectList, client.MatchingLabelsSelector{Selector: selector}) -} diff --git a/pkg/util/resource_test.go b/pkg/util/resource_test.go deleted file mode 100644 index 008e4d191..000000000 --- a/pkg/util/resource_test.go +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright 2019 ArgoCD Operator Developers -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package util - -import ( - "reflect" - "testing" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - - argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1" - "github.com/argoproj-labs/argocd-operator/common" -) - -func TestDefaultAnnotations(t *testing.T) { - type args struct { - cr *argoproj.ArgoCD - } - tests := []struct { - name string - args args - want map[string]string - }{ - { - name: "simple annotations", - args: args{ - &argoproj.ArgoCD{ - ObjectMeta: v1.ObjectMeta{ - Name: "foo", - Namespace: "bar", - }, - }, - }, - want: map[string]string{ - "argocds.argoproj.io/name": "foo", - "argocds.argoproj.io/namespace": "bar", - }, - }, - } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - if got := common.DefaultAnnotations(tt.args.cr.Name, tt.args.cr.Namespace); !reflect.DeepEqual(got, tt.want) { - t.Errorf("DefaultAnnotations() = %v, want %v", got, tt.want) - } - }) - } -} diff --git a/pkg/util/service.go b/pkg/util/service.go deleted file mode 100644 index e42919755..000000000 --- a/pkg/util/service.go +++ /dev/null @@ -1,11 +0,0 @@ -package util - -import ( - "fmt" -) - -// FqdnServiceRef will return the FQDN referencing a specific service name, as set up by the operator, with the -// given port. -func FqdnServiceRef(serviceName, namespace string, port int) string { - return fmt.Sprintf("%s.%s.svc.cluster.local:%d", serviceName, namespace, port) -} diff --git a/pkg/util/string.go b/pkg/util/string.go index a07f651ca..73a93f092 100644 --- a/pkg/util/string.go +++ b/pkg/util/string.go @@ -2,11 +2,11 @@ package util import ( "encoding/base64" - "fmt" "sort" "strings" ) +// SplitList accepts a string input containing a list of comma separated values, and returns a slice containing those values as separate elements func SplitList(s string) []string { elems := strings.Split(s, ",") for i := range elems { @@ -15,6 +15,7 @@ func SplitList(s string) []string { return elems } +// RemoveString removes the given string from the given slice func RemoveString(slice []string, s string) []string { var result []string for _, item := range slice { @@ -26,7 +27,7 @@ func RemoveString(slice []string, s string) []string { return result } -// ContainsString returns true if a string is part of the given slice. +// ContainsString returns true if the given string is part of the given slice. func ContainsString(arr []string, s string) bool { for _, val := range arr { if strings.TrimSpace(val) == s { @@ -58,13 +59,3 @@ func GenerateRandomString(s int) (string, error) { } return base64.URLEncoding.EncodeToString(b), nil } - -// IsMergable returns error if any of the extraArgs is already part of the default command Arguments. -func IsMergable(extraArgs []string, cmd []string) error { - for _, arg := range extraArgs { - if len(arg) > 2 && arg[:2] == "--" && ContainsString(cmd, arg) { - return fmt.Errorf("arg %s is already part of the default command arguments", arg) - } - } - return nil -}