Skip to content
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.

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

✨ Update CRDs to v1alpha2 #336

Merged
merged 1 commit into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ run: ansible-operator ## Run against the configured Kubernetes cluster in ~/.kub
$(ANSIBLE_OPERATOR) run

TARGET_PLATFORMS ?= linux/${TARGET_ARCH}
CONTAINER_BUILDARGS ?= --build-arg OPERATOR_SDK_VERSION=v1.28.1
CONTAINER_BUILDARGS ?= --build-arg OPERATOR_SDK_VERSION=v1.34.2
.PHONY: docker-build
docker-build: ## Build docker image with the manager.
ifeq ($(CONTAINER_RUNTIME), podman)
Expand Down
15 changes: 10 additions & 5 deletions bundle/manifests/konveyor-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
alm-examples: |-
[
{
"apiVersion": "tackle.konveyor.io/v1alpha1",
"apiVersion": "tackle.konveyor.io/v1alpha2",
"kind": "Tackle",
"metadata": {
"name": "tackle",
Expand All @@ -20,7 +20,7 @@ metadata:
categories: Modernization & Migration
certified: "false"
containerImage: quay.io/konveyor/tackle2-operator:latest
createdAt: "2024-06-07T14:45:46Z"
createdAt: "2024-06-17T20:49:11Z"
description: Konveyor is an open-source application modernization platform that
helps organizations safely and predictably modernize applications to Kubernetes
at scale.
Expand Down Expand Up @@ -67,22 +67,27 @@ spec:
displayName: Addon
kind: Addon
name: addons.tackle.konveyor.io
version: v1alpha1
version: v1alpha2
- description: Tackle Extension
displayName: Extension
kind: Extension
name: extensions.tackle.konveyor.io
version: v1alpha1
version: v1alpha2
- description: Tackle
displayName: Tackle
kind: Tackle
name: tackles.tackle.konveyor.io
version: v1alpha1
- description: Tackle
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems if 'served' is true for a version then make bundle will generate an entry here. I tested this by changing served to false for tackles and we ended up with only v1alpha2 instead of both.

displayName: Tackle
kind: Tackle
name: tackles.tackle.konveyor.io
version: v1alpha2
- description: Tackle Task
displayName: Task
kind: Task
name: tasks.tackle.konveyor.io
version: v1alpha1
version: v1alpha2
description: |
Konveyor is an open-source application modernization platform that helps organizations safely and predictably modernize applications to new technologies, with an initial focus on accelerating the adoption of legacy applications to Kubernetes.

Expand Down
113 changes: 105 additions & 8 deletions bundle/manifests/tackle.konveyor.io_addons.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,79 @@ spec:
singular: addon
scope: Namespaced
versions:
- additionalPrinterColumns:
- jsonPath: .status.conditions[?(@.type=='Ready')].status
name: READY
type: string
- jsonPath: .metadata.creationTimestamp
name: AGE
type: date
name: v1alpha1
- name: v1alpha1
schema:
openAPIV3Schema:
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: AddonSpec defines the desired state of Addon
properties:
image:
description: Addon fqin.
type: string
imagePullPolicy:
default: IfNotPresent
description: ImagePullPolicy an optional image pull policy.
enum:
- IfNotPresent
- Always
- Never
type: string
resources:
description: Resource requirements.
properties:
limits:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: 'Limits describes the maximum amount of compute resources
allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: 'Requests describes the minimum amount of compute
resources required. If Requests is omitted for a container,
it defaults to Limits if that is explicitly specified, otherwise
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object
type: object
required:
- image
type: object
status:
description: AddonStatus defines the observed state of Addon
properties:
observedGeneration:
description: The most recent generation observed by the controller.
format: int64
type: integer
type: object
type: object
served: false
storage: false
subresources:
status: {}
- name: v1alpha2
schema:
openAPIV3Schema:
properties:
Expand Down Expand Up @@ -1238,10 +1303,42 @@ spec:
required:
- name
type: object
image:
description: 'Deprecated: Addon is deprecated.'
type: string
imagePullPolicy:
description: 'Deprecated: ImagePullPolicy is deprecated.'
type: string
metadata:
description: Metadata details.
type: object
x-kubernetes-preserve-unknown-fields: true
resources:
description: 'Deprecated: Resources is deprecated.'
properties:
limits:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: 'Limits describes the maximum amount of compute resources
allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: 'Requests describes the minimum amount of compute
resources required. If Requests is omitted for a container,
it defaults to Limits if that is explicitly specified, otherwise
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object
type: object
selector:
description: Selector
type: string
Expand Down
30 changes: 22 additions & 8 deletions bundle/manifests/tackle.konveyor.io_extensions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,28 @@ spec:
singular: extension
scope: Namespaced
versions:
- additionalPrinterColumns:
- jsonPath: .status.conditions[?(@.type=='Ready')].status
name: READY
type: string
- jsonPath: .metadata.creationTimestamp
name: AGE
type: date
name: v1alpha1
- name: v1alpha1
schema:
openAPIV3Schema:
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
type: object
served: false
storage: false
subresources:
status: {}
- name: v1alpha2
schema:
openAPIV3Schema:
properties:
Expand Down
38 changes: 35 additions & 3 deletions bundle/manifests/tackle.konveyor.io_tackles.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.10.0
creationTimestamp: null
name: tackles.tackle.konveyor.io
spec:
Expand All @@ -15,7 +17,7 @@ spec:
- name: v1alpha1
schema:
openAPIV3Schema:
description: Tackle is the Schema for the tackles API
description: Tackle defines a tackle application.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
Expand All @@ -30,11 +32,41 @@ spec:
metadata:
type: object
spec:
description: Spec defines the desired state of Tackle
description: Spec defines the desired state of the resource.
type: object
x-kubernetes-preserve-unknown-fields: true
status:
description: Status defines the observed state of Tackle
description: Status defines the observed state of the resource.
type: object
x-kubernetes-preserve-unknown-fields: true
type: object
served: true
storage: false
subresources:
status: {}
- name: v1alpha2
schema:
openAPIV3Schema:
description: Tackle defines a tackle application.
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: Spec defines the desired state of the resource.
type: object
x-kubernetes-preserve-unknown-fields: true
status:
description: Status defines the observed state of the resource.
type: object
x-kubernetes-preserve-unknown-fields: true
type: object
Expand Down
21 changes: 21 additions & 0 deletions bundle/manifests/tackle.konveyor.io_tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,27 @@ spec:
scope: Namespaced
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
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
type: object
served: false
storage: false
subresources:
status: {}
- name: v1alpha2
schema:
openAPIV3Schema:
properties:
Expand Down
Loading
Loading