Skip to content

Remove deprecated APIs in group image.toolkit.fluxcd.io/v1beta2 #896

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
matheuscscp merged 1 commit into from
Jun 16, 2026
Merged

Remove deprecated APIs in group image.toolkit.fluxcd.io/v1beta2 #896

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
6 changes: 0 additions & 6 deletions PROJECT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,4 @@ resources:
- group: image
kind: ImagePolicy
version: v1
- group: image
kind: ImageRepository
version: v1beta2
- group: image
kind: ImagePolicy
version: v1beta2
version: "2"
7 changes: 3 additions & 4 deletions api/v1beta2/doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

// Package v1beta2 contains API types for the image API group, version
// v1beta2. These types are concerned with reflecting metadata from
// OCI image repositories into a cluster, so they can be consulted for
// e.g., automation.
// Package v1beta2 contains API types for the image v1beta2 API group
//
// Deprecated: v1beta2 is no longer supported, use v1 instead.
//
// +kubebuilder:object:generate=true
// +groupName=image.toolkit.fluxcd.io
Expand Down
8 changes: 1 addition & 7 deletions api/v1beta2/imagepolicy_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,14 +198,8 @@ func (in *ImagePolicy) SetConditions(conditions []metav1.Condition) {
}

// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
// +kubebuilder:resource:shortName=imgpol;imagepol
// +kubebuilder:deprecatedversion:warning="v1beta2 ImagePolicy is deprecated, upgrade to v1"
// +kubebuilder:printcolumn:name="Image",type=string,JSONPath=`.status.latestRef.name`
// +kubebuilder:printcolumn:name="Tag",type=string,JSONPath=`.status.latestRef.tag`
// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",description=""
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].message",description=""
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description=""
// +kubebuilder:skipversion

// ImagePolicy is the Schema for the imagepolicies API
type ImagePolicy struct {
Expand Down
9 changes: 1 addition & 8 deletions api/v1beta2/imagerepository_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,15 +212,8 @@ func (in ImageRepository) GetRequeueAfter() time.Duration {
}

// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
// +kubebuilder:resource:shortName=imgrepo;imagerepo
// +kubebuilder:deprecatedversion:warning="v1beta2 ImageRepository is deprecated, upgrade to v1"
// +kubebuilder:printcolumn:name="Image",type="string",JSONPath=".spec.image"
// +kubebuilder:printcolumn:name="Tags",type=string,JSONPath=`.status.lastScanResult.tagCount`
// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",description=""
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].message",description=""
// +kubebuilder:printcolumn:name="Last scan",type=string,JSONPath=`.status.lastScanResult.scanTime`,priority=1
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description=""
// +kubebuilder:skipversion

// ImageRepository is the Schema for the imagerepositories API
type ImageRepository struct {
Expand Down
285 changes: 0 additions & 285 deletions config/crd/bases/image.toolkit.fluxcd.io_imagepolicies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,288 +300,3 @@ spec:
storage: true
subresources:
status: {}
- additionalPrinterColumns:
- jsonPath: .status.latestRef.name
name: Image
type: string
- jsonPath: .status.latestRef.tag
name: Tag
type: string
- jsonPath: .status.conditions[?(@.type=="Ready")].status
name: Ready
type: string
- jsonPath: .status.conditions[?(@.type=="Ready")].message
name: Status
type: string
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
deprecated: true
deprecationWarning: v1beta2 ImagePolicy is deprecated, upgrade to v1
name: v1beta2
schema:
openAPIV3Schema:
description: ImagePolicy is the Schema for the imagepolicies API
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: |-
ImagePolicySpec defines the parameters for calculating the
ImagePolicy.
properties:
digestReflectionPolicy:
default: Never
description: |-
DigestReflectionPolicy governs the setting of the `.status.latestRef.digest` field.

Never: The digest field will always be set to the empty string.

IfNotPresent: The digest field will be set to the digest of the elected
latest image if the field is empty and the image did not change.

Always: The digest field will always be set to the digest of the elected
latest image.

Default: Never.
enum:
- Always
- IfNotPresent
- Never
type: string
filterTags:
description: |-
FilterTags enables filtering for only a subset of tags based on a set of
rules. If no rules are provided, all the tags from the repository will be
ordered and compared.
properties:
extract:
description: |-
Extract allows a capture group to be extracted from the specified regular
expression pattern, useful before tag evaluation.
type: string
pattern:
description: |-
Pattern specifies a regular expression pattern used to filter for image
tags.
type: string
type: object
imageRepositoryRef:
description: |-
ImageRepositoryRef points at the object specifying the image
being scanned
properties:
name:
description: Name of the referent.
type: string
namespace:
description: Namespace of the referent, when not specified it
acts as LocalObjectReference.
type: string
required:
- name
type: object
interval:
description: |-
Interval is the length of time to wait between
refreshing the digest of the latest tag when the
reflection policy is set to "Always".

Defaults to 10m.
pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$
type: string
policy:
description: |-
Policy gives the particulars of the policy to be followed in
selecting the most recent image
properties:
alphabetical:
description: Alphabetical set of rules to use for alphabetical
ordering of the tags.
properties:
order:
default: asc
description: |-
Order specifies the sorting order of the tags. Given the letters of the
alphabet as tags, ascending order would select Z, and descending order
would select A.
enum:
- asc
- desc
type: string
type: object
numerical:
description: Numerical set of rules to use for numerical ordering
of the tags.
properties:
order:
default: asc
description: |-
Order specifies the sorting order of the tags. Given the integer values
from 0 to 9 as tags, ascending order would select 9, and descending order
would select 0.
enum:
- asc
- desc
type: string
type: object
semver:
description: |-
SemVer gives a semantic version range to check against the tags
available.
properties:
range:
description: |-
Range gives a semver range for the image tag; the highest
version within the range that's a tag yields the latest image.
type: string
required:
- range
type: object
type: object
suspend:
description: |-
This flag tells the controller to suspend subsequent policy reconciliations.
It does not apply to already started reconciliations. Defaults to false.
type: boolean
required:
- imageRepositoryRef
- policy
type: object
x-kubernetes-validations:
- message: spec.interval is only accepted when spec.digestReflectionPolicy
is set to 'Always'
rule: '!has(self.interval) || (has(self.digestReflectionPolicy) && self.digestReflectionPolicy
== ''Always'')'
- message: spec.interval must be set when spec.digestReflectionPolicy
is set to 'Always'
rule: has(self.interval) || !has(self.digestReflectionPolicy) || self.digestReflectionPolicy
!= 'Always'
status:
default:
observedGeneration: -1
description: ImagePolicyStatus defines the observed state of ImagePolicy
properties:
conditions:
items:
description: Condition contains details for one aspect of the current
state of this API Resource.
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.
format: date-time
type: string
message:
description: |-
message is a human readable message indicating details about the transition.
This may be an empty string.
maxLength: 32768
type: string
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.
format: int64
minimum: 0
type: integer
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.
maxLength: 1024
minLength: 1
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
type: string
status:
description: status of the condition, one of True, False, Unknown.
enum:
- "True"
- "False"
- Unknown
type: string
type:
description: type of condition in CamelCase or in foo.example.com/CamelCase.
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])$
type: string
required:
- lastTransitionTime
- message
- reason
- status
- type
type: object
type: array
lastHandledReconcileAt:
description: |-
LastHandledReconcileAt holds the value of the most recent
reconcile request value, so a change of the annotation value
can be detected.
type: string
latestRef:
description: |-
LatestRef gives the first in the list of images scanned by
the image repository, when filtered and ordered according
to the policy.
properties:
digest:
description: Digest is the image's digest.
type: string
name:
description: Name is the bare image's name.
type: string
tag:
description: Tag is the image's tag.
type: string
required:
- name
- tag
type: object
observedGeneration:
format: int64
type: integer
observedPreviousRef:
description: |-
ObservedPreviousRef is the observed previous LatestRef. It is used
to keep track of the previous and current images.
properties:
digest:
description: Digest is the image's digest.
type: string
name:
description: Name is the bare image's name.
type: string
tag:
description: Tag is the image's tag.
type: string
required:
- name
- tag
type: object
type: object
type: object
served: true
storage: false
subresources:
status: {}
Loading
Loading