Skip to content

[OCPNODE-1671] ImagePolicy uses byte format for base64 fields #1765

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
Feb 14, 2024
Merged

[OCPNODE-1671] ImagePolicy uses byte format for base64 fields #1765

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
4 changes: 4 additions & 0 deletions config/v1alpha1/0000_10_config-operator_01_clusterimagepolicy-CustomNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ spec:
description: fulcioCAData contains inline base64-encoded
data for the PEM format fulcio CA. fulcioCAData must
be at most 8192 characters.
format: byte
maxLength: 8192
type: string
fulcioSubject:
Expand Down Expand Up @@ -93,6 +94,7 @@ spec:
description: rekorKeyData contains inline base64-encoded
data for the PEM format from the Rekor public key. rekorKeyData
must be at most 8192 characters.
format: byte
maxLength: 8192
type: string
required:
Expand Down Expand Up @@ -120,12 +122,14 @@ spec:
description: keyData contains inline base64-encoded data
for the PEM format public key. KeyData must be at most
8192 characters.
format: byte
maxLength: 8192
type: string
rekorKeyData:
description: rekorKeyData contains inline base64-encoded
data for the PEM format from the Rekor public key. rekorKeyData
must be at most 8192 characters.
format: byte
maxLength: 8192
type: string
required:
Expand Down
4 changes: 4 additions & 0 deletions config/v1alpha1/0000_10_config-operator_01_clusterimagepolicy-TechPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ spec:
description: fulcioCAData contains inline base64-encoded
data for the PEM format fulcio CA. fulcioCAData must
be at most 8192 characters.
format: byte
maxLength: 8192
type: string
fulcioSubject:
Expand Down Expand Up @@ -93,6 +94,7 @@ spec:
description: rekorKeyData contains inline base64-encoded
data for the PEM format from the Rekor public key. rekorKeyData
must be at most 8192 characters.
format: byte
maxLength: 8192
type: string
required:
Expand Down Expand Up @@ -120,12 +122,14 @@ spec:
description: keyData contains inline base64-encoded data
for the PEM format public key. KeyData must be at most
8192 characters.
format: byte
maxLength: 8192
type: string
rekorKeyData:
description: rekorKeyData contains inline base64-encoded
data for the PEM format from the Rekor public key. rekorKeyData
must be at most 8192 characters.
format: byte
maxLength: 8192
type: string
required:
Expand Down
4 changes: 4 additions & 0 deletions config/v1alpha1/0000_10_config-operator_01_imagepolicy-CustomNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ spec:
description: fulcioCAData contains inline base64-encoded
data for the PEM format fulcio CA. fulcioCAData must
be at most 8192 characters.
format: byte
maxLength: 8192
type: string
fulcioSubject:
Expand Down Expand Up @@ -93,6 +94,7 @@ spec:
description: rekorKeyData contains inline base64-encoded
data for the PEM format from the Rekor public key. rekorKeyData
must be at most 8192 characters.
format: byte
maxLength: 8192
type: string
required:
Expand Down Expand Up @@ -120,12 +122,14 @@ spec:
description: keyData contains inline base64-encoded data
for the PEM format public key. KeyData must be at most
8192 characters.
format: byte
maxLength: 8192
type: string
rekorKeyData:
description: rekorKeyData contains inline base64-encoded
data for the PEM format from the Rekor public key. rekorKeyData
must be at most 8192 characters.
format: byte
maxLength: 8192
type: string
required:
Expand Down
4 changes: 4 additions & 0 deletions config/v1alpha1/0000_10_config-operator_01_imagepolicy-TechPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ spec:
description: fulcioCAData contains inline base64-encoded
data for the PEM format fulcio CA. fulcioCAData must
be at most 8192 characters.
format: byte
maxLength: 8192
type: string
fulcioSubject:
Expand Down Expand Up @@ -93,6 +94,7 @@ spec:
description: rekorKeyData contains inline base64-encoded
data for the PEM format from the Rekor public key. rekorKeyData
must be at most 8192 characters.
format: byte
maxLength: 8192
type: string
required:
Expand Down Expand Up @@ -120,12 +122,14 @@ spec:
description: keyData contains inline base64-encoded data
for the PEM format public key. KeyData must be at most
8192 characters.
format: byte
maxLength: 8192
type: string
rekorKeyData:
description: rekorKeyData contains inline base64-encoded
data for the PEM format from the Rekor public key. rekorKeyData
must be at most 8192 characters.
format: byte
maxLength: 8192
type: string
required:
Expand Down
8 changes: 4 additions & 4 deletions config/v1alpha1/types_image_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,12 @@ type PublicKey struct {
// KeyData must be at most 8192 characters.
// +kubebuilder:validation:Required
// +kubebuilder:validation:MaxLength=8192
KeyData string `json:"keyData"`
KeyData []byte `json:"keyData"`
// rekorKeyData contains inline base64-encoded data for the PEM format from the Rekor public key.
// rekorKeyData must be at most 8192 characters.
// +optional
// +kubebuilder:validation:MaxLength=8192
RekorKeyData string `json:"rekorKeyData,omitempty"`
RekorKeyData []byte `json:"rekorKeyData,omitempty"`
}

// FulcioCAWithRekor defines the root of trust based on the Fulcio certificate and the Rekor public key.
Expand All @@ -110,12 +110,12 @@ type FulcioCAWithRekor struct {
// fulcioCAData must be at most 8192 characters.
// +kubebuilder:validation:Required
// +kubebuilder:validation:MaxLength=8192
FulcioCAData string `json:"fulcioCAData"`
FulcioCAData []byte `json:"fulcioCAData"`
// rekorKeyData contains inline base64-encoded data for the PEM format from the Rekor public key.
// rekorKeyData must be at most 8192 characters.
// +kubebuilder:validation:Required
// +kubebuilder:validation:MaxLength=8192
RekorKeyData string `json:"rekorKeyData"`
RekorKeyData []byte `json:"rekorKeyData"`
// fulcioSubject specifies OIDC issuer and the email of the Fulcio authentication configuration.
// +kubebuilder:validation:Required
FulcioSubject PolicyFulcioSubject `json:"fulcioSubject,omitempty"`
Expand Down
24 changes: 22 additions & 2 deletions config/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

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

11 changes: 4 additions & 7 deletions openapi/generated_openapi/zz_generated.openapi.go
View file
Open in desktop

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

9 changes: 5 additions & 4 deletions openapi/openapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10917,7 +10917,7 @@
"fulcioCAData": {
"description": "fulcioCAData contains inline base64-encoded data for the PEM format fulcio CA. fulcioCAData must be at most 8192 characters.",
"type": "string",
"default": ""
"format": "byte"
},
"fulcioSubject": {
"description": "fulcioSubject specifies OIDC issuer and the email of the Fulcio authentication configuration.",
Expand All @@ -10927,7 +10927,7 @@
"rekorKeyData": {
"description": "rekorKeyData contains inline base64-encoded data for the PEM format from the Rekor public key. rekorKeyData must be at most 8192 characters.",
"type": "string",
"default": ""
"format": "byte"
}
}
},
Expand Down Expand Up @@ -11270,11 +11270,12 @@
"keyData": {
"description": "keyData contains inline base64-encoded data for the PEM format public key. KeyData must be at most 8192 characters.",
"type": "string",
"default": ""
"format": "byte"
},
"rekorKeyData": {
"description": "rekorKeyData contains inline base64-encoded data for the PEM format from the Rekor public key. rekorKeyData must be at most 8192 characters.",
"type": "string"
"type": "string",
"format": "byte"
}
}
},
Expand Down