From 16a739c879750d32031c50ba96f387dbee864e89 Mon Sep 17 00:00:00 2001 From: Dylan Murray Date: Fri, 21 Jun 2024 08:58:46 -0400 Subject: [PATCH 1/4] Update release workflows for discovery addon Signed-off-by: Dylan Murray --- .github/actions/make-bundle/action.yml | 5 +++++ .github/workflows/create-release.yml | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/.github/actions/make-bundle/action.yml b/.github/actions/make-bundle/action.yml index 59a7c50..9a6866f 100644 --- a/.github/actions/make-bundle/action.yml +++ b/.github/actions/make-bundle/action.yml @@ -37,6 +37,10 @@ inputs: description: "image uri for analyzer addon (ie. quay.io//:)" required: false default: "" + addon_discovery: + description: "image uri for discovery addon (ie. quay.io//:)" + required: false + default: "" version: description: "operator version" required: false @@ -65,6 +69,7 @@ runs: [ -n "${{ inputs.keycloak_init }}" ] && OPTS+=" --set images.keycloak_init=${{ inputs.keycloak_init }}" [ -n "${{ inputs.tackle_ui }}" ] && OPTS+=" --set images.tackle_ui=${{ inputs.tackle_ui }}" [ -n "${{ inputs.addon_analyzer }}" ] && OPTS+=" --set images.addon_analyzer=${{ inputs.addon_analyzer }}" + [ -n "${{ inputs.addon_discovery }}" ] && OPTS+=" --set images.addon_discovery=${{ inputs.addon_discovery }}" HELM_OPTS="${OPTS}" make bundle cat ./bundle/manifests/konveyor-operator.clusterserviceversion.yaml make bundle-build diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index b7e2998..cf54699 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -109,6 +109,21 @@ jobs: sleep 3m done docker image inspect quay.io/konveyor/tackle2-addon-analyzer:${{ inputs.version }} + - name: tackle2-addon-discovery + uses: konveyor/release-tools/create-release@main + with: + version: ${{ inputs.version }} + prev_version: ${{ inputs.previous_version }} + repository: konveyor/tackle2-addon-discovery + ref: ${{ inputs.branch }} + github_token: ${{ secrets.GH_TOKEN }} + - name: wait for tackle2-addon-discovery + run: | + #!/bin/bash + while ! docker pull quay.io/konveyor/tackle2-addon-discovery:${{ inputs.version }} &> /dev/null; do + sleep 3m + done + docker image inspect quay.io/konveyor/tackle2-addon-discovery:${{ inputs.version }} release-components: runs-on: ubuntu-20.04 @@ -155,6 +170,7 @@ jobs: keycloak_init: quay.io/konveyor/tackle-keycloak-init:${{ inputs.version }} tackle_ui: quay.io/konveyor/tackle2-ui:${{ inputs.version }} addon_analyzer: quay.io/konveyor/tackle2-addon-analyzer:${{ inputs.version }} + addon_discovery: quay.io/konveyor/tackle2-addon-discovery:${{ inputs.version }} api_tests_ref: ${{ inputs.branch }} ui_tests_ref: ${{ inputs.branch }} @@ -211,6 +227,7 @@ jobs: keycloak_init: quay.io/konveyor/tackle-keycloak-init:${{ inputs.version }} tackle_ui: quay.io/konveyor/tackle2-ui:${{ inputs.version }} addon_analyzer: quay.io/konveyor/tackle2-addon-analyzer:${{ inputs.version }} + addon_discovery: quay.io/konveyor/tackle2-addon-discovery:${{ inputs.version }} # The ones we don't own oauth_proxy: quay.io/konveyor/origin-oauth-proxy:${{ inputs.version }} tackle_postgres: quay.io/konveyor/postgresql-15-c9s:${{ inputs.version }} @@ -303,6 +320,7 @@ jobs: "konveyor/java-analyzer-bundle" "konveyor/windup-shim" "konveyor/tackle2-addon-analyzer" + "konveyor/tackle2-addon-discovery" "konveyor/tackle2-addon" "konveyor/operator" ) From 04e9e6103c55aceed649a42aa0e7b0c609af7282 Mon Sep 17 00:00:00 2001 From: Dylan Murray Date: Fri, 21 Jun 2024 09:11:16 -0400 Subject: [PATCH 2/4] Update helm template for discovery addon Signed-off-by: Dylan Murray --- helm/templates/deployment.yaml | 2 ++ helm/values.yaml | 1 + 2 files changed, 3 insertions(+) diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml index a2ca127..870a09b 100644 --- a/helm/templates/deployment.yaml +++ b/helm/templates/deployment.yaml @@ -49,6 +49,8 @@ spec: value: {{ .Values.images.tackle_ui }} - name: RELATED_IMAGE_ADDON_ANALYZER value: {{ .Values.images.addon_analyzer }} + - name: RELATED_IMAGE_ADDON_DISCOVERY + value: {{ .Values.images.addon_discovery }} - name: RELATED_IMAGE_PROVIDER_GENERIC value: {{ .Values.images.provider_generic }} - name: RELATED_IMAGE_PROVIDER_JAVA diff --git a/helm/values.yaml b/helm/values.yaml index 97fa64e..4deba69 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -19,5 +19,6 @@ 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_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 From 89a0da7d7781e8d740f42212e60632a6971fd9e1 Mon Sep 17 00:00:00 2001 From: Dylan Murray Date: Fri, 21 Jun 2024 09:16:05 -0400 Subject: [PATCH 3/4] Update bundle Signed-off-by: Dylan Murray --- bundle.Dockerfile | 2 +- .../konveyor-operator.clusterserviceversion.yaml | 8 ++++++-- bundle/metadata/annotations.yaml | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bundle.Dockerfile b/bundle.Dockerfile index dfc17cd..6b547c8 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -7,7 +7,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ LABEL operators.operatorframework.io.bundle.package.v1=konveyor-operator LABEL operators.operatorframework.io.bundle.channels.v1=development LABEL operators.operatorframework.io.bundle.channel.default.v1=development -LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.28.1 +LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.34.2 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=ansible.sdk.operatorframework.io/v1 diff --git a/bundle/manifests/konveyor-operator.clusterserviceversion.yaml b/bundle/manifests/konveyor-operator.clusterserviceversion.yaml index d28ec1d..8132af9 100644 --- a/bundle/manifests/konveyor-operator.clusterserviceversion.yaml +++ b/bundle/manifests/konveyor-operator.clusterserviceversion.yaml @@ -20,7 +20,7 @@ metadata: categories: Modernization & Migration certified: "false" containerImage: quay.io/konveyor/tackle2-operator:latest - createdAt: "2024-06-17T20:49:11Z" + createdAt: "2024-06-21T13:13:06Z" description: Konveyor is an open-source application modernization platform that helps organizations safely and predictably modernize applications to Kubernetes at scale. @@ -48,7 +48,7 @@ metadata: } } operatorframework.io/suggested-namespace: konveyor-tackle - operators.operatorframework.io/builder: operator-sdk-v1.28.1 + operators.operatorframework.io/builder: operator-sdk-v1.34.2 operators.operatorframework.io/project_layout: ansible.sdk.operatorframework.io/v1 repository: https://github.com/konveyor/tackle2-operator support: https://github.com/konveyor/tackle2-operator/issues @@ -208,6 +208,8 @@ spec: value: quay.io/konveyor/tackle2-ui:latest - name: RELATED_IMAGE_ADDON_ANALYZER value: quay.io/konveyor/tackle2-addon-analyzer:latest + - name: RELATED_IMAGE_ADDON_DISCOVERY + value: quay.io/konveyor/tackle2-addon-discovery:latest - name: RELATED_IMAGE_PROVIDER_GENERIC value: quay.io/konveyor/generic-external-provider:latest - name: RELATED_IMAGE_PROVIDER_JAVA @@ -400,6 +402,8 @@ spec: name: tackle-ui - image: quay.io/konveyor/tackle2-addon-analyzer:latest name: addon-analyzer + - image: quay.io/konveyor/tackle2-addon-discovery:latest + name: addon-discovery - image: quay.io/konveyor/generic-external-provider:latest name: provider-generic - image: quay.io/konveyor/java-external-provider:latest diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 6a82fc9..8b2a8d4 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -6,7 +6,7 @@ annotations: operators.operatorframework.io.bundle.package.v1: konveyor-operator operators.operatorframework.io.bundle.channels.v1: development operators.operatorframework.io.bundle.channel.default.v1: development - operators.operatorframework.io.metrics.builder: operator-sdk-v1.28.1 + operators.operatorframework.io.metrics.builder: operator-sdk-v1.34.2 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: ansible.sdk.operatorframework.io/v1 From 405032447574d7ad96ac39d4c3b4026963ae47d1 Mon Sep 17 00:00:00 2001 From: Dylan Murray Date: Fri, 21 Jun 2024 09:18:48 -0400 Subject: [PATCH 4/4] Fix operator-sdk version Signed-off-by: Dylan Murray --- bundle/manifests/konveyor-operator.clusterserviceversion.yaml | 2 +- bundle/metadata/annotations.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundle/manifests/konveyor-operator.clusterserviceversion.yaml b/bundle/manifests/konveyor-operator.clusterserviceversion.yaml index 8132af9..fd259a3 100644 --- a/bundle/manifests/konveyor-operator.clusterserviceversion.yaml +++ b/bundle/manifests/konveyor-operator.clusterserviceversion.yaml @@ -48,7 +48,7 @@ metadata: } } operatorframework.io/suggested-namespace: konveyor-tackle - operators.operatorframework.io/builder: operator-sdk-v1.34.2 + operators.operatorframework.io/builder: operator-sdk-v1.28.1 operators.operatorframework.io/project_layout: ansible.sdk.operatorframework.io/v1 repository: https://github.com/konveyor/tackle2-operator support: https://github.com/konveyor/tackle2-operator/issues diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 8b2a8d4..6a82fc9 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -6,7 +6,7 @@ annotations: operators.operatorframework.io.bundle.package.v1: konveyor-operator operators.operatorframework.io.bundle.channels.v1: development operators.operatorframework.io.bundle.channel.default.v1: development - operators.operatorframework.io.metrics.builder: operator-sdk-v1.34.2 + operators.operatorframework.io.metrics.builder: operator-sdk-v1.28.1 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: ansible.sdk.operatorframework.io/v1