Merge pull request #805 from fluxcd/remove-v1beta1-api

Remove deprecated APIs in group `image.toolkit.fluxcd.io/v1beta1`

Author: stefanprodan

api/v1beta1/doc.go

@@ -14,10 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package v1beta1 contains API types for the image API group, version
-// v1beta1. These types are concerned with reflecting metadata from
-// OCI image repositories into a cluster, so they can be consulted for
-// e.g., automation.
+// Package v1beta1 contains API types for the image v1beta1 API group
+//
+// Deprecated: v1beta1 is no longer supported, use v1 instead.
 //
 // +kubebuilder:object:generate=true
 // +groupName=image.toolkit.fluxcd.io

api/v1beta1/imagepolicy_types.go

@@ -130,8 +130,7 @@ func SetImagePolicyReadiness(p *ImagePolicy, status metav1.ConditionStatus, reas
 }
 
 // +kubebuilder:object:root=true
-// +kubebuilder:subresource:status
-// +kubebuilder:printcolumn:name="LatestImage",type=string,JSONPath=`.status.latestImage`
+// +kubebuilder:skipversion
 
 // ImagePolicy is the Schema for the imagepolicies API
 type ImagePolicy struct {

api/v1beta1/imagerepository_types.go

@@ -149,9 +149,7 @@ func (in ImageRepository) GetTimeout() time.Duration {
 }
 
 // +kubebuilder:object:root=true
-// +kubebuilder:subresource:status
-// +kubebuilder:printcolumn:name="Last scan",type=string,JSONPath=`.status.lastScanResult.scanTime`
-// +kubebuilder:printcolumn:name="Tags",type=string,JSONPath=`.status.lastScanResult.tagCount`
+// +kubebuilder:skipversion
 
 // ImageRepository is the Schema for the imagerepositories API
 type ImageRepository struct {

config/crd/bases/image.toolkit.fluxcd.io_imagepolicies.yaml

@@ -17,198 +17,6 @@ spec:
     singular: imagepolicy
   scope: Namespaced
   versions:
-  - additionalPrinterColumns:
-    - jsonPath: .status.latestImage
-      name: LatestImage
-      type: string
-    name: v1beta1
-    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:
-              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
-              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
-            required:
-            - imageRepositoryRef
-            - policy
-            type: object
-          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
-              latestImage:
-                description: |-
-                  LatestImage gives the first in the list of images scanned by
-                  the image repository, when filtered and ordered according to
-                  the policy.
-                type: string
-              observedGeneration:
-                format: int64
-                type: integer
-            type: object
-        type: object
-    served: true
-    storage: false
-    subresources:
-      status: {}
   - additionalPrinterColumns:
     - jsonPath: .status.latestRef.name
       name: Image