Skip to content

OCPNODE-2438: bump API and update CRD manifests #4480

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-bot merged 1 commit into from
Jul 24, 2024
Merged

OCPNODE-2438: bump API and update CRD manifests #4480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ require (
github.com/google/renameio v0.1.0
github.com/imdario/mergo v0.3.13
github.com/opencontainers/go-digest v1.0.0
github.com/openshift/api v0.0.0-20240715101244-b0adfa1f6357
github.com/openshift/api v0.0.0-20240722135205-ae4f370f361f
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87
github.com/openshift/library-go v0.0.0-20240607134135-aed018c215a1
github.com/openshift/runtime-utils v0.0.0-20230921210328-7bdb5b9c177b
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,8 +595,8 @@ github.com/opencontainers/runc v1.1.12 h1:BOIssBaW1La0/qbNZHXOOa71dZfZEQOzW7dqQf
github.com/opencontainers/runc v1.1.12/go.mod h1:S+lQwSfncpBha7XTy/5lBwWgm5+y5Ma/O44Ekby9FK8=
github.com/opencontainers/runtime-spec v1.1.0 h1:HHUyrt9mwHUjtasSbXSMvs4cyFxh+Bll4AjJ9odEGpg=
github.com/opencontainers/runtime-spec v1.1.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
github.com/openshift/api v0.0.0-20240715101244-b0adfa1f6357 h1:yp8QH1cSR7zynJlJMdluuD/QEGxY980uV1cooF2snio=
github.com/openshift/api v0.0.0-20240715101244-b0adfa1f6357/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
github.com/openshift/api v0.0.0-20240722135205-ae4f370f361f h1:B+uJ4LmjO+qwMTZP2YhlpMziMPD4MD1++WdCAV2y+GI=
github.com/openshift/api v0.0.0-20240722135205-ae4f370f361f/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87 h1:JtLhaGpSEconE+1IKmIgCOof/Len5ceG6H1pk43yv5U=
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87/go.mod h1:3IPD4U0qyovZS4EFady2kqY32m8lGcbs/Wx+yprg9z8=
github.com/openshift/kube-openapi v0.0.0-20230816122517-ffc8f001abb0 h1:GPlAy197Jkr+D0T2FNWanamraTdzS/r9ZkT29lxvHaA=
Expand Down
16 changes: 10 additions & 6 deletions install/0000_10_config-operator_01_clusterimagepolicies-CustomNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,12 +282,16 @@ spec:
with `*.`, for matching all subdomains (not including a port number).
Wildcards are only supported for subdomain matching, and may not
be used in the middle of the host, i.e. *.example.com is a valid
case, but example*.*.com is not. Please be aware that the scopes
should not be nested under the repositories of OpenShift Container
Platform images. If configured, the policies for OpenShift Container
Platform repositories will not be in effect. For additional details
about the format, please refer to the document explaining the docker
transport field, which can be found at: https://github.com/containers/image/blob/main/docs/containers-policy.json.5.md#docker'
case, but example*.*.com is not. If multiple scopes match a given
image, only the policy requirements for the most specific scope
apply. The policy requirements for more general scopes are ignored.
In addition to setting a policy appropriate for your own deployed
applications, make sure that a policy on the OpenShift image repositories
quay.io/openshift-release-dev/ocp-release, quay.io/openshift-release-dev/ocp-v4.0-art-dev
(or on a more general scope) allows deployment of the OpenShift
images required for cluster operation. For additional details about
the format, please refer to the document explaining the docker transport
field, which can be found at: https://github.com/containers/image/blob/main/docs/containers-policy.json.5.md#docker'
items:
maxLength: 512
type: string
Expand Down
16 changes: 10 additions & 6 deletions install/0000_10_config-operator_01_clusterimagepolicies-DevPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,12 +282,16 @@ spec:
with `*.`, for matching all subdomains (not including a port number).
Wildcards are only supported for subdomain matching, and may not
be used in the middle of the host, i.e. *.example.com is a valid
case, but example*.*.com is not. Please be aware that the scopes
should not be nested under the repositories of OpenShift Container
Platform images. If configured, the policies for OpenShift Container
Platform repositories will not be in effect. For additional details
about the format, please refer to the document explaining the docker
transport field, which can be found at: https://github.com/containers/image/blob/main/docs/containers-policy.json.5.md#docker'
case, but example*.*.com is not. If multiple scopes match a given
image, only the policy requirements for the most specific scope
apply. The policy requirements for more general scopes are ignored.
In addition to setting a policy appropriate for your own deployed
applications, make sure that a policy on the OpenShift image repositories
quay.io/openshift-release-dev/ocp-release, quay.io/openshift-release-dev/ocp-v4.0-art-dev
(or on a more general scope) allows deployment of the OpenShift
images required for cluster operation. For additional details about
the format, please refer to the document explaining the docker transport
field, which can be found at: https://github.com/containers/image/blob/main/docs/containers-policy.json.5.md#docker'
items:
maxLength: 512
type: string
Expand Down
16 changes: 10 additions & 6 deletions install/0000_10_config-operator_01_clusterimagepolicies-TechPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,12 +282,16 @@ spec:
with `*.`, for matching all subdomains (not including a port number).
Wildcards are only supported for subdomain matching, and may not
be used in the middle of the host, i.e. *.example.com is a valid
case, but example*.*.com is not. Please be aware that the scopes
should not be nested under the repositories of OpenShift Container
Platform images. If configured, the policies for OpenShift Container
Platform repositories will not be in effect. For additional details
about the format, please refer to the document explaining the docker
transport field, which can be found at: https://github.com/containers/image/blob/main/docs/containers-policy.json.5.md#docker'
case, but example*.*.com is not. If multiple scopes match a given
image, only the policy requirements for the most specific scope
apply. The policy requirements for more general scopes are ignored.
In addition to setting a policy appropriate for your own deployed
applications, make sure that a policy on the OpenShift image repositories
quay.io/openshift-release-dev/ocp-release, quay.io/openshift-release-dev/ocp-v4.0-art-dev
(or on a more general scope) allows deployment of the OpenShift
images required for cluster operation. For additional details about
the format, please refer to the document explaining the docker transport
field, which can be found at: https://github.com/containers/image/blob/main/docs/containers-policy.json.5.md#docker'
items:
maxLength: 512
type: string
Expand Down
1 change: 1 addition & 0 deletions install/0000_80_machine-config_01_kubeletconfigs.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
minTLSVersion:
description: "minTLSVersion is used to specify the minimal
version of the TLS protocol that is negotiated during the
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/openshift/api/config/v1alpha1/types_cluster_image_policy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/openshift/api/config/v1alpha1/types_image_policy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions vendor/github.com/openshift/api/config/v1alpha1/zz_generated.featuregated-crd-manifests.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions vendor/github.com/openshift/api/features.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 6 additions & 12 deletions vendor/github.com/openshift/api/features/features.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,7 +962,7 @@ github.com/opencontainers/runc/libcontainer/user
# github.com/opencontainers/runtime-spec v1.1.0
## explicit
github.com/opencontainers/runtime-spec/specs-go
# github.com/openshift/api v0.0.0-20240715101244-b0adfa1f6357
# github.com/openshift/api v0.0.0-20240722135205-ae4f370f361f
## explicit; go 1.22.0
github.com/openshift/api
github.com/openshift/api/annotations
Expand Down