Skip to content

OCPNODE-2096: Add ClusterImagePolicy to the list of valid config manifests #3894

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
Apr 19, 2024
Merged

OCPNODE-2096: Add ClusterImagePolicy to the list of valid config manifests #3894

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
1 change: 1 addition & 0 deletions api/hypershift/v1beta1/nodepool_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ type NodePoolSpec struct {
// KubeletConfig
// ContainerRuntimeConfig
// MachineConfig
// ClusterImagePolicy
// ImageContentSourcePolicy
// or
// ImageDigestMirrorSet
Expand Down
1 change: 1 addition & 0 deletions cmd/install/assets/hypershift-operator/hypershift.openshift.io_nodepools.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1230,6 +1230,7 @@ spec:
KubeletConfig
ContainerRuntimeConfig
MachineConfig
ClusterImagePolicy
ImageContentSourcePolicy
or
ImageDigestMirrorSet
Expand Down
2 changes: 2 additions & 0 deletions docs/content/reference/api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,6 +749,7 @@ JSON or YAML of a serialized Resource for machineconfiguration.openshift.io:
KubeletConfig
ContainerRuntimeConfig
MachineConfig
ClusterImagePolicy
ImageContentSourcePolicy
or
ImageDigestMirrorSet</p>
Expand Down Expand Up @@ -6657,6 +6658,7 @@ JSON or YAML of a serialized Resource for machineconfiguration.openshift.io:
KubeletConfig
ContainerRuntimeConfig
MachineConfig
ClusterImagePolicy
ImageContentSourcePolicy
or
ImageDigestMirrorSet</p>
Expand Down
1 change: 1 addition & 0 deletions hack/app-sre/saas_template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56532,6 +56532,7 @@ objects:
KubeletConfig
ContainerRuntimeConfig
MachineConfig
ClusterImagePolicy
ImageContentSourcePolicy
or
ImageDigestMirrorSet
Expand Down
3 changes: 3 additions & 0 deletions hypershift-operator/controllers/nodepool/nodepool_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"github.com/go-logr/logr"
"github.com/google/uuid"
configv1 "github.com/openshift/api/config/v1"
configv1alpha1 "github.com/openshift/api/config/v1alpha1"
"github.com/openshift/api/operator/v1alpha1"
agentv1 "github.com/openshift/cluster-api-provider-agent/api/v1beta1"
performanceprofilev2 "github.com/openshift/cluster-node-tuning-operator/pkg/apis/performanceprofile/v2"
Expand Down Expand Up @@ -2139,6 +2140,7 @@ func defaultAndValidateConfigManifest(manifest []byte) ([]byte, error) {
_ = mcfgv1.Install(scheme)
_ = v1alpha1.Install(scheme)
_ = configv1.Install(scheme)
_ = configv1alpha1.Install(scheme)

yamlSerializer := serializer.NewSerializerWithOptions(
serializer.DefaultMetaFactory, scheme, scheme,
Expand All @@ -2159,6 +2161,7 @@ func defaultAndValidateConfigManifest(manifest []byte) ([]byte, error) {
}
case *v1alpha1.ImageContentSourcePolicy:
case *configv1.ImageDigestMirrorSet:
case *configv1alpha1.ClusterImagePolicy:
case *mcfgv1.KubeletConfig:
obj.Spec.MachineConfigPoolSelector = &metav1.LabelSelector{
MatchLabels: map[string]string{
Expand Down
1 change: 1 addition & 0 deletions vendor/github.com/openshift/hypershift/api/hypershift/v1beta1/nodepool_types.go
View file
Open in desktop

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