Skip to content
Merged
Show file tree
Hide file tree
Changes from 11 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
15 changes: 15 additions & 0 deletions .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,21 @@ jobs:
sleep 3m
done
docker image inspect quay.io/konveyor/tackle2-addon-discovery:${{ inputs.version }}
- name: tackle2-addon-platform
uses: konveyor/release-tools/create-release@release-0.6
with:
version: ${{ inputs.version }}
prev_version: ${{ inputs.previous_version }}
repository: konveyor/tackle2-addon-platform
ref: ${{ inputs.branch }}
github_token: ${{ secrets.GH_TOKEN }}
- name: wait for tackle2-addon-platform
run: |
#!/bin/bash
while ! docker pull quay.io/konveyor/tackle2-addon-platform:${{ inputs.version }} &> /dev/null; do
sleep 3m
done
docker image inspect quay.io/konveyor/tackle2-addon-platform:${{ inputs.version }}

release-components:
runs-on: ubuntu-latest
Expand Down
83 changes: 83 additions & 0 deletions helm/templates/crds/tackle.konveyor.io_schemas.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.10.0
creationTimestamp: null
name: schemas.tackle.konveyor.io
spec:
group: tackle.konveyor.io
names:
kind: Schema
listKind: SchemaList
plural: schemas
singular: schema
scope: Namespaced
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
description: Schema defines json document schemas.
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: SchemaSpec defines the desired state of the resource.
properties:
domain:
description: Domain
type: string
subject:
description: Subject
type: string
variant:
description: Variant
type: string
versions:
description: Versions
items:
description: SchemaVersion defines each version of a schema.
properties:
definition:
description: Definition is the (jsd) json-schema definition.
type: object
x-kubernetes-preserve-unknown-fields: true
migration:
description: Migration defines a yq query to migrate the document.
type: string
required:
- definition
type: object
type: array
required:
- domain
- subject
- variant
- versions
type: object
status:
description: SchemaStatus defines the observed state of the resource.
properties:
observedGeneration:
description: The most recent generation observed by the controller.
format: int64
type: integer
type: object
required:
- spec
type: object
served: true
storage: true
subresources:
status: {}
1 change: 1 addition & 0 deletions helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ images:
keycloak_init: quay.io/konveyor/tackle-keycloak-init:latest
tackle_ui: quay.io/konveyor/tackle2-ui:latest
addon_analyzer: quay.io/konveyor/tackle2-addon-analyzer:latest
addon_platform: quay.io/konveyor/tackle2-addon-platform:latest
addon_discovery: quay.io/konveyor/tackle2-addon-discovery:latest
provider_generic: quay.io/konveyor/generic-external-provider:latest
provider_java: quay.io/konveyor/java-external-provider:latest
Expand Down
12 changes: 12 additions & 0 deletions roles/tackle/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,18 @@ tech_discovery_container_limits_memory: "{{ analyzer_container_limits_memory }}"
tech_discovery_container_requests_cpu: "{{ analyzer_container_requests_cpu }}"
tech_discovery_container_requests_memory: "{{ analyzer_container_requests_memory }}"

platform_fqin: "{{ lookup('env', 'RELATED_IMAGE_ADDON_PLATFORM') }}"
platform_name: "platform"
platform_component_name: "addon"
platform_service_name: "{{ app_name }}-{{ platform_name }}-{{ platform_component_name }}"
platform_container_requests_cpu: "1"
platform_container_requests_memory: "100Mi"
platform_container_limits_cpu: "1"
platform_container_limits_memory: "512Mi"
platform_manifest: "{{ platform_name }}-manifest"
platform_importer: "{{ platform_name }}-importer"
platform_generator: "{{ platform_name }}-generator"

cache_name: "cache"
cache_data_volume_size: "100Gi"
cache_data_volume_name: "{{ app_name }}-{{ cache_name }}-data"
Expand Down
94 changes: 94 additions & 0 deletions roles/tackle/templates/customresource-addon-platform.yml.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
---
kind: Addon
apiVersion: tackle.konveyor.io/v1alpha1
metadata:
name: {{ platform_manifest }}
namespace: {{ app_namespace }}
labels:
app.kubernetes.io/name: {{ platform_service_name }}
app.kubernetes.io/component: {{ platform_component_name }}
app.kubernetes.io/part-of: {{ app_name }}
spec:
task: {{ platform_manifest }}
container:
name: {{ platform_component_name }}
image: {{ platform_fqin }}
imagePullPolicy: {{ image_pull_policy }}
Comment thread
jmontleon marked this conversation as resolved.
Outdated
resources:
limits:
cpu: {{ platform_container_limits_cpu }}
memory: {{ platform_container_limits_memory }}
requests:
cpu: {{ platform_container_requests_cpu }}
memory: {{ platform_container_requests_memory }}
---
kind: Addon
apiVersion: tackle.konveyor.io/v1alpha1
metadata:
name: {{ platform_importer }}
namespace: {{ app_namespace }}
labels:
app.kubernetes.io/name: {{ platform_service_name }}
app.kubernetes.io/component: {{ platform_component_name }}
app.kubernetes.io/part-of: {{ app_name }}
spec:
task: {{ platform_importer }}
container:
name: {{ platform_component_name }}
image: {{ platform_fqin }}
imagePullPolicy: {{ image_pull_policy }}
resources:
limits:
cpu: {{ platform_container_limits_cpu }}
memory: {{ platform_container_limits_memory }}
requests:
cpu: {{ platform_container_requests_cpu }}
memory: {{ platform_container_requests_memory }}
---
kind: Addon
apiVersion: tackle.konveyor.io/v1alpha1
metadata:
name: {{ platform_generator }}
namespace: {{ app_namespace }}
labels:
app.kubernetes.io/name: {{ platform_service_name }}
app.kubernetes.io/component: {{ platform_component_name }}
app.kubernetes.io/part-of: {{ app_name }}
spec:
task: {{ platform_generator }}
container:
name: {{ platform_component_name }}
image: {{ platform_fqin }}
imagePullPolicy: {{ image_pull_policy }}
resources:
limits:
cpu: {{ platform_container_limits_cpu }}
memory: {{ platform_container_limits_memory }}
requests:
cpu: {{ platform_container_requests_cpu }}
memory: {{ platform_container_requests_memory }}

---
kind: Task
apiVersion: tackle.konveyor.io/v1alpha1
metadata:
namespace: {{ app_namespace }}
name: {{ platform_manifest }}
spec:
action: fetch
---
kind: Task
apiVersion: tackle.konveyor.io/v1alpha1
metadata:
namespace: {{ app_namespace }}
name: {{ platform_importer }}
spec:
action: import
---
kind: Task
apiVersion: tackle.konveyor.io/v1alpha1
metadata:
namespace: {{ app_namespace }}
name: {{ platform_generator }}
spec:
action: generate
64 changes: 64 additions & 0 deletions roles/tackle/templates/customresource-schema-cloudfoundry.yml.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
---
kind: Schema
apiVersion: tackle.konveyor.io/v1alpha1
metadata:
name: cloudfoundry-coordinates
namespace: {{ app_namespace }}
labels:
app.kubernetes.io/part-of: {{ app_name }}
spec:
domain: platform
variant: cloudfoundry
subject: coordinates
versions:
- definition:
'$schema': https://json-schema.org/draft/2020-12/schema
properties:
name:
description: Application name.
minLength: 1
type: string
space:
description: Space name.
minLength: 1
type: string
Comment thread
jortel marked this conversation as resolved.
required:
- space
- name
title: Coordinates
type: object
---
kind: Schema
apiVersion: tackle.konveyor.io/v1alpha1
metadata:
name: cloudfoundry-filter
namespace: {{ app_namespace }}
labels:
app.kubernetes.io/part-of: {{ app_name }}
spec:
domain: platform
variant: cloudfoundry
subject: filter
versions:
- definition:
$schema: https://json-schema.org/draft/2020-12/schema
title: Coordinates
type: object
properties:
names:
description: Application names. Each may be a glob expression.
type: array
items:
type: string
minLength: 1
minItems: 0
spaces:
description: Space names.
type: array
items:
type: string
minLength: 1
minItems: 1
required:
- spaces

Loading