diff --git a/go.mod b/go.mod
index 6dc5c27acacf73c6d27de209c8c54720fef01b30..78d2a6f198902d7ae04c6468568cc8b313b31afd 100644
--- a/go.mod
+++ b/go.mod
@@ -9,7 +9,7 @@ require (
github.com/google/uuid v1.1.2
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.17.0
- github.com/openshift/api v0.0.0-20211222145011-3bf13cf5081a
+ github.com/openshift/api v0.0.0-20220119132100-58db72a40994
github.com/openshift/client-go v0.0.0-20211209144617-7385dd6338e3
github.com/openshift/library-go v0.0.0-20211220195323-eca2c467c492
github.com/operator-framework/operator-sdk v0.5.1-0.20190301204940-c2efe6f74e7b
diff --git a/go.sum b/go.sum
index 607279f19b8c545fa3c68870d6c4b0027fe89774..1d596cbad37cfa34771185eafd6c92185803bf87 100644
--- a/go.sum
+++ b/go.sum
@@ -535,8 +535,8 @@ github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQ
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
github.com/openshift/api v0.0.0-20211209135129-c58d9f695577/go.mod h1:DoslCwtqUpr3d/gsbq4ZlkaMEdYqKxuypsDjorcHhME=
-github.com/openshift/api v0.0.0-20211222145011-3bf13cf5081a h1:lJQ6mKlpoUn19dmaLY/ldRm2Mwi+WtTJ2MD6bteLa4o=
-github.com/openshift/api v0.0.0-20211222145011-3bf13cf5081a/go.mod h1:F/eU6jgr6Q2VhMu1mSpMmygxAELd7+BUxs3NHZ25jV4=
+github.com/openshift/api v0.0.0-20220119132100-58db72a40994 h1:TVbq0C9TBAjoy8OkFrSdA7BS1Ej7FsJKkUfs7LcHYgg=
+github.com/openshift/api v0.0.0-20220119132100-58db72a40994/go.mod h1:F/eU6jgr6Q2VhMu1mSpMmygxAELd7+BUxs3NHZ25jV4=
github.com/openshift/build-machinery-go v0.0.0-20210712174854-1bb7fd1518d3/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
github.com/openshift/client-go v0.0.0-20211209144617-7385dd6338e3 h1:SG1aqwleU6bGD0X4mhkTNupjVnByMYYuW4XbnCPavQU=
diff --git a/vendor/github.com/openshift/api/config/v1/types_feature.go b/vendor/github.com/openshift/api/config/v1/types_feature.go
index 149cf8e6f60f8079951bcbfc8e7d5c249564b021..581891558b21227bd5d17d49e513b0d8643c3c7b 100644
--- a/vendor/github.com/openshift/api/config/v1/types_feature.go
+++ b/vendor/github.com/openshift/api/config/v1/types_feature.go
@@ -121,7 +121,6 @@ var FeatureSets = map[FeatureSet]*FeatureGateEnabledDisabled{
with("CSIMigrationAzureFile"). // sig-storage, fbertina, Kubernetes feature gate
with("CSIMigrationvSphere"). // sig-storage, fbertina, Kubernetes feature gate
with("ExternalCloudProvider"). // sig-cloud-provider, jspeed, OCP specific
- with("InsightsOperatorPullingSCA"). // insights-operator/ccx, tremes, OCP specific
with("CSIDriverSharedResource"). // sig-build, adkaplan, OCP specific
with("BuildCSIVolumes"). // sig-build, adkaplan, OCP specific
with("NodeSwap"). // sig-node, ehashman, Kubernetes feature gate
@@ -151,6 +150,12 @@ var defaultFeatures = &FeatureGateEnabledDisabled{
},
Disabled: []string{
"LegacyNodeRoleBehavior", // sig-scheduling, ccoleman
+ "CSIMigrationAWS", // sig-storage, jsafrane
+ "CSIMigrationOpenStack", // sig-storage, jsafrane
+ "CSIMigrationGCE", // sig-storage, jsafrane
+ "CSIMigrationAzureDisk", // sig-storage, jsafrane
+ "CSIMigrationAzureFile", // sig-storage, jsafrane
+ "CSIMigrationvSphere", // sig-storage, jsafrane
},
}
diff --git a/vendor/github.com/openshift/api/helm/v1beta1/0000_10-helm-chart-repository.crd.yaml b/vendor/github.com/openshift/api/helm/v1beta1/0000_10-helm-chart-repository.crd.yaml
index 3280637836862029a4aa3c838df7b3dbb247f01d..aa3ff6644b2468f4072fd333d3ac752ddb09e197 100644
--- a/vendor/github.com/openshift/api/helm/v1beta1/0000_10-helm-chart-repository.crd.yaml
+++ b/vendor/github.com/openshift/api/helm/v1beta1/0000_10-helm-chart-repository.crd.yaml
@@ -69,7 +69,7 @@ spec:
maxLength: 2048
minLength: 1
disabled:
- description: If set to true, disable the repo usage in the cluster
+ description: If set to true, disable the repo usage in the cluster/namespace
type: boolean
name:
description: Optional associated human readable repository name, it can be used by UI for displaying purposes
diff --git a/vendor/github.com/openshift/api/helm/v1beta1/0000_10-project-helm-chart-repository.crd.yaml b/vendor/github.com/openshift/api/helm/v1beta1/0000_10-project-helm-chart-repository.crd.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d039edaa651c33660cfbebd2d1b94740c41ed7f1
--- /dev/null
+++ b/vendor/github.com/openshift/api/helm/v1beta1/0000_10-project-helm-chart-repository.crd.yaml
@@ -0,0 +1,130 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+ annotations:
+ api-approved.openshift.io: https://github.com/openshift/api/pull/1084
+ include.release.openshift.io/ibm-cloud-managed: "true"
+ include.release.openshift.io/self-managed-high-availability: "true"
+ include.release.openshift.io/single-node-developer: "true"
+ name: projecthelmchartrepositories.helm.openshift.io
+spec:
+ group: helm.openshift.io
+ names:
+ kind: ProjectHelmChartRepository
+ listKind: ProjectHelmChartRepositoryList
+ plural: projecthelmchartrepositories
+ singular: projecthelmchartrepository
+ scope: Namespaced
+ versions:
+ - name: v1beta1
+ served: true
+ storage: true
+ subresources:
+ status: {}
+ schema:
+ openAPIV3Schema:
+ description: "ProjectHelmChartRepository holds namespace-wide configuration for proxied Helm chart repository \n Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer)."
+ type: object
+ required:
+ - spec
+ properties:
+ apiVersion:
+ description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+ type: string
+ kind:
+ description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+ type: string
+ metadata:
+ type: object
+ spec:
+ description: spec holds user settable values for configuration
+ type: object
+ properties:
+ connectionConfig:
+ description: Required configuration for connecting to the chart repo
+ type: object
+ properties:
+ ca:
+ description: ca is an optional reference to a config map by name containing the PEM-encoded CA bundle. It is used as a trust anchor to validate the TLS certificate presented by the remote server. The key "ca-bundle.crt" is used to locate the data. If empty, the default system roots are used. The namespace for this config map is openshift-config.
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced config map
+ type: string
+ tlsClientConfig:
+ description: tlsClientConfig is an optional reference to a secret by name that contains the PEM-encoded TLS client certificate and private key to present when connecting to the server. The key "tls.crt" is used to locate the client certificate. The key "tls.key" is used to locate the private key. The namespace for this secret is openshift-config.
+ type: object
+ required:
+ - name
+ properties:
+ name:
+ description: name is the metadata.name of the referenced secret
+ type: string
+ url:
+ description: Chart repository URL
+ type: string
+ maxLength: 2048
+ pattern: ^https?:\/\/
+ description:
+ description: Optional human readable repository description, it can be used by UI for displaying purposes
+ type: string
+ maxLength: 2048
+ minLength: 1
+ disabled:
+ description: If set to true, disable the repo usage in the cluster/namespace
+ type: boolean
+ name:
+ description: Optional associated human readable repository name, it can be used by UI for displaying purposes
+ type: string
+ maxLength: 100
+ minLength: 1
+ status:
+ description: Observed status of the repository within the namespace..
+ type: object
+ properties:
+ conditions:
+ description: conditions is a list of conditions and their statuses
+ type: array
+ items:
+ description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
+ type: object
+ required:
+ - lastTransitionTime
+ - message
+ - reason
+ - status
+ - type
+ properties:
+ lastTransitionTime:
+ description: lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
+ type: string
+ format: date-time
+ message:
+ description: message is a human readable message indicating details about the transition. This may be an empty string.
+ type: string
+ maxLength: 32768
+ observedGeneration:
+ description: observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance.
+ type: integer
+ format: int64
+ minimum: 0
+ reason:
+ description: reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty.
+ type: string
+ maxLength: 1024
+ minLength: 1
+ pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+ status:
+ description: status of the condition, one of True, False, Unknown.
+ type: string
+ enum:
+ - "True"
+ - "False"
+ - Unknown
+ type:
+ description: type of condition in CamelCase or in foo.example.com/CamelCase. --- Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+ type: string
+ maxLength: 316
+ pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
diff --git a/vendor/github.com/openshift/api/helm/v1beta1/register.go b/vendor/github.com/openshift/api/helm/v1beta1/register.go
index 890474569a15933613a3e0d1a8874dd99051a75e..1301eb008ed26a26dd29932860928a4983c57aa1 100644
--- a/vendor/github.com/openshift/api/helm/v1beta1/register.go
+++ b/vendor/github.com/openshift/api/helm/v1beta1/register.go
@@ -32,6 +32,8 @@ func addKnownTypes(scheme *runtime.Scheme) error {
scheme.AddKnownTypes(GroupVersion,
&HelmChartRepository{},
&HelmChartRepositoryList{},
+ &ProjectHelmChartRepository{},
+ &ProjectHelmChartRepositoryList{},
)
metav1.AddToGroupVersion(scheme, GroupVersion)
return nil
diff --git a/vendor/github.com/openshift/api/helm/v1beta1/types_helm.go b/vendor/github.com/openshift/api/helm/v1beta1/types_helm_chart_repository.go
similarity index 97%
rename from vendor/github.com/openshift/api/helm/v1beta1/types_helm.go
rename to vendor/github.com/openshift/api/helm/v1beta1/types_helm_chart_repository.go
index 1b4e69dee8fb65f54ec4d119a643f85d99b9a880..4c963b6244471ad7fda844e5ff697171055444d0 100644
--- a/vendor/github.com/openshift/api/helm/v1beta1/types_helm.go
+++ b/vendor/github.com/openshift/api/helm/v1beta1/types_helm_chart_repository.go
@@ -41,7 +41,7 @@ type HelmChartRepositoryList struct {
// Helm chart repository exposed within the cluster
type HelmChartRepositorySpec struct {
- // If set to true, disable the repo usage in the cluster
+ // If set to true, disable the repo usage in the cluster/namespace
// +optional
Disabled bool `json:"disabled,omitempty"`
diff --git a/vendor/github.com/openshift/api/helm/v1beta1/types_project_helm_chart_repository.go b/vendor/github.com/openshift/api/helm/v1beta1/types_project_helm_chart_repository.go
new file mode 100644
index 0000000000000000000000000000000000000000..7d199a709677c795d615524c17a2f3adbf80fd66
--- /dev/null
+++ b/vendor/github.com/openshift/api/helm/v1beta1/types_project_helm_chart_repository.go
@@ -0,0 +1,37 @@
+package v1beta1
+
+import (
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+// +kubebuilder:plural=projecthelmchartrepositories
+
+// ProjectHelmChartRepository holds namespace-wide configuration for proxied Helm chart repository
+//
+// Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).
+// +openshift:compatibility-gen:level=2
+type ProjectHelmChartRepository struct {
+ metav1.TypeMeta `json:",inline"`
+ metav1.ObjectMeta `json:"metadata,omitempty"`
+
+ // spec holds user settable values for configuration
+ // +kubebuilder:validation:Required
+ // +required
+ Spec HelmChartRepositorySpec `json:"spec"`
+
+ // Observed status of the repository within the namespace..
+ // +optional
+ Status HelmChartRepositoryStatus `json:"status"`
+}
+
+// Compatibility level 2: Stable within a major release for a minimum of 9 months or 3 minor releases (whichever is longer).
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+// +openshift:compatibility-gen:level=2
+type ProjectHelmChartRepositoryList struct {
+ metav1.TypeMeta `json:",inline"`
+ metav1.ListMeta `json:"metadata"`
+
+ Items []ProjectHelmChartRepository `json:"items"`
+}
diff --git a/vendor/github.com/openshift/api/helm/v1beta1/zz_generated.deepcopy.go b/vendor/github.com/openshift/api/helm/v1beta1/zz_generated.deepcopy.go
index f656c695226fb12a033f9f572a7802565601514a..483dc4efcddd95a1ceb2ecc32c0c511d904a48f6 100644
--- a/vendor/github.com/openshift/api/helm/v1beta1/zz_generated.deepcopy.go
+++ b/vendor/github.com/openshift/api/helm/v1beta1/zz_generated.deepcopy.go
@@ -128,3 +128,64 @@ func (in *HelmChartRepositoryStatus) DeepCopy() *HelmChartRepositoryStatus {
in.DeepCopyInto(out)
return out
}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ProjectHelmChartRepository) DeepCopyInto(out *ProjectHelmChartRepository) {
+ *out = *in
+ out.TypeMeta = in.TypeMeta
+ in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+ out.Spec = in.Spec
+ in.Status.DeepCopyInto(&out.Status)
+ return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProjectHelmChartRepository.
+func (in *ProjectHelmChartRepository) DeepCopy() *ProjectHelmChartRepository {
+ if in == nil {
+ return nil
+ }
+ out := new(ProjectHelmChartRepository)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *ProjectHelmChartRepository) DeepCopyObject() runtime.Object {
+ if c := in.DeepCopy(); c != nil {
+ return c
+ }
+ return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ProjectHelmChartRepositoryList) DeepCopyInto(out *ProjectHelmChartRepositoryList) {
+ *out = *in
+ out.TypeMeta = in.TypeMeta
+ in.ListMeta.DeepCopyInto(&out.ListMeta)
+ if in.Items != nil {
+ in, out := &in.Items, &out.Items
+ *out = make([]ProjectHelmChartRepository, len(*in))
+ for i := range *in {
+ (*in)[i].DeepCopyInto(&(*out)[i])
+ }
+ }
+ return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProjectHelmChartRepositoryList.
+func (in *ProjectHelmChartRepositoryList) DeepCopy() *ProjectHelmChartRepositoryList {
+ if in == nil {
+ return nil
+ }
+ out := new(ProjectHelmChartRepositoryList)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *ProjectHelmChartRepositoryList) DeepCopyObject() runtime.Object {
+ if c := in.DeepCopy(); c != nil {
+ return c
+ }
+ return nil
+}
diff --git a/vendor/github.com/openshift/api/machine/v1beta1/0000_10_machine.crd.yaml b/vendor/github.com/openshift/api/machine/v1beta1/0000_10_machine.crd.yaml
index eebdf90c82e49531deeb204a68484f90ddf8d5b9..0b5cab53a3b8447fe7632f0c8b06d8cdd195b24e 100644
--- a/vendor/github.com/openshift/api/machine/v1beta1/0000_10_machine.crd.yaml
+++ b/vendor/github.com/openshift/api/machine/v1beta1/0000_10_machine.crd.yaml
@@ -95,6 +95,9 @@ spec:
type: string
maxLength: 512
minLength: 3
+ x-kubernetes-list-map-keys:
+ - name
+ x-kubernetes-list-type: map
preTerminate:
description: PreTerminate hooks prevent the machine from being terminated. PreTerminate hooks be actioned after the Machine has been drained.
type: array
@@ -116,6 +119,9 @@ spec:
type: string
maxLength: 512
minLength: 3
+ x-kubernetes-list-map-keys:
+ - name
+ x-kubernetes-list-type: map
metadata:
description: ObjectMeta will autopopulate the Node created. Use this to indicate what labels, annotations, name prefix, etc., should be used when creating the Node.
type: object
diff --git a/vendor/github.com/openshift/api/machine/v1beta1/0000_10_machineset.crd.yaml b/vendor/github.com/openshift/api/machine/v1beta1/0000_10_machineset.crd.yaml
index d61e4ed3c42351ece2435a3bf0dd23b03be0ece3..de27d2323f8026394e61b3b988cd31ad44d08023 100644
--- a/vendor/github.com/openshift/api/machine/v1beta1/0000_10_machineset.crd.yaml
+++ b/vendor/github.com/openshift/api/machine/v1beta1/0000_10_machineset.crd.yaml
@@ -188,6 +188,9 @@ spec:
type: string
maxLength: 512
minLength: 3
+ x-kubernetes-list-map-keys:
+ - name
+ x-kubernetes-list-type: map
preTerminate:
description: PreTerminate hooks prevent the machine from being terminated. PreTerminate hooks be actioned after the Machine has been drained.
type: array
@@ -209,6 +212,9 @@ spec:
type: string
maxLength: 512
minLength: 3
+ x-kubernetes-list-map-keys:
+ - name
+ x-kubernetes-list-type: map
metadata:
description: ObjectMeta will autopopulate the Node created. Use this to indicate what labels, annotations, name prefix, etc., should be used when creating the Node.
type: object
diff --git a/vendor/github.com/openshift/api/machine/v1beta1/types_machine.go b/vendor/github.com/openshift/api/machine/v1beta1/types_machine.go
index 91e9d32dc09194389fa519f36a007d2e9cc5552d..6cbc07f89380ed1867157cb3c3ce55e2d9c06013 100644
--- a/vendor/github.com/openshift/api/machine/v1beta1/types_machine.go
+++ b/vendor/github.com/openshift/api/machine/v1beta1/types_machine.go
@@ -204,11 +204,15 @@ type MachineSpec struct {
type LifecycleHooks struct {
// PreDrain hooks prevent the machine from being drained.
// This also blocks further lifecycle events, such as termination.
+ // +listType=map
+ // +listMapKey=name
// +optional
PreDrain []LifecycleHook `json:"preDrain,omitempty"`
// PreTerminate hooks prevent the machine from being terminated.
// PreTerminate hooks be actioned after the Machine has been drained.
+ // +listType=map
+ // +listMapKey=name
// +optional
PreTerminate []LifecycleHook `json:"preTerminate,omitempty"`
}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index a6434d6da15fa2c574bc2753cd7b0a0053d2fbdd..68e335667e25cc771fc56cf2c3a781e24371c4a3 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -187,7 +187,7 @@ github.com/onsi/gomega/matchers/support/goraph/edge
github.com/onsi/gomega/matchers/support/goraph/node
github.com/onsi/gomega/matchers/support/goraph/util
github.com/onsi/gomega/types
-# github.com/openshift/api v0.0.0-20211222145011-3bf13cf5081a
+# github.com/openshift/api v0.0.0-20220119132100-58db72a40994
## explicit; go 1.16
github.com/openshift/api
github.com/openshift/api/apiserver