From 117fe367c8073dab8aaed6349c528c2d3b024b9a Mon Sep 17 00:00:00 2001 From: Jason Montleon Date: Tue, 18 Jun 2024 09:34:13 -0400 Subject: [PATCH] :sparkles: Update CRDs to v1alpha2 (#336) Signed-off-by: Jason Montleon --- Makefile | 2 +- ...nveyor-operator.clusterserviceversion.yaml | 15 ++- .../manifests/tackle.konveyor.io_addons.yaml | 113 ++++++++++++++++-- .../tackle.konveyor.io_extensions.yaml | 30 +++-- .../manifests/tackle.konveyor.io_tackles.yaml | 38 +++++- .../manifests/tackle.konveyor.io_tasks.yaml | 21 ++++ .../crds/tackle.konveyor.io_addons.yaml | 113 ++++++++++++++++-- .../crds/tackle.konveyor.io_extensions.yaml | 30 +++-- .../tackle.konveyor.io_tackles.sample.yaml | 2 +- .../crds/tackle.konveyor.io_tackles.yaml | 44 +++++-- .../crds/tackle.konveyor.io_tasks.yaml | 21 ++++ ...nveyor-operator.clusterserviceversion.yaml | 11 +- roles/tackle/tasks/main.yml | 2 +- .../customresource-addon-analyzer.yml.j2 | 8 +- 14 files changed, 391 insertions(+), 59 deletions(-) diff --git a/Makefile b/Makefile index e8614ef1..40bc5ca1 100644 --- a/Makefile +++ b/Makefile @@ -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) diff --git a/bundle/manifests/konveyor-operator.clusterserviceversion.yaml b/bundle/manifests/konveyor-operator.clusterserviceversion.yaml index 4a548acf..d28ec1dc 100644 --- a/bundle/manifests/konveyor-operator.clusterserviceversion.yaml +++ b/bundle/manifests/konveyor-operator.clusterserviceversion.yaml @@ -5,7 +5,7 @@ metadata: alm-examples: |- [ { - "apiVersion": "tackle.konveyor.io/v1alpha1", + "apiVersion": "tackle.konveyor.io/v1alpha2", "kind": "Tackle", "metadata": { "name": "tackle", @@ -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. @@ -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 + 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. diff --git a/bundle/manifests/tackle.konveyor.io_addons.yaml b/bundle/manifests/tackle.konveyor.io_addons.yaml index 1cc417b4..c803ec43 100644 --- a/bundle/manifests/tackle.konveyor.io_addons.yaml +++ b/bundle/manifests/tackle.konveyor.io_addons.yaml @@ -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: @@ -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 diff --git a/bundle/manifests/tackle.konveyor.io_extensions.yaml b/bundle/manifests/tackle.konveyor.io_extensions.yaml index d4a3d513..151c77a9 100644 --- a/bundle/manifests/tackle.konveyor.io_extensions.yaml +++ b/bundle/manifests/tackle.konveyor.io_extensions.yaml @@ -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: diff --git a/bundle/manifests/tackle.konveyor.io_tackles.yaml b/bundle/manifests/tackle.konveyor.io_tackles.yaml index f8ea0777..ffbafa06 100644 --- a/bundle/manifests/tackle.konveyor.io_tackles.yaml +++ b/bundle/manifests/tackle.konveyor.io_tackles.yaml @@ -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: @@ -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 @@ -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 diff --git a/bundle/manifests/tackle.konveyor.io_tasks.yaml b/bundle/manifests/tackle.konveyor.io_tasks.yaml index 451cf944..a1d5bfb1 100644 --- a/bundle/manifests/tackle.konveyor.io_tasks.yaml +++ b/bundle/manifests/tackle.konveyor.io_tasks.yaml @@ -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: diff --git a/helm/templates/crds/tackle.konveyor.io_addons.yaml b/helm/templates/crds/tackle.konveyor.io_addons.yaml index 20e44294..76ccf4c6 100644 --- a/helm/templates/crds/tackle.konveyor.io_addons.yaml +++ b/helm/templates/crds/tackle.konveyor.io_addons.yaml @@ -15,14 +15,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: @@ -1239,10 +1304,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 diff --git a/helm/templates/crds/tackle.konveyor.io_extensions.yaml b/helm/templates/crds/tackle.konveyor.io_extensions.yaml index fa5f746f..af47906a 100644 --- a/helm/templates/crds/tackle.konveyor.io_extensions.yaml +++ b/helm/templates/crds/tackle.konveyor.io_extensions.yaml @@ -15,14 +15,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: diff --git a/helm/templates/crds/tackle.konveyor.io_tackles.sample.yaml b/helm/templates/crds/tackle.konveyor.io_tackles.sample.yaml index e94b8d62..0b0e7d62 100644 --- a/helm/templates/crds/tackle.konveyor.io_tackles.sample.yaml +++ b/helm/templates/crds/tackle.konveyor.io_tackles.sample.yaml @@ -1,5 +1,5 @@ {{ if .Values.olm }} -apiVersion: tackle.konveyor.io/v1alpha1 +apiVersion: tackle.konveyor.io/v1alpha2 kind: Tackle metadata: name: tackle diff --git a/helm/templates/crds/tackle.konveyor.io_tackles.yaml b/helm/templates/crds/tackle.konveyor.io_tackles.yaml index bf8dba42..c1b8af71 100644 --- a/helm/templates/crds/tackle.konveyor.io_tackles.yaml +++ b/helm/templates/crds/tackle.konveyor.io_tackles.yaml @@ -2,6 +2,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: @@ -16,7 +18,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 @@ -31,11 +33,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 @@ -43,9 +75,3 @@ spec: storage: true subresources: status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: null - storedVersions: null diff --git a/helm/templates/crds/tackle.konveyor.io_tasks.yaml b/helm/templates/crds/tackle.konveyor.io_tasks.yaml index e8dcb2cf..9f8129f4 100644 --- a/helm/templates/crds/tackle.konveyor.io_tasks.yaml +++ b/helm/templates/crds/tackle.konveyor.io_tasks.yaml @@ -16,6 +16,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: diff --git a/helm/templates/olm/konveyor-operator.clusterserviceversion.yaml b/helm/templates/olm/konveyor-operator.clusterserviceversion.yaml index c616c5c9..053f9d3b 100644 --- a/helm/templates/olm/konveyor-operator.clusterserviceversion.yaml +++ b/helm/templates/olm/konveyor-operator.clusterserviceversion.yaml @@ -52,22 +52,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 + 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. diff --git a/roles/tackle/tasks/main.yml b/roles/tackle/tasks/main.yml index 3f3a192c..bb5093ad 100644 --- a/roles/tackle/tasks/main.yml +++ b/roles/tackle/tasks/main.yml @@ -454,7 +454,7 @@ k8s: state: absent kind: Addon - api_version: tackle.konveyor.io/v1alpha1 + api_version: tackle.konveyor.io/v1alpha2 name: "{{ admin_name }}" namespace: "{{ app_namespace }}" diff --git a/roles/tackle/templates/customresource-addon-analyzer.yml.j2 b/roles/tackle/templates/customresource-addon-analyzer.yml.j2 index 2a93e4a7..53c635f3 100644 --- a/roles/tackle/templates/customresource-addon-analyzer.yml.j2 +++ b/roles/tackle/templates/customresource-addon-analyzer.yml.j2 @@ -1,6 +1,6 @@ --- kind: Addon -apiVersion: tackle.konveyor.io/v1alpha1 +apiVersion: tackle.konveyor.io/v1alpha2 metadata: name: {{ analyzer_name }} namespace: {{ app_namespace }} @@ -23,7 +23,7 @@ spec: memory: {{ analyzer_container_requests_memory }} --- kind: Extension -apiVersion: tackle.konveyor.io/v1alpha1 +apiVersion: tackle.konveyor.io/v1alpha2 metadata: name: {{ provider_java_name }} namespace: {{ app_namespace }} @@ -69,7 +69,7 @@ spec: mavenSettingsFile: $(maven.settings.path) --- kind: Extension -apiVersion: tackle.konveyor.io/v1alpha1 +apiVersion: tackle.konveyor.io/v1alpha2 metadata: name: {{ provider_generic_name }} namespace: {{ app_namespace }} @@ -104,7 +104,7 @@ spec: initConfig: --- kind: Task -apiVersion: tackle.konveyor.io/v1alpha1 +apiVersion: tackle.konveyor.io/v1alpha2 metadata: namespace: {{ app_namespace }} name: {{ analyzer_name }}