diff --git a/.github/actions/deploy-klt-on-cluster/action.yml b/.github/actions/deploy-klt-on-cluster/action.yml index d072e7ca3a..8bf2768a59 100644 --- a/.github/actions/deploy-klt-on-cluster/action.yml +++ b/.github/actions/deploy-klt-on-cluster/action.yml @@ -62,7 +62,7 @@ runs: run: | echo "Installing KLT using manifests" sed -i 's/imagePullPolicy: Always/imagePullPolicy: Never/g' ~/download/artifacts/lifecycle-operator-manifest-test/release.yaml - sed -i 's/ghcr.io\/keptn\/functions-runtime:.*/localhost:5000\/keptn\/functions-runtime:${{ inputs.runtime_tag }}/g' \ + sed -i 's/ghcr.io\/keptn\/deno-runtime:.*/localhost:5000\/keptn\/deno-runtime:${{ inputs.runtime_tag }}/g' \ ~/download/artifacts/lifecycle-operator-manifest-test/release.yaml sed -i 's/ghcr.io\/keptn\/python-runtime:.*/localhost:5000\/keptn\/python-runtime:${{ inputs.runtime_tag }}/g' \ ~/download/artifacts/lifecycle-operator-manifest-test/release.yaml @@ -100,7 +100,7 @@ runs: --set metricsOperator.manager.imagePullPolicy=Never \ --set metricsOperator.manager.image.tag=${{ inputs.runtime_tag }} \ --set metricsOperator.manager.image.repository="localhost:5000/keptn/metrics-operator" \ - --set lifecycleOperator.manager.env.functionRunnerImage=localhost:5000/keptn/functions-runtime:${{ inputs.runtime_tag }} \ + --set lifecycleOperator.manager.env.functionRunnerImage=localhost:5000/keptn/deno-runtime:${{ inputs.runtime_tag }} \ --set lifecycleOperator.manager.env.pythonRunnerImage=localhost:5000/keptn/python-runtime:${{ inputs.runtime_tag }} \ --set certificateOperator.manager.imagePullPolicy=Never \ --set certificateOperator.manager.image.tag=${{ inputs.runtime_tag }} \ diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index 875c9f855d..8cd7a2ddfb 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -130,10 +130,10 @@ jobs: folder: "metrics-operator/" - name: "scheduler" folder: "scheduler/" - - name: "functions-runtime" - folder: "functions-runtime/" + - name: "deno-runtime" + folder: "runtimes/deno-runtime/" - name: "python-runtime" - folder: "python-runtime/" + folder: "runtimes/python-runtime/" - name: "certificate-operator" folder: "klt-cert-manager/" steps: @@ -186,14 +186,14 @@ jobs: run: make controller-gen - name: Generate release.yaml - if: matrix.config.name != 'functions-runtime' && matrix.config.name != 'python-runtime' + if: matrix.config.name != 'deno-runtime' && matrix.config.name != 'python-runtime' working-directory: ./${{ matrix.config.folder }} env: CHART_APPVERSION: dev-${{ env.DATETIME }} run: make release-manifests - name: Upload release.yaml for tests - if: matrix.config.name != 'functions-runtime' && matrix.config.name != 'python-runtime' + if: matrix.config.name != 'deno-runtime' && matrix.config.name != 'python-runtime' uses: actions/upload-artifact@v3 with: name: ${{ matrix.config.name }}-manifest-test diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 36869055f6..039c68bf46 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -3,7 +3,7 @@ on: workflow_call: inputs: runtime_tag: - description: "Tag for the functions runner image" + description: "Tag for the deno and python runner images" type: "string" required: true helm-install: diff --git a/.github/workflows/load-test.yml b/.github/workflows/load-test.yml index 01d42f0c11..9757968995 100644 --- a/.github/workflows/load-test.yml +++ b/.github/workflows/load-test.yml @@ -3,7 +3,7 @@ on: workflow_call: inputs: runtime_tag: - description: "Tag for the functions runner image" + description: "Tag for the runner images" type: "string" required: true env: diff --git a/.github/workflows/performance-test.yml b/.github/workflows/performance-test.yml index 3c20546e83..3099566d44 100644 --- a/.github/workflows/performance-test.yml +++ b/.github/workflows/performance-test.yml @@ -3,7 +3,7 @@ on: workflow_call: inputs: runtime_tag: - description: "Tag for the functions runner image" + description: "Tag for the runner images" type: "string" required: true env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a20aad7ede..5f1b483742 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,6 +16,7 @@ env: # renovate: datasource=github-releases depName=kubernetes-sigs/controller-tools CONTROLLER_TOOLS_VERSION: "v0.12.1" SCHEDULER_COMPATIBLE_K8S_VERSION: "v0.24.3" + PUBLISHABLE_ITEMS: '[".", "lifecycle-operator", "metrics-operator", "klt-cert-manager", "runtimes/deno-runtime", "runtimes/python-runtime"]' jobs: release-please: @@ -45,71 +46,53 @@ jobs: default-branch: main signoff: "keptn-bot <86361500+keptn-bot@users.noreply.github.com>" - - name: Release Info - run: | - echo "Release KLT: ${{ steps.release.outputs.release_created }}" - echo "Release KLT Cert Manager: ${{ steps.release.outputs.klt-cert-manager--release_created }}" - echo "Release KLT Metrics Operator: ${{ steps.release.outputs.metrics-operator--release_created }}" - echo "Anything to release: ${{ steps.release.outputs.releases_created }}" - echo "Paths to be released: ${{ steps.release.outputs.paths_released }}" - - - name: Create build matrix + - name: Create release matrix id: build-matrix uses: actions/github-script@v6 env: - RELEASE_KLT: ${{ steps.release.outputs.release_created }} - RELEASE_CERT_MANAGER: ${{ steps.release.outputs.klt-cert-manager--release_created }} - RELEASE_METRICS_OPERATOR: ${{ steps.release.outputs.metrics-operator--release_created }} + CHANGED_ITEMS: ${{ steps.release.outputs.paths_released }} KLT_TAG: ${{ steps.release.outputs.tag_name }} - CERT_MANAGER_TAG: ${{ steps.release.outputs.klt-cert-manager--tag_name }} - METRICS_OPERATOR_TAG: ${{ steps.release.outputs.metrics-operator--tag_name }} + ARTIFACT_TAG_NAME: ${{ steps.release.outputs[format('{0}--tag_name', steps.release.outputs.paths_released[0])] }} with: script: | - const { RELEASE_KLT, RELEASE_CERT_MANAGER, RELEASE_METRICS_OPERATOR, KLT_TAG, CERT_MANAGER_TAG, METRICS_OPERATOR_TAG } = process.env - - var result = [] - if (RELEASE_KLT === "true") { - result.push(...[ - { - name: "lifecycle-operator", - folder: "lifecycle-operator/", - tagName: KLT_TAG - }, - { - name: "scheduler", - folder: "scheduler/", - tagName: KLT_TAG - }, - { - name: "functions-runtime", - folder: "functions-runtime/", - tagName: KLT_TAG - }, - { - name: "python-runtime", - folder: "python-runtime/", - tagName: KLT_TAG + const changedItems = JSON.parse(process.env.CHANGED_ITEMS || '[]'); + console.log("changed items", changedItems); + const eligibleItems = JSON.parse(process.env.PUBLISHABLE_ITEMS || '[]'); + console.log("eligible items", eligibleItems); + const itemsToPublish = changedItems.filter(i => eligibleItems.includes(i)); + console.log("items to publish", itemsToPublish); + + console.log("setting up build matrix..."); + const releaseMatrix = itemsToPublish.map(item => { + switch (item) { + case "lifecycle-operator": + return [ + { + name: item, + folder: item, + tagName: process.env.ARTIFACT_TAG_NAME + }, + { + name: "scheduler", + folder: "scheduler/", + tagName: process.env.ARTIFACT_TAG_NAME + } + ]; + case "metrics-operator": + case "klt-cert-manager": + case "runtimes/deno-runtime": + case "runtimes/python-runtime": + return [{ + name: item, + folder: item, + tagName: process.env.ARTIFACT_TAG_NAME + }]; + case ".": + default: + return []; } - ]) - } - - if (RELEASE_CERT_MANAGER === "true") { - result.push({ - name: "certificate-operator", - folder: "klt-cert-manager/", - tagName: CERT_MANAGER_TAG - }) - } - - if (RELEASE_METRICS_OPERATOR === "true") { - result.push({ - name: "metrics-operator", - folder: "metrics-operator/", - tagName: METRICS_OPERATOR_TAG - }) - } - - return { config: result } + }); + return releaseMatrix; build-release: if: needs.release-please.outputs.releases-created == 'true' @@ -200,152 +183,6 @@ jobs: tag_name: ${{ matrix.config.tagName }} files: ./sbom-${{ matrix.config.name }}.spdx.json - release-manifests: - if: needs.release-please.outputs.releases-created == 'true' - needs: - - release-please - - build-release - runs-on: ubuntu-22.04 - steps: - - name: Install monitor action - uses: GitHubSecurityLab/actions-permissions/monitor@v1 - - - name: Checkout - uses: actions/checkout@v3 - - - name: Cache build tools lifecycle-operator - if: needs.release-please.outputs.klt-release-created == 'true' - id: cache-build-tools-lifecycle-operator - uses: actions/cache@v3 - with: - path: ./lifecycle-operator/bin - key: build-tools-${{ github.ref_name }} - - - name: Cache build tools metrics-operator - if: needs.release-please.outputs.metrics-operator-release-created == 'true' - id: cache-build-tools-metrics-operator - uses: actions/cache@v3 - with: - path: ./metrics-operator/bin - key: build-tools-${{ github.ref_name }} - - - name: Cache build tools scheduler - if: needs.release-please.outputs.klt-release-created == 'true' - id: cache-build-tools-scheduler - uses: actions/cache@v3 - with: - path: ./scheduler/bin - key: build-tools-${{ github.ref_name }} - - - name: Cache build tools cert-manager - if: needs.release-please.outputs.cert-manager-release-created == 'true' - id: cache-build-tools-klt-cert-manager - uses: actions/cache@v3 - with: - path: ./klt-cert-manager/bin - key: build-tools-${{ github.ref_name }} - - - name: Set up Go - uses: actions/setup-go@v4 - with: - go-version: ${{ env.GO_VERSION }} - check-latest: true - - - name: Create KLT manifest - if: needs.release-please.outputs.klt-release-created == 'true' - env: - RELEASE_REGISTRY: ghcr.io/keptn - CHART_APPVERSION: ${{ needs.release-please.outputs.klt-tag-name }} - run: | - cd scheduler - make release-manifests - cd ../lifecycle-operator - make controller-gen release-manifests - cd ../klt-cert-manager - make controller-gen release-manifests - cd ../metrics-operator - make controller-gen release-manifests - cd .. - echo "---" >> lifecycle-operator/config/rendered/release.yaml - echo "---" >> scheduler/config/rendered/release.yaml - echo "---" >> klt-cert-manager/config/rendered/release.yaml - cat >> namespace.yaml << EOF - --- - apiVersion: v1 - kind: Namespace - metadata: - name: keptn-lifecycle-toolkit-system - --- - EOF - cat namespace.yaml \ - lifecycle-operator/config/rendered/release.yaml \ - scheduler/config/rendered/release.yaml \ - klt-cert-manager/config/rendered/release.yaml \ - metrics-operator/config/rendered/release.yaml > klt-manifest.yaml - - - name: Create Cert-Manager manifest - if: needs.release-please.outputs.cert-manager-release-created == 'true' - env: - RELEASE_REGISTRY: ghcr.io/keptn - CHART_APPVERSION: ${{ needs.release-please.outputs.cert-manager-tag-name }} - run: | - cd klt-cert-manager - make controller-gen release-manifests - cd .. - echo "---" >> klt-cert-manager/config/rendered/release.yaml - cat >> namespace.yaml << EOF - --- - apiVersion: v1 - kind: Namespace - metadata: - name: keptn-lifecycle-toolkit-system - --- - EOF - cat namespace.yaml \ - klt-cert-manager/config/rendered/release.yaml > cert-manager-manifest.yaml - - - name: Create Metrics Operator manifest - if: needs.release-please.outputs.metrics-operator-release-created == 'true' - env: - RELEASE_REGISTRY: ghcr.io/keptn - CHART_APPVERSION: ${{ needs.release-please.outputs.metrics-operator-tag-name }} - run: | - cd metrics-operator - make controller-gen release-manifests - cd .. - echo "---" >> metrics-operator/config/rendered/release.yaml - cat >> namespace.yaml << EOF - --- - apiVersion: v1 - kind: Namespace - metadata: - name: keptn-lifecycle-toolkit-system - --- - EOF - cat namespace.yaml \ - metrics-operator/config/rendered/release.yaml > metrics-operator-manifest.yaml - - - name: Attach KLT release assets - if: needs.release-please.outputs.klt-release-created == 'true' - uses: softprops/action-gh-release@v1 - with: - tag_name: ${{ needs.release-please.outputs.klt-tag-name }} - files: klt-manifest.yaml - - - name: Attach Cert-Manager release assets - if: needs.release-please.outputs.cert-manager-release-created == 'true' - uses: softprops/action-gh-release@v1 - with: - tag_name: ${{ needs.release-please.outputs.cert-manager-tag-name }} - files: cert-manager-manifest.yaml - - - name: Attach Metrics Operator release assets - if: needs.release-please.outputs.metrics-operator-release-created == 'true' - uses: softprops/action-gh-release@v1 - with: - tag_name: ${{ needs.release-please.outputs.metrics-operator-tag-name }} - files: metrics-operator-manifest.yaml - update-docs: name: Update Documentation needs: diff --git a/.github/workflows/security-scans.yml b/.github/workflows/security-scans.yml index 886971b65b..f0b8e05630 100644 --- a/.github/workflows/security-scans.yml +++ b/.github/workflows/security-scans.yml @@ -200,6 +200,7 @@ jobs: matrix: image: - "functions-runtime" + - "deno-runtime" - "python-runtime" - "lifecycle-operator" - "metrics-operator" diff --git a/.github/workflows/validate-semantic-pr.yml b/.github/workflows/validate-semantic-pr.yml index 018f4b228a..ac32215f90 100644 --- a/.github/workflows/validate-semantic-pr.yml +++ b/.github/workflows/validate-semantic-pr.yml @@ -36,12 +36,13 @@ jobs: test deps scopes: | + main helm-chart scheduler lifecycle-operator cert-manager metrics-operator - functions-runtime + deno-runtime python-runtime dashboards examples diff --git a/Makefile b/Makefile index 44ff29bfeb..4015701650 100644 --- a/Makefile +++ b/Makefile @@ -27,8 +27,6 @@ integration-test: # to run a single test by name use --test eg. --test=expose-ke kubectl kuttl test --start-kind=false ./test/integration/ --config=kuttl-test.yaml kubectl kuttl test --start-kind=false ./test/testcertificate/ --config=kuttl-test.yaml - - .PHONY: integration-test-local #these tests should run on a real cluster! integration-test-local: install-prometheus kubectl kuttl test --start-kind=false ./test/integration/ --config=kuttl-test-local.yaml @@ -51,8 +49,6 @@ install-prometheus: kubectl wait --for=condition=available deployment/kube-state-metrics -n monitoring --timeout=120s kubectl wait pod/prometheus-k8s-0 --for=condition=ready --timeout=120s -n monitoring - - .PHONY: cleanup-manifests cleanup-manifests: rm -rf manifests diff --git a/docs/content/en/docs/install/install.md b/docs/content/en/docs/install/install.md index 2fa1b2617b..35e435f600 100644 --- a/docs/content/en/docs/install/install.md +++ b/docs/content/en/docs/install/install.md @@ -19,8 +19,7 @@ Two methods are supported for installing the Keptn Lifecycle Toolkit (KLT): the [Helm Chart](#use-helm-chart). This is the preferred strategy because it allows you to customize your cluster. -* All releases can be installed using - the [manifests](#use-manifests). +* See the [use manifests](#use-manifests) section for more information on installing via manifest. This is the less-preferred way because it does not support customization. After KLT is installed, you must @@ -109,10 +108,9 @@ For more information,see ## Use manifests -All versions of the Lifecycle Toolkit can be installed using manifests, +Versions v0.10.0 and earlier of the Lifecycle Toolkit can be installed using manifests, although we recommend that you use Helm Charts -to install Version 0.7.0 and later -because the Helm Charts allow you to customize your configuration. +because they allow you to easily customize your configuration. Versions 0.6.0 and earlier can only be installed using manifests. diff --git a/docs/content/en/docs/snippets/tasks/install.md b/docs/content/en/docs/snippets/tasks/install.md deleted file mode 100644 index 7e3ee88434..0000000000 --- a/docs/content/en/docs/snippets/tasks/install.md +++ /dev/null @@ -1,59 +0,0 @@ -# Installation Instructions - -## Install version 0.7.0 and above - -In version 0.7.0 and later, you can install the Lifecycle Toolkit using either helm charts or manifests. - -For installing the Lifecycle Toolkit via Helm chart: - -```shell -helm repo add klt https://charts.lifecycle.keptn.sh -helm repo update -helm upgrade --install keptn klt/klt -n keptn-lifecycle-toolkit-system --create-namespace --wait -``` - -To install a specific version, use the `--version ` flag as part of the -`helm upgrade --install` command. - -To list available versions: - -```shell -helm repo update -helm search repo keptn-lifecycle-toolkit -``` - -The `helm upgrade --install` command offers a flag called `--set`, which can be used to specify -configuration options using the format key1=value1,key2=value2,.... - -Or you could download the chart value file and modify it using - -```shell -helm get values RELEASE_NAME [flags] > values.yaml -``` - -and install adding `--values=values.yaml` to your `helm upgrade` command (official documentation -available [here](https://helm.sh/docs/helm/helm_get_values/)). - -The full list of available flags can be found in the [helm-charts](https://github.com/keptn/lifecycle-toolkit/blob/main/helm/chart/README.md). - -> **Note** -Installation of the Lifecycle Toolkit version 0.6.0 and lower is not supported via helm charts. - -
-Install Keptn using Manifests - -All versions of the Lifecycle Toolkit can be installed using manifests, -with a command like the following: - - - -```shell -kubectl apply -f https://github.com/keptn/lifecycle-toolkit/releases/download/v0.8.1/manifest.yaml -kubectl wait --for=condition=Available deployment/lifecycle-operator -n keptn-lifecycle-toolkit-system --timeout=120s -``` - - - -The Lifecycle Toolkit and its dependencies are now installed and ready to use. - -
diff --git a/docs/content/en/docs/yaml-crd-ref/taskdefinition.md b/docs/content/en/docs/yaml-crd-ref/taskdefinition.md index 2182ca3572..1f85022d1e 100644 --- a/docs/content/en/docs/yaml-crd-ref/taskdefinition.md +++ b/docs/content/en/docs/yaml-crd-ref/taskdefinition.md @@ -150,7 +150,7 @@ spec: * **spec** * **deno** -- Specify that the task uses the `deno-runtime` and is expressed as a [Deno](https://deno.land/) script. - Refer to [function runtime](https://github.com/keptn/lifecycle-toolkit/tree/main/functions-runtime) + Refer to [deno runtime](https://github.com/keptn/lifecycle-toolkit/tree/main/runtimes/deno-runtime) for more information about this runner. The task can be defined as one of the following: @@ -580,7 +580,7 @@ This example prints data stored in the parameters map: You can refer to code stored online. For example, we have a few examples available in the -[python-runtime samples](https://github.com/keptn/lifecycle-toolkit/tree/main/python-runtime/samples) +[python-runtime samples](https://github.com/keptn/lifecycle-toolkit/tree/main/runtimes/python-runtime/samples) tree. Consider the following: diff --git a/examples/sample-app/base/app-post-deploy.yaml b/examples/sample-app/base/app-post-deploy.yaml index 744a4e501d..f939eba920 100644 --- a/examples/sample-app/base/app-post-deploy.yaml +++ b/examples/sample-app/base/app-post-deploy.yaml @@ -6,6 +6,6 @@ metadata: spec: function: httpRef: - url: https://raw.githubusercontent.com/keptn/lifecycle-controller/main/functions-runtime/samples/ts/slack.ts + url: https://raw.githubusercontent.com/keptn/lifecycle-controller/main/runtimes/deno-runtime/samples/ts/slack.ts secureParameters: secret: slack-secret diff --git a/examples/sample-app/base/python-task.yaml b/examples/sample-app/base/python-task.yaml index 22ab5e4f35..334f2ec393 100644 --- a/examples/sample-app/base/python-task.yaml +++ b/examples/sample-app/base/python-task.yaml @@ -6,7 +6,7 @@ metadata: spec: python: httpRef: - url: https://raw.githubusercontent.com/keptn/lifecycle-controller/main/python-runtime/samples/secrets.py + url: https://raw.githubusercontent.com/keptn/lifecycle-controller/main/runtimes/python-runtime/samples/secrets.py parameters: map: user: "myuser" diff --git a/examples/sample-app/version-1/app-pre-deploy.yaml b/examples/sample-app/version-1/app-pre-deploy.yaml index 6dd21ae0e9..36a243ec2e 100644 --- a/examples/sample-app/version-1/app-pre-deploy.yaml +++ b/examples/sample-app/version-1/app-pre-deploy.yaml @@ -6,7 +6,7 @@ metadata: spec: function: httpRef: - url: https://raw.githubusercontent.com/keptn-sandbox/lifecycle-controller/main/functions-runtime/samples/ts/http.ts + url: https://raw.githubusercontent.com/keptn-sandbox/lifecycle-controller/main/runtimes/deno-runtime/samples/ts/http.ts parameters: map: url: http://podtato-head-frontend.podtato-kubectl.svc.cluster.local:8080 diff --git a/examples/sample-app/version-2/app-pre-deploy.yaml b/examples/sample-app/version-2/app-pre-deploy.yaml index 6dd21ae0e9..36a243ec2e 100644 --- a/examples/sample-app/version-2/app-pre-deploy.yaml +++ b/examples/sample-app/version-2/app-pre-deploy.yaml @@ -6,7 +6,7 @@ metadata: spec: function: httpRef: - url: https://raw.githubusercontent.com/keptn-sandbox/lifecycle-controller/main/functions-runtime/samples/ts/http.ts + url: https://raw.githubusercontent.com/keptn-sandbox/lifecycle-controller/main/runtimes/deno-runtime/samples/ts/http.ts parameters: map: url: http://podtato-head-frontend.podtato-kubectl.svc.cluster.local:8080 diff --git a/examples/sample-app/version-3/app-pre-deploy.yaml b/examples/sample-app/version-3/app-pre-deploy.yaml index 6dd21ae0e9..36a243ec2e 100644 --- a/examples/sample-app/version-3/app-pre-deploy.yaml +++ b/examples/sample-app/version-3/app-pre-deploy.yaml @@ -6,7 +6,7 @@ metadata: spec: function: httpRef: - url: https://raw.githubusercontent.com/keptn-sandbox/lifecycle-controller/main/functions-runtime/samples/ts/http.ts + url: https://raw.githubusercontent.com/keptn-sandbox/lifecycle-controller/main/runtimes/deno-runtime/samples/ts/http.ts parameters: map: url: http://podtato-head-frontend.podtato-kubectl.svc.cluster.local:8080 diff --git a/examples/support/observability/assets/podtatohead-deployment-evaluation/check_entry.yaml b/examples/support/observability/assets/podtatohead-deployment-evaluation/check_entry.yaml index 61f8a2773d..6d44951163 100644 --- a/examples/support/observability/assets/podtatohead-deployment-evaluation/check_entry.yaml +++ b/examples/support/observability/assets/podtatohead-deployment-evaluation/check_entry.yaml @@ -6,7 +6,7 @@ metadata: spec: function: httpRef: - url: https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/functions-runtime/samples/ts/http.ts + url: https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/runtimes/deno-runtime/samples/ts/http.ts parameters: map: url: http://podtato-head-entry.podtato-kubectl.svc.cluster.local:9000 diff --git a/helm/chart/README.md b/helm/chart/README.md index 80c105f664..1e3f2d1cf6 100644 --- a/helm/chart/README.md +++ b/helm/chart/README.md @@ -13,7 +13,7 @@ checks | `scheduler.scheduler.containerSecurityContext` | Sets security context | | | `scheduler.scheduler.env.otelCollectorUrl` | sets url for open telemetry collector | `otel-collector:4317` | | `scheduler.scheduler.image.repository` | set image repository for scheduler | `ghcr.io/keptn/scheduler` | -| `scheduler.scheduler.image.tag` | set image tag for scheduler | `v0.8.1` | +| `scheduler.scheduler.image.tag` | set image tag for scheduler | `v0.8.1` | | `scheduler.scheduler.imagePullPolicy` | set image pull policy for scheduler | `Always` | | `scheduler.scheduler.livenessProbe` | customizable liveness probe for the scheduler | | | `scheduler.scheduler.readinessProbe` | customizable readiness probe for the scheduler | | @@ -71,34 +71,34 @@ checks ### Keptn Lifecycle Operator controller -| Name | Description | Value | -| ----------------------------------------------------------------------------- | ---------------------------------------------------------------------- | ---------------------------------------- | -| `lifecycleOperator.manager.containerSecurityContext` | Sets security context privileges | | -| `lifecycleOperator.manager.containerSecurityContext.allowPrivilegeEscalation` | | `false` | -| `lifecycleOperator.manager.containerSecurityContext.capabilities.drop` | | `["ALL"]` | -| `lifecycleOperator.manager.containerSecurityContext.privileged` | | `false` | -| `lifecycleOperator.manager.containerSecurityContext.runAsGroup` | | `65532` | -| `lifecycleOperator.manager.containerSecurityContext.runAsNonRoot` | | `true` | -| `lifecycleOperator.manager.containerSecurityContext.runAsUser` | | `65532` | -| `lifecycleOperator.manager.containerSecurityContext.seccompProfile.type` | | `RuntimeDefault` | -| `lifecycleOperator.manager.env.keptnAppControllerLogLevel` | sets the log level of Keptn App Controller | `0` | -| `lifecycleOperator.manager.env.keptnAppCreationRequestControllerLogLevel` | sets the log level of Keptn App Creation Request Controller | `0` | -| `lifecycleOperator.manager.env.keptnAppVersionControllerLogLevel` | sets the log level of Keptn AppVersion Controller | `0` | -| `lifecycleOperator.manager.env.keptnEvaluationControllerLogLevel` | sets the log level of Keptn Evaluation Controller | `0` | -| `lifecycleOperator.manager.env.keptnTaskControllerLogLevel` | sets the log level of Keptn Task Controller | `0` | -| `lifecycleOperator.manager.env.keptnTaskDefinitionControllerLogLevel` | sets the log level of Keptn TaskDefinition Controller | `0` | -| `lifecycleOperator.manager.env.keptnWorkloadControllerLogLevel` | sets the log level of Keptn Workload Controller | `0` | -| `lifecycleOperator.manager.env.keptnWorkloadInstanceControllerLogLevel` | sets the log level of Keptn WorkloadInstance Controller | `0` | -| `lifecycleOperator.manager.env.optionsControllerLogLevel` | sets the log level of Keptn Options Controller | `0` | -| `lifecycleOperator.manager.env.otelCollectorUrl` | Sets the URL for the open telemetry collector | `otel-collector:4317` | -| `lifecycleOperator.manager.env.functionRunnerImage` | specify image for deno task runtime | `ghcr.io/keptn/functions-runtime:v0.8.1` | -| `lifecycleOperator.manager.env.pythonRunnerImage` | specify image for python task runtime | `ghcr.io/keptn/python-runtime:v0.8.1` | -| `lifecycleOperator.manager.image.repository` | specify registry for manager image | `ghcr.io/keptn/lifecycle-operator` | -| `lifecycleOperator.manager.image.tag` | select tag for manager image | `v0.8.1` | -| `lifecycleOperator.manager.imagePullPolicy` | specify pull policy for manager image | `Always` | -| `lifecycleOperator.manager.livenessProbe` | custom livenessprobe for manager container | | -| `lifecycleOperator.manager.readinessProbe` | custom readinessprobe for manager container | | -| `lifecycleOperator.manager.resources` | specify limits and requests for manager container | | +| Name | Description | Value | +| ----------------------------------------------------------------------------- | ----------------------------------------------------------- | ------------------------------------- | +| `lifecycleOperator.manager.containerSecurityContext` | Sets security context privileges | | +| `lifecycleOperator.manager.containerSecurityContext.allowPrivilegeEscalation` | | `false` | +| `lifecycleOperator.manager.containerSecurityContext.capabilities.drop` | | `["ALL"]` | +| `lifecycleOperator.manager.containerSecurityContext.privileged` | | `false` | +| `lifecycleOperator.manager.containerSecurityContext.runAsGroup` | | `65532` | +| `lifecycleOperator.manager.containerSecurityContext.runAsNonRoot` | | `true` | +| `lifecycleOperator.manager.containerSecurityContext.runAsUser` | | `65532` | +| `lifecycleOperator.manager.containerSecurityContext.seccompProfile.type` | | `RuntimeDefault` | +| `lifecycleOperator.manager.env.keptnAppControllerLogLevel` | sets the log level of Keptn App Controller | `0` | +| `lifecycleOperator.manager.env.keptnAppCreationRequestControllerLogLevel` | sets the log level of Keptn App Creation Request Controller | `0` | +| `lifecycleOperator.manager.env.keptnAppVersionControllerLogLevel` | sets the log level of Keptn AppVersion Controller | `0` | +| `lifecycleOperator.manager.env.keptnEvaluationControllerLogLevel` | sets the log level of Keptn Evaluation Controller | `0` | +| `lifecycleOperator.manager.env.keptnTaskControllerLogLevel` | sets the log level of Keptn Task Controller | `0` | +| `lifecycleOperator.manager.env.keptnTaskDefinitionControllerLogLevel` | sets the log level of Keptn TaskDefinition Controller | `0` | +| `lifecycleOperator.manager.env.keptnWorkloadControllerLogLevel` | sets the log level of Keptn Workload Controller | `0` | +| `lifecycleOperator.manager.env.keptnWorkloadInstanceControllerLogLevel` | sets the log level of Keptn WorkloadInstance Controller | `0` | +| `lifecycleOperator.manager.env.optionsControllerLogLevel` | sets the log level of Keptn Options Controller | `0` | +| `lifecycleOperator.manager.env.otelCollectorUrl` | Sets the URL for the open telemetry collector | `otel-collector:4317` | +| `lifecycleOperator.manager.env.functionRunnerImage` | specify image for deno task runtime | `ghcr.io/keptn/deno-runtime:v0.8.1` | +| `lifecycleOperator.manager.env.pythonRunnerImage` | specify image for python task runtime | `ghcr.io/keptn/python-runtime:v0.8.1` | +| `lifecycleOperator.manager.image.repository` | specify registry for manager image | `ghcr.io/keptn/lifecycle-operator` | +| `lifecycleOperator.manager.image.tag` | select tag for manager image | `v0.8.1` | +| `lifecycleOperator.manager.imagePullPolicy` | specify pull policy for manager image | `Always` | +| `lifecycleOperator.manager.livenessProbe` | custom livenessprobe for manager container | | +| `lifecycleOperator.manager.readinessProbe` | custom readinessprobe for manager container | | +| `lifecycleOperator.manager.resources` | specify limits and requests for manager container | | ### Keptn Metrics Operator common diff --git a/helm/chart/doc.yaml b/helm/chart/doc.yaml index bdef4ff48c..c6a2938019 100644 --- a/helm/chart/doc.yaml +++ b/helm/chart/doc.yaml @@ -12,7 +12,7 @@ ## @param scheduler.scheduler.env.otelCollectorUrl sets url for open telemetry collector ## @param scheduler.scheduler.image.repository set image repository for scheduler -## @param scheduler.scheduler.image.tag set image tag for scheduler +## @param scheduler.scheduler.image.tag set image tag for scheduler ## @param scheduler.scheduler.imagePullPolicy set image pull policy for scheduler ## @extra scheduler.scheduler.livenessProbe customizable liveness probe for the scheduler @@ -132,11 +132,11 @@ ## @param lifecycleOperator.manager.env.optionsControllerLogLevel sets the log level of Keptn Options Controller ## @param lifecycleOperator.manager.env.otelCollectorUrl Sets the URL for the open telemetry collector -## @param lifecycleOperator.manager.env.functionRunnerImage specify image for deno task runtime -## @param lifecycleOperator.manager.env.pythonRunnerImage specify image for python task runtime +## @param lifecycleOperator.manager.env.functionRunnerImage specify image for deno task runtime +## @param lifecycleOperator.manager.env.pythonRunnerImage specify image for python task runtime ## @param lifecycleOperator.manager.image.repository specify registry for manager image -## @param lifecycleOperator.manager.image.tag select tag for manager image +## @param lifecycleOperator.manager.image.tag select tag for manager image ## @param lifecycleOperator.manager.imagePullPolicy specify pull policy for manager image ## @extra lifecycleOperator.manager.livenessProbe custom livenessprobe for manager container diff --git a/helm/chart/values.yaml b/helm/chart/values.yaml index 57efdc7524..b5e388356b 100644 --- a/helm/chart/values.yaml +++ b/helm/chart/values.yaml @@ -67,7 +67,7 @@ lifecycleOperator: seccompProfile: type: RuntimeDefault env: - functionRunnerImage: ghcr.io/keptn/functions-runtime:v0.8.1 + functionRunnerImage: ghcr.io/keptn/deno-runtime:v0.8.1 keptnAppControllerLogLevel: "0" keptnAppCreationRequestControllerLogLevel: "0" keptnAppVersionControllerLogLevel: "0" diff --git a/klt-cert-manager/Makefile b/klt-cert-manager/Makefile index 8dab68ee18..61414a7829 100644 --- a/klt-cert-manager/Makefile +++ b/klt-cert-manager/Makefile @@ -34,7 +34,6 @@ SHELL = /usr/bin/env bash -o pipefail .PHONY: all all: build - #### developer build #### .PHONY: clean clean: diff --git a/lifecycle-operator/Makefile b/lifecycle-operator/Makefile index 914d92a746..fa7b4a219c 100644 --- a/lifecycle-operator/Makefile +++ b/lifecycle-operator/Makefile @@ -191,7 +191,6 @@ envtest: $(ENVTEST) ## Download envtest-setup locally if necessary. $(ENVTEST): $(LOCALBIN) test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest - #### developer build #### .PHONY: clean clean: diff --git a/lifecycle-operator/config/manager/manager.yaml b/lifecycle-operator/config/manager/manager.yaml index 2fd16dec30..3468446b73 100644 --- a/lifecycle-operator/config/manager/manager.yaml +++ b/lifecycle-operator/config/manager/manager.yaml @@ -60,9 +60,9 @@ spec: fieldRef: fieldPath: metadata.name - name: FUNCTION_RUNNER_IMAGE - value: ghcr.io/keptn/functions-runtime:v0.8.1 # x-release-please-version + value: ghcr.io/keptn/deno-runtime:v0.8.1 - name: PYTHON_RUNNER_IMAGE - value: ghcr.io/keptn/python-runtime:v0.8.1 # x-release-please-version + value: ghcr.io/keptn/python-runtime:v0.8.1 - name: OTEL_COLLECTOR_URL value: otel-collector:4317 - name: KEPTN_APP_CONTROLLER_LOG_LEVEL diff --git a/lifecycle-operator/config/samples/function_execution/taskdefinition_function_upstream.yaml b/lifecycle-operator/config/samples/function_execution/taskdefinition_function_upstream.yaml index 04b39c960a..056c70f9ca 100644 --- a/lifecycle-operator/config/samples/function_execution/taskdefinition_function_upstream.yaml +++ b/lifecycle-operator/config/samples/function_execution/taskdefinition_function_upstream.yaml @@ -5,4 +5,4 @@ metadata: spec: function: httpRef: - url: https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/functions-runtime/samples/ts/slack.ts + url: https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/runtimes/deno-runtime/samples/ts/slack.ts diff --git a/lifecycle-operator/config/samples/function_execution/taskdefinition_function_upstream_scheduler.yaml b/lifecycle-operator/config/samples/function_execution/taskdefinition_function_upstream_scheduler.yaml index af2cc88433..adf2b17068 100644 --- a/lifecycle-operator/config/samples/function_execution/taskdefinition_function_upstream_scheduler.yaml +++ b/lifecycle-operator/config/samples/function_execution/taskdefinition_function_upstream_scheduler.yaml @@ -5,4 +5,4 @@ metadata: spec: function: httpRef: - url: https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/functions-runtime/samples/ts/schedule.ts + url: https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/runtimes/deno-runtime/samples/ts/schedule.ts diff --git a/lifecycle-operator/config/samples/function_execution/taskdefinition_function_upstream_slack.yaml b/lifecycle-operator/config/samples/function_execution/taskdefinition_function_upstream_slack.yaml index 04b39c960a..056c70f9ca 100644 --- a/lifecycle-operator/config/samples/function_execution/taskdefinition_function_upstream_slack.yaml +++ b/lifecycle-operator/config/samples/function_execution/taskdefinition_function_upstream_slack.yaml @@ -5,4 +5,4 @@ metadata: spec: function: httpRef: - url: https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/functions-runtime/samples/ts/slack.ts + url: https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/runtimes/deno-runtime/samples/ts/slack.ts diff --git a/lifecycle-operator/config/samples/python_execution/taskdefinition_pyfunction_upstream_hellopy.yaml b/lifecycle-operator/config/samples/python_execution/taskdefinition_pyfunction_upstream_hellopy.yaml index 29f89a376f..298b40d94b 100644 --- a/lifecycle-operator/config/samples/python_execution/taskdefinition_pyfunction_upstream_hellopy.yaml +++ b/lifecycle-operator/config/samples/python_execution/taskdefinition_pyfunction_upstream_hellopy.yaml @@ -5,4 +5,4 @@ metadata: spec: python: httpRef: - url: https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/python-runtime/samples/hellopy.py + url: https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/runtimes/python-runtime/samples/hellopy.py diff --git a/metrics-operator/Makefile b/metrics-operator/Makefile index 78c1025d1a..aca503a062 100644 --- a/metrics-operator/Makefile +++ b/metrics-operator/Makefile @@ -152,7 +152,6 @@ envtest: $(ENVTEST) ## Download envtest-setup locally if necessary. $(ENVTEST): $(LOCALBIN) test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest - #### developer build #### .PHONY: clean clean: diff --git a/release-please-config.json b/release-please-config.json index 543fce77c1..9b9d57efb1 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -12,15 +12,19 @@ "prerelease": false, "monorepo-tags": "klt", "draft": false, - "exclude-paths": ["klt-cert-manager", "metrics-operator"], + "exclude-paths": [ + "klt-cert-manager", + "lifecycle-operator", + "metrics-operator", + "scheduler", + "runtimes/deno-runtime", + "runtimes/python-runtime" + ], "extra-files": [ "README.md", "operator/config/manager/manager.yaml", "helm/chart/Chart.yaml", "Makefile", - "operator/Makefile", - "scheduler/Makefile", - "docs/content/en/docs/snippets/tasks/install.md", "helm/chart/values.yaml", "helm/chart/README.md" ] @@ -36,6 +40,30 @@ "Makefile" ] }, + "lifecycle-operator": { + "package-name": "lifecycle-operator", + "component": "lifecycle-operator", + "changelog-path": "CHANGELOG.md", + "release-type": "go", + "monorepo-tags": "lifecycle-operator", + "prerelease": false, + "draft": false, + "extra-files": [ + "Makefile" + ] + }, + "scheduler": { + "package-name": "scheduler", + "component": "scheduler", + "changelog-path": "CHANGELOG.md", + "release-type": "go", + "monorepo-tags": "scheduler", + "prerelease": false, + "draft": false, + "extra-files": [ + "Makefile" + ] + }, "metrics-operator": { "package-name": "metrics-operator", "changelog-path": "CHANGELOG.md", @@ -46,8 +74,35 @@ "extra-files": [ "Makefile" ] + }, + "runtimes/python-runtime": { + "package-name": "python-runtime", + "changelog-path": "CHANGELOG.md", + "release-type": "go", + "monorepo-tags": "python-runtime", + "prerelease": false, + "draft": false + }, + "runtimes/deno-runtime": { + "package-name": "deno-runtime", + "changelog-path": "CHANGELOG.md", + "release-type": "go", + "monorepo-tags": "deno-runtime", + "prerelease": false, + "draft": false } }, + "plugins": [ + { + "type": "linked-versions", + "groupName": "lifecycle-operator-and-scheduler", + "components": [ + "lifecycle-operator", + "scheduler" + ], + "merge": true + } + ], "changelog-sections": [ { "type": "feat", diff --git a/renovate.json b/renovate.json index 3126020453..3dd72b4246 100644 --- a/renovate.json +++ b/renovate.json @@ -23,10 +23,6 @@ "**/tests/**" ], "ignoreDeps": [ - "ghcr.io/keptn/lifecycle-operator", - "ghcr.io/keptn/scheduler", - "ghcr.io/keptn/functions-runtime", - "ghcr.io/keptn/python-runtime", "ghcr.io/keptn/metrics-operator" ], "packageRules": [ diff --git a/functions-runtime/Dockerfile b/runtimes/deno-runtime/Dockerfile similarity index 100% rename from functions-runtime/Dockerfile rename to runtimes/deno-runtime/Dockerfile diff --git a/functions-runtime/README.md b/runtimes/deno-runtime/README.md similarity index 83% rename from functions-runtime/README.md rename to runtimes/deno-runtime/README.md index 3d2076d1ef..2216282303 100644 --- a/functions-runtime/README.md +++ b/runtimes/deno-runtime/README.md @@ -1,4 +1,4 @@ -# Keptn Lifecycle Controller - Function Runtime +# Keptn Lifecycle Controller - Deno Runtime ## Build @@ -8,7 +8,7 @@ docker build -t keptnsandbox/klc-runtime:${VERSION} . ## Usage -The Keptn function runtime uses [Deno](https://deno.land/) +The Keptn deno runtime uses [Deno](https://deno.land/) to execute Javascript/Typescript code. The Keptn Lifecycle Toolkit uses this runtime to run [KeptnTask](https://lifecycle.keptn.sh/docs/tasks/write-tasks/) for pre- and post-checks. @@ -29,14 +29,14 @@ console.log(secret); Replace `${VERSION}` with the KLT version of your choice. ```sh -docker run -v $(pwd)/test.ts:/test.ts -e SCRIPT=/test.ts -e DATA='{ "url":"http://localhost:9090" }' -e SECURE_DATA='{ "token": "myToken"}' -it ghcr.io/keptn/functions-runtime:${VERSION} +docker run -v $(pwd)/test.ts:/test.ts -e SCRIPT=/test.ts -e DATA='{ "url":"http://localhost:9090" }' -e SECURE_DATA='{ "token": "myToken"}' -it ghcr.io/keptn/deno-runtime:${VERSION} ``` ### Docker with function on webserver (function in this repo) ```shell docker run \ - -e SCRIPT=https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/functions-runtime/samples/ts/hello-world.ts \ + -e SCRIPT=https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/runtimes/deno-runtime/samples/ts/hello-world.ts \ -it \ keptnsandbox/klc-runtime:${VERSION} ``` @@ -45,7 +45,7 @@ docker run \ ```shell docker run \ - -e SCRIPT=https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/functions-runtime/samples/ts/scheduler.ts \ + -e SCRIPT=https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/runtimes/deno-runtime/samples/ts/scheduler.ts \ -e DATA='{ "targetDate":"2025-04-16T06:55:31.820Z" }' \ -it \ keptnsandbox/klc-runtime:${VERSION} @@ -55,7 +55,7 @@ docker run \ ```shell docker run \ - -e SCRIPT=https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/functions-runtime/samples/ts/slack.ts \ + -e SCRIPT=https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/runtimes/deno-runtime/samples/ts/slack.ts \ -e SECURE_DATA='{ "slack_hook":"hook/parts","text":"this is my test message" }' \ -it \ keptnsandbox/klc-runtime:${VERSION} @@ -65,10 +65,10 @@ docker run \ ```shell docker run \ - -e SCRIPT=https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/functions-runtime/samples/ts/prometheus.ts \ + -e SCRIPT=https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/runtimes/deno-runtime/samples/ts/prometheus.ts \ -e DATA='{ "url":"http://localhost:9090", "metrics": "up{service=\"kubernetes\"}", "expected_value": "1" }' \ -it \ - ghcr.io/keptn/functions-runtime:${VERSION} + ghcr.io/keptn/deno-runtime:${VERSION} ``` diff --git a/functions-runtime/entrypoint.sh b/runtimes/deno-runtime/entrypoint.sh similarity index 100% rename from functions-runtime/entrypoint.sh rename to runtimes/deno-runtime/entrypoint.sh diff --git a/functions-runtime/samples/ts/dns.ts b/runtimes/deno-runtime/samples/ts/dns.ts similarity index 100% rename from functions-runtime/samples/ts/dns.ts rename to runtimes/deno-runtime/samples/ts/dns.ts diff --git a/functions-runtime/samples/ts/hello-world.ts b/runtimes/deno-runtime/samples/ts/hello-world.ts similarity index 100% rename from functions-runtime/samples/ts/hello-world.ts rename to runtimes/deno-runtime/samples/ts/hello-world.ts diff --git a/functions-runtime/samples/ts/http.ts b/runtimes/deno-runtime/samples/ts/http.ts similarity index 100% rename from functions-runtime/samples/ts/http.ts rename to runtimes/deno-runtime/samples/ts/http.ts diff --git a/functions-runtime/samples/ts/prometheus.ts b/runtimes/deno-runtime/samples/ts/prometheus.ts similarity index 100% rename from functions-runtime/samples/ts/prometheus.ts rename to runtimes/deno-runtime/samples/ts/prometheus.ts diff --git a/functions-runtime/samples/ts/schedule.ts b/runtimes/deno-runtime/samples/ts/schedule.ts similarity index 100% rename from functions-runtime/samples/ts/schedule.ts rename to runtimes/deno-runtime/samples/ts/schedule.ts diff --git a/functions-runtime/samples/ts/slack.ts b/runtimes/deno-runtime/samples/ts/slack.ts similarity index 100% rename from functions-runtime/samples/ts/slack.ts rename to runtimes/deno-runtime/samples/ts/slack.ts diff --git a/python-runtime/Dockerfile b/runtimes/python-runtime/Dockerfile similarity index 100% rename from python-runtime/Dockerfile rename to runtimes/python-runtime/Dockerfile diff --git a/python-runtime/README.md b/runtimes/python-runtime/README.md similarity index 81% rename from python-runtime/README.md rename to runtimes/python-runtime/README.md index bf7cab3cbd..7e9548e5ea 100644 --- a/python-runtime/README.md +++ b/runtimes/python-runtime/README.md @@ -3,7 +3,7 @@ ## Build ```shell -docker build -t lifecycle-toolkit/python-runtime:${VERSION} . +docker build -t lifecycle-toolkit/runtimes/python-runtime:${VERSION} . ``` ## Usage @@ -23,7 +23,7 @@ Replace `${VERSION}` with the KLT version of your choice. ### mounting a python file ```shell -docker run -v $(pwd)/samples/hellopy.py:/hellopy.py -e "SCRIPT=hellopy.py" -it lifecycle-toolkit/python-runtime:${VERSION} +docker run -v $(pwd)/samples/hellopy.py:/hellopy.py -e "SCRIPT=hellopy.py" -it lifecycle-toolkit/runtimes/python-runtime:${VERSION} ``` Where the file in sample/hellopy.py contains python3 code: @@ -48,7 +48,7 @@ You can pass python command line arguments by specifying `CMD_ARGS`. The following example will print the help of python3: ```shell -docker run -e "CMD_ARGS= -help" -it lifecycle-toolkit/python-runtime:${VERSION} +docker run -e "CMD_ARGS= -help" -it lifecycle-toolkit/runtimes/python-runtime:${VERSION} ``` ### Pass arguments to your python script @@ -56,7 +56,7 @@ docker run -e "CMD_ARGS= -help" -it lifecycle-toolkit/python-runtime:${VERSION} In this example we pass one argument (-i test.txt) to the script ```shell -docker run -v $(pwd)/samples/args.py:/args.py -e "SCRIPT=args.py -i test.txt" -it lifecycle-toolkit/python-runtime:${VERSION} +docker run -v $(pwd)/samples/args.py:/args.py -e "SCRIPT=args.py -i test.txt" -it lifecycle-toolkit/runtimes/python-runtime:${VERSION} ``` ### Use a script from url @@ -64,7 +64,7 @@ docker run -v $(pwd)/samples/args.py:/args.py -e "SCRIPT=args.py -i test.txt" - We can call the hellopy.py script downloading it directly from github ```shell -docker run -e "SCRIPT=https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/python-runtime/samples/hellopy.py" -it lifecycle-toolkit/python-runtime:${VERSION} +docker run -e "SCRIPT=https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/runtimes/python-runtime/samples/hellopy.py" -it lifecycle-toolkit/runtimes/python-runtime:${VERSION} ``` diff --git a/python-runtime/entrypoint.sh b/runtimes/python-runtime/entrypoint.sh similarity index 100% rename from python-runtime/entrypoint.sh rename to runtimes/python-runtime/entrypoint.sh diff --git a/python-runtime/samples/args.py b/runtimes/python-runtime/samples/args.py similarity index 100% rename from python-runtime/samples/args.py rename to runtimes/python-runtime/samples/args.py diff --git a/python-runtime/samples/hellopy.py b/runtimes/python-runtime/samples/hellopy.py similarity index 100% rename from python-runtime/samples/hellopy.py rename to runtimes/python-runtime/samples/hellopy.py diff --git a/python-runtime/samples/secrets.py b/runtimes/python-runtime/samples/secrets.py similarity index 100% rename from python-runtime/samples/secrets.py rename to runtimes/python-runtime/samples/secrets.py diff --git a/test/integration/app-failing-pre-task/00-install.yaml b/test/integration/app-failing-pre-task/00-install.yaml index adcf630063..c6789f72a7 100644 --- a/test/integration/app-failing-pre-task/00-install.yaml +++ b/test/integration/app-failing-pre-task/00-install.yaml @@ -47,7 +47,7 @@ metadata: spec: function: httpRef: - url: https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/functions-runtime/samples/ts/http.ts + url: https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/runtimes/deno-runtime/samples/ts/http.ts parameters: map: url: http://podtato-head-entry:9000 diff --git a/test/integration/podtato-head-application/00-install.yaml b/test/integration/podtato-head-application/00-install.yaml index b8a6f95c68..4bfec55e07 100644 --- a/test/integration/podtato-head-application/00-install.yaml +++ b/test/integration/podtato-head-application/00-install.yaml @@ -344,7 +344,7 @@ metadata: spec: function: httpRef: - url: https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/functions-runtime/samples/ts/http.ts + url: https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/runtimes/deno-runtime/samples/ts/http.ts parameters: map: url: http://podtato-head-entry:9000 diff --git a/test/integration/restartable-app/00-install.yaml b/test/integration/restartable-app/00-install.yaml index 5c2ea28ded..fabe8ee550 100644 --- a/test/integration/restartable-app/00-install.yaml +++ b/test/integration/restartable-app/00-install.yaml @@ -327,7 +327,7 @@ metadata: spec: function: httpRef: - url: https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/functions-runtime/samples/ts/http.ts + url: https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/runtimes/deno-runtime/samples/ts/http.ts parameters: map: url: http://podtato-head-entry:9000 diff --git a/test/integration/workload-instance-failing-pre-task/00-install.yaml b/test/integration/workload-instance-failing-pre-task/00-install.yaml index aa5f060f74..0a0fbcf724 100644 --- a/test/integration/workload-instance-failing-pre-task/00-install.yaml +++ b/test/integration/workload-instance-failing-pre-task/00-install.yaml @@ -17,7 +17,7 @@ metadata: spec: function: httpRef: - url: https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/functions-runtime/samples/ts/http.ts + url: https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/runtimes/deno-runtime/samples/ts/http.ts parameters: map: url: http://podtato-head-entry:9000