Skip to content

Commit

Permalink
bump cdi to 1.26.1 (from 1.25.0)
Browse files Browse the repository at this point in the history 
Signed-off-by: Bartosz Rybacki <[email protected]>
  • Loading branch information
@brybacki
brybacki committed Nov 23, 2020
1 parent c37d71a commit d083858
Show file tree
Hide file tree
Showing 3 changed files with 112 additions and 12 deletions.
5 changes: 3 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ require (
k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6
k8s.io/utils v0.0.0-20200720150651-0bdb4ca86cbc
kubevirt.io/client-go v0.0.0-00010101000000-000000000000
kubevirt.io/containerized-data-importer v1.25.0
kubevirt.io/containerized-data-importer v1.26.1
kubevirt.io/controller-lifecycle-operator-sdk v0.1.1
kubevirt.io/qe-tools v0.1.6
libvirt.org/libvirt-go v6.5.0+incompatible
sigs.k8s.io/yaml v1.2.0
Expand Down Expand Up @@ -113,7 +114,7 @@ replace (

kubevirt.io/client-go => ./staging/src/kubevirt.io/client-go

kubevirt.io/containerized-data-importer => kubevirt.io/containerized-data-importer v1.25.0
kubevirt.io/containerized-data-importer => kubevirt.io/containerized-data-importer v1.26.1
)

go 1.13
115 changes: 107 additions & 8 deletions manifests/testing/cdi-v1.25.0.yaml.in → manifests/testing/cdi-v1.26.1.yaml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,53 @@ spec:
spec:
description: CDISpec defines our specification for the CDI installation
properties:
config:
description: CDIConfig at CDI level
properties:
filesystemOverhead:
description: FilesystemOverhead describes the space reserved for overhead when using Filesystem volumes. A value is between 0 and 1, if not defined it is 0.055 (5.5% overhead)
properties:
global:
description: Global is how much space of a Filesystem volume should be reserved for overhead. This value is used unless overridden by a more specific value (per storageClass)
pattern: ^(0(?:\.\d{1,3})?|1)$
type: string
storageClass:
additionalProperties:
description: 'Percent is a string that can only be a value between [0,1) (Note: we actually rely on reconcile to reject invalid values)'
pattern: ^(0(?:\.\d{1,3})?|1)$
type: string
description: StorageClass specifies how much space of a Filesystem volume should be reserved for safety. The keys are the storageClass and the values are the overhead. This value overrides the global value
type: object
type: object
podResourceRequirements:
description: ResourceRequirements describes the compute resource requirements.
properties:
limits:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
type: object
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
type: object
type: object
scratchSpaceStorageClass:
description: 'Override the storage class to used for scratch space during transfer operations. The scratch space storage class is determined in the following order: 1. value of scratchSpaceStorageClass, if that doesn''t exist, use the default storage class, if there is no default storage class, use the storage class of the DataVolume, if no storage class specified, use no storage class for scratch space'
type: string
uploadProxyURLOverride:
description: Override the URL used when uploading to a DataVolume
type: string
type: object
imagePullPolicy:
description: PullPolicy describes a policy for if/when to pull a container image
enum:
Expand Down Expand Up @@ -878,6 +925,58 @@ spec:
spec:
description: CDISpec defines our specification for the CDI installation
properties:
config:
description: CDIConfig at CDI level
properties:
featureGates:
description: FeatureGates are a list of specific enabled feature gates
items:
type: string
type: array
filesystemOverhead:
description: FilesystemOverhead describes the space reserved for overhead when using Filesystem volumes. A value is between 0 and 1, if not defined it is 0.055 (5.5% overhead)
properties:
global:
description: Global is how much space of a Filesystem volume should be reserved for overhead. This value is used unless overridden by a more specific value (per storageClass)
pattern: ^(0(?:\.\d{1,3})?|1)$
type: string
storageClass:
additionalProperties:
description: 'Percent is a string that can only be a value between [0,1) (Note: we actually rely on reconcile to reject invalid values)'
pattern: ^(0(?:\.\d{1,3})?|1)$
type: string
description: StorageClass specifies how much space of a Filesystem volume should be reserved for safety. The keys are the storageClass and the values are the overhead. This value overrides the global value
type: object
type: object
podResourceRequirements:
description: ResourceRequirements describes the compute resource requirements.
properties:
limits:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
type: object
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
type: object
type: object
scratchSpaceStorageClass:
description: 'Override the storage class to used for scratch space during transfer operations. The scratch space storage class is determined in the following order: 1. value of scratchSpaceStorageClass, if that doesn''t exist, use the default storage class, if there is no default storage class, use the storage class of the DataVolume, if no storage class specified, use no storage class for scratch space'
type: string
uploadProxyURLOverride:
description: Override the URL used when uploading to a DataVolume
type: string
type: object
imagePullPolicy:
description: PullPolicy describes a policy for if/when to pull a container image
enum:
Expand Down Expand Up @@ -1984,24 +2083,24 @@ spec:
- name: DEPLOY_CLUSTER_RESOURCES
value: "true"
- name: OPERATOR_VERSION
value: v1.25.0
value: v1.26.1
- name: CONTROLLER_IMAGE
value: kubevirt/cdi-controller:v1.25.0
value: kubevirt/cdi-controller:v1.26.1
- name: IMPORTER_IMAGE
value: kubevirt/cdi-importer:v1.25.0
value: kubevirt/cdi-importer:v1.26.1
- name: CLONER_IMAGE
value: kubevirt/cdi-cloner:v1.25.0
value: kubevirt/cdi-cloner:v1.26.1
- name: APISERVER_IMAGE
value: kubevirt/cdi-apiserver:v1.25.0
value: kubevirt/cdi-apiserver:v1.26.1
- name: UPLOAD_SERVER_IMAGE
value: kubevirt/cdi-uploadserver:v1.25.0
value: kubevirt/cdi-uploadserver:v1.26.1
- name: UPLOAD_PROXY_IMAGE
value: kubevirt/cdi-uploadproxy:v1.25.0
value: kubevirt/cdi-uploadproxy:v1.26.1
- name: VERBOSITY
value: "1"
- name: PULL_POLICY
value: IfNotPresent
image: kubevirt/cdi-operator:v1.25.0
image: kubevirt/cdi-operator:v1.26.1
imagePullPolicy: IfNotPresent
name: cdi-operator
ports:
Expand Down
4 changes: 2 additions & 2 deletions staging/src/kubevirt.io/client-go/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ require (
k8s.io/client-go v12.0.0+incompatible
k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6
k8s.io/utils v0.0.0-20200720150651-0bdb4ca86cbc
kubevirt.io/containerized-data-importer v1.25.0
kubevirt.io/containerized-data-importer v1.26.1
)

replace (
Expand Down Expand Up @@ -62,6 +62,6 @@ replace (
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.16.4
k8s.io/sample-controller => k8s.io/sample-controller v0.16.4

kubevirt.io/containerized-data-importer => kubevirt.io/containerized-data-importer v1.25.0
kubevirt.io/containerized-data-importer => kubevirt.io/containerized-data-importer v1.26.1
sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v0.0.0-20190302045857-e85c7b244fd2
)

0 comments on commit d083858

Please sign in to comment.