Skip to content

remotemachineset/openstackactuator.go: re enable using clientOpts #1283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 3 commits into from
Feb 12, 2021
Merged

remotemachineset/openstackactuator.go: re enable using clientOpts #1283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
032dee7
vendor: bump installer to master
abhinavdahiya Feb 9, 2021
fce8b0f
resource/apply.go: fix for 0.20.0 k8s client-go
abhinavdahiya Feb 9, 2021
9e031ac
remotemachineset/openstackactuator.go: re enable using clientOpts
abhinavdahiya Feb 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
34 changes: 12 additions & 22 deletions config/crds/hive.openshift.io_clusterprovisions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1548,8 +1548,7 @@ spec:
failed. This can be used to provide different probe parameters
at the beginning of a Pod''s lifecycle, when it might take
a long time to load data or warm a cache, than during steady-state
operation. This cannot be updated. This is a beta feature
enabled by the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
operation. This cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
properties:
exec:
description: One and only one of the following should
Expand Down Expand Up @@ -3801,8 +3800,7 @@ spec:
failed. This can be used to provide different probe parameters
at the beginning of a Pod''s lifecycle, when it might take
a long time to load data or warm a cache, than during steady-state
operation. This cannot be updated. This is a beta feature
enabled by the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
operation. This cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
properties:
exec:
description: One and only one of the following should
Expand Down Expand Up @@ -4136,7 +4134,7 @@ spec:
support fsGroup based ownership(and permissions). It will
have no effect on ephemeral volume types such as: secret,
configmaps and emptydir. Valid values are "OnRootMismatch"
and "Always". If not specified defaults to "Always".'
and "Always". If not specified, "Always" is used.'
type: string
runAsGroup:
description: The GID to run the entrypoint of the container
Expand Down Expand Up @@ -4894,21 +4892,15 @@ spec:
dataSource:
description: 'This field can be used to specify
either: * An existing VolumeSnapshot object
(snapshot.storage.k8s.io/VolumeSnapshot - Beta)
* An existing PVC (PersistentVolumeClaim) *
An existing custom resource/object that implements
data population (Alpha) In order to use VolumeSnapshot
object types, the appropriate feature gate must
be enabled (VolumeSnapshotDataSource or AnyVolumeDataSource)
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 specified
data source is not supported, the volume will
not be created and the failure will be reported
as an event. In the future, we plan to support
more data source types and the behavior of the
provisioner may change.'
(snapshot.storage.k8s.io/VolumeSnapshot) * An
existing PVC (PersistentVolumeClaim) * An existing
custom resource that implements data population
(Alpha) In order to use custom resource types
that implement data population, the AnyVolumeDataSource
feature gate must be enabled. 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.'
properties:
apiGroup:
description: APIGroup is the group for the
Expand Down Expand Up @@ -5612,8 +5604,6 @@ spec:
type: object
type: object
type: array
required:
- sources
type: object
quobyte:
description: Quobyte represents a Quobyte mount on the host
Expand Down
19 changes: 10 additions & 9 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,12 @@ require (
github.com/openshift/cluster-api-provider-ovirt v0.1.1-0.20200504092944-27473ea1ae43
github.com/openshift/cluster-autoscaler-operator v0.0.0-20190521201101-62768a6ba480
github.com/openshift/generic-admission-server v1.14.1-0.20200903115324-4ddcdd976480
github.com/openshift/installer v0.9.0-master.0.20210201172249-df32ad26dd6f
github.com/openshift/installer v0.9.0-master.0.20210211002944-d237b9dee575
github.com/openshift/library-go v0.0.0-20201109112824-093ad3cf6600
github.com/openshift/machine-api-operator v0.2.1-0.20201111151924-77300d0c997a
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.7.1
github.com/prometheus/client_model v0.2.0
github.com/sirupsen/logrus v1.6.0
github.com/spf13/cobra v1.1.1
github.com/spf13/pflag v1.0.5
Expand All @@ -49,16 +50,16 @@ require (
google.golang.org/api v0.33.0
gopkg.in/ini.v1 v1.61.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.19.5
k8s.io/apiextensions-apiserver v0.19.5
k8s.io/apimachinery v0.19.5
k8s.io/cli-runtime v0.19.5
k8s.io/api v0.20.0
k8s.io/apiextensions-apiserver v0.20.0
k8s.io/apimachinery v0.20.0
k8s.io/cli-runtime v0.20.0
k8s.io/client-go v12.0.0+incompatible
k8s.io/cluster-registry v0.0.6
k8s.io/code-generator v0.19.5
k8s.io/code-generator v0.20.0
k8s.io/klog v1.0.0
k8s.io/kube-aggregator v0.19.5
k8s.io/kubectl v0.19.5
k8s.io/kube-aggregator v0.20.0
k8s.io/kubectl v0.20.0
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
sigs.k8s.io/cluster-api-provider-aws v0.0.0
sigs.k8s.io/cluster-api-provider-azure v0.0.0
Expand Down Expand Up @@ -101,7 +102,7 @@ replace (
)

// needed because otherwise v12.0.0 is picked up as a more recent version
replace k8s.io/client-go => k8s.io/client-go v0.19.5
replace k8s.io/client-go => k8s.io/client-go v0.20.0

// needed for fixing CVE-2020-29529
replace github.com/hashicorp/go-slug => github.com/hashicorp/go-slug v0.5.0
Loading