checkpoint

Signed-off-by: Jeff Ortel <jortel@redhat.com>
konveyor · Feb 12, 2025 · d2a72c0 · d2a72c0
1 parent ef48900
commit d2a72c0
Show file tree

Hide file tree

Showing 5 changed files with 164 additions and 227 deletions.
diff --git a/roles/tackle/defaults/main.yml b/roles/tackle/defaults/main.yml
@@ -209,8 +209,6 @@ tech_discovery_container_limits_cpu: "{{ analyzer_container_limits_cpu }}"
 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 }}"
-tech_discovery_provider_java_name: "discovery-java"
-tech_discovery_provider_generic_name: "discovery-generic"
 
 cache_name: "cache"
 cache_data_volume_size: "100Gi"

diff --git a/roles/tackle/tasks/main.yml b/roles/tackle/tasks/main.yml
@@ -517,6 +517,11 @@
     state: present
     definition: "{{ lookup('template', 'customresource-addon-analyzer.yml.j2') }}"
 
+- name: "Create Extensions CR"
+  k8s:
+    state: present
+    definition: "{{ lookup('template', 'customresource-extension.yml.j2') }}"
+
 # Generic extension refactored into separate
 # extensions for each provider.
 - name: "Delete generic extension"
@@ -527,6 +532,24 @@
     name: "generic"
     namespace: "{{ app_namespace }}"
 
+# Extensions shared between analysis and tech-discovery addons.
+- name: "Delete discovery-java extension"
+  k8s:
+    state: absent
+    kind: Extension
+    api_version: tackle.konveyor.io/v1alpha1
+    name: "discovery-java"
+    namespace: "{{ app_namespace }}"
+
+# Extensions shared between analysis and tech-discovery addons.
+- name: "Delete discovery-java extension"
+  k8s:
+    state: absent
+    kind: Extension
+    api_version: tackle.konveyor.io/v1alpha1
+    name: "discovery-generic"
+    namespace: "{{ app_namespace }}"
+
 - name: "Create Language Discovery Addon CR"
   k8s:
     state: present

diff --git a/roles/tackle/templates/customresource-addon-analyzer.yml.j2 b/roles/tackle/templates/customresource-addon-analyzer.yml.j2
@@ -22,147 +22,6 @@ spec:
         cpu: {{ analyzer_container_requests_cpu }}
         memory: {{ analyzer_container_requests_memory }}
 ---
-kind: Extension
-apiVersion: tackle.konveyor.io/v1alpha1
-metadata:
-  name: {{ provider_java_name }}
-  namespace: {{ app_namespace }}
-  labels:
-    app.kubernetes.io/name: {{ provider_java_service_name }}
-    app.kubernetes.io/component: {{ provider_java_component_name }}
-    app.kubernetes.io/part-of: {{ app_name }}
-spec:
-  addon: {{ analyzer_name }}
-  selector: tag:Language=Java || !tag:Language
-  container:
-    name: {{ provider_java_name }}
-    image: {{ provider_java_image_fqin }}
-    imagePullPolicy: {{ image_pull_policy }}
-    args:
-    - --port
-    - $(PORT)
-    env:
-    - name: PORT
-      value: ${seq:8000}
-    - name: MAVEN_OPTS
-      value: -Dmaven.repo.local={{ cache_mount_path }}/m2
-    resources:
-      limits:
-        cpu: {{ provider_java_container_limits_cpu }}
-        memory: {{ provider_java_container_limits_memory }}
-      requests:
-        cpu: {{ provider_java_container_requests_cpu }}
-        memory: {{ provider_java_container_requests_memory }}
-  metadata:
-    resources:
-    - selector: identity:kind=maven
-      fields:
-      - name: settings
-        path: /shared/creds/maven/settings.xml
-        key: maven.settings.path
-    - selector: setting:key=mvn.insecure.enabled
-      fields:
-      - name: value
-        key: maven.insecure
-    provider:
-      name: {{ provider_java_name }}
-      address: localhost:$(PORT)
-      initConfig:
-      - providerSpecificConfig:
-          bundles: /jdtls/java-analyzer-bundle/java-analyzer-bundle.core/target/java-analyzer-bundle.core-1.0.0-SNAPSHOT.jar
-          depOpenSourceLabelsFile: /usr/local/etc/maven.default.index
-          lspServerPath: /jdtls/bin/jdtls
-          mavenInsecure: $(maven.insecure)
-          mavenSettingsFile: $(maven.settings.path)
-          mavenCacheDir: {{ cache_mount_path }}/m2
----
-kind: Extension
-apiVersion: tackle.konveyor.io/v1alpha1
-metadata:
-  name: {{ provider_python_name }}
-  namespace: {{ app_namespace }}
-  labels:
-    app.kubernetes.io/name: {{ provider_python_service_name }}
-    app.kubernetes.io/component: {{ provider_python_component_name }}
-    app.kubernetes.io/part-of: {{ app_name }}
-spec:
-  addon: {{ analyzer_name }}
-  selector: tag:Language=Golang || tag:Language=Python
-  container:
-    name: {{ provider_python_name }}
-    image: {{ provider_python_image_fqin }}
-    imagePullPolicy: {{ image_pull_policy }}
-    args:
-    - --port
-    - $(PORT)
-    env:
-    - name: PORT
-      value: ${seq:8000}
-    resources:
-      limits:
-        cpu: {{ provider_python_container_limits_cpu }}
-        memory: {{ provider_python_container_limits_memory }}
-      requests:
-        cpu: {{ provider_python_container_requests_cpu }}
-        memory: {{ provider_python_container_requests_memory }}
-  metadata:
-    provider:
-      address: localhost:$(PORT)
-      initConfig:
-      - providerSpecificConfig:
-          lspServerName: generic
-          lspServerPath: /usr/local/bin/pylsp
-          workspaceFolders:
-          - $(builtin.location)
-          dependencyFolders:
-          - examples/python/__pycache__
-          - examples/python/.venv
-      name: {{ provider_python_name }}
-  selector: tag:Language=Python
----
-kind: Extension
-apiVersion: tackle.konveyor.io/v1alpha1
-metadata:
-  name: {{ provider_nodejs_name }}
-  namespace: {{ app_namespace }}
-  labels:
-    app.kubernetes.io/name: {{ provider_nodejs_service_name }}
-    app.kubernetes.io/component: {{ provider_nodejs_component_name }}
-    app.kubernetes.io/part-of: {{ app_name }}
-spec:
-  addon: {{ analyzer_name }}
-  selector: tag:Language=TypeScript
-  container:
-    name: {{ provider_nodejs_name }}
-    image: {{ provider_nodejs_image_fqin }}
-    imagePullPolicy: {{ image_pull_policy }}
-    args:
-    - --port
-    - $(PORT)
-    env:
-    - name: PORT
-      value: ${seq:8000}
-    resources:
-      limits:
-        cpu: {{ provider_nodejs_container_limits_cpu }}
-        memory: {{ provider_nodejs_container_limits_memory }}
-      requests:
-        cpu: {{ provider_nodejs_container_requests_cpu }}
-        memory: {{ provider_nodejs_container_requests_memory }}
-  metadata:
-    provider:
-      address: localhost:$(PORT)
-      initConfig:
-        providerSpecificConfig:
-          lspServerName: generic
-          lspServerPath: /usr/local/bin/typescript-language-server
-          lspServerArgs:
-          - "--stdio"
-          workspaceFolders:
-          - $(builtin.location)
-      name: nodejs
-  selector: tag:Language=TypeScript
----
 kind: Task
 apiVersion: tackle.konveyor.io/v1alpha1
 metadata:

diff --git a/roles/tackle/templates/customresource-addon-tech-discovery.yml.j2 b/roles/tackle/templates/customresource-addon-tech-discovery.yml.j2
@@ -22,90 +22,6 @@ spec:
         cpu: {{ tech_discovery_container_requests_cpu }}
         memory: {{ tech_discovery_container_requests_memory }}
 ---
-kind: Extension
-apiVersion: tackle.konveyor.io/v1alpha1
-metadata:
-  name: {{ tech_discovery_provider_java_name }}
-  namespace: {{ app_namespace }}
-  labels:
-    app.kubernetes.io/name: {{ provider_java_service_name }}
-    app.kubernetes.io/component: {{ provider_java_component_name }}
-    app.kubernetes.io/part-of: {{ app_name }}
-spec:
-  addon: {{ tech_discovery_name }}
-  selector: tag:Language=Java || !tag:Language
-  container:
-    name: {{ provider_java_name }}
-    image: {{ provider_java_image_fqin }}
-    imagePullPolicy: {{ image_pull_policy }}
-    args:
-    - --port
-    - $(PORT)
-    env:
-    - name: PORT
-      value: ${seq:8000}
-    - name: MAVEN_OPTS
-      value: -Dmaven.repo.local={{ cache_mount_path }}/m2
-    resources:
-      limits:
-        cpu: {{ provider_java_container_limits_cpu }}
-        memory: {{ provider_java_container_limits_memory }}
-      requests:
-        cpu: {{ provider_java_container_requests_cpu }}
-        memory: {{ provider_java_container_requests_memory }}
-  metadata:
-    resources:
-    - selector: identity:kind=maven
-      fields:
-      - name: settings
-        path: /shared/creds/maven/settings.xml
-        key: maven.settings.path
-    provider:
-      name: {{ provider_java_name }}
-      address: localhost:$(PORT)
-      initConfig:
-      - providerSpecificConfig:
-          bundles: /jdtls/java-analyzer-bundle/java-analyzer-bundle.core/target/java-analyzer-bundle.core-1.0.0-SNAPSHOT.jar
-          depOpenSourceLabelsFile: /usr/local/etc/maven.default.index
-          lspServerPath: /jdtls/bin/jdtls
-          mavenSettingsFile: $(maven.settings.path)
-          mavenCacheDir: {{ cache_mount_path }}/m2
----
-kind: Extension
-apiVersion: tackle.konveyor.io/v1alpha1
-metadata:
-  name: {{ tech_discovery_provider_generic_name }}
-  namespace: {{ app_namespace }}
-  labels:
-    app.kubernetes.io/name: {{ provider_generic_service_name }}
-    app.kubernetes.io/component: {{ provider_generic_component_name }}
-    app.kubernetes.io/part-of: {{ app_name }}
-spec:
-  addon: {{ tech_discovery_name }}
-  selector: tag:Language=Golang || tag:Language=Python
-  container:
-    name: {{ provider_generic_name }}
-    image: {{ provider_generic_image_fqin }}
-    imagePullPolicy: {{ image_pull_policy }}
-    args:
-    - --port
-    - $(PORT)
-    env:
-    - name: PORT
-      value: ${seq:8000}
-    resources:
-      limits:
-        cpu: {{ provider_generic_container_limits_cpu }}
-        memory: {{ provider_generic_container_limits_memory }}
-      requests:
-        cpu: {{ provider_generic_container_requests_cpu }}
-        memory: {{ provider_generic_container_requests_memory }}
-  metadata:
-    provider:
-      name: {{ provider_generic_name }}
-      address: localhost:$(PORT)
-      initConfig:
----
 kind: Task
 apiVersion: tackle.konveyor.io/v1alpha1
 metadata: