Merge branch 'main' into 0616-task-delete

Signed-off-by: odubajDT <[email protected]>
keptn · Jun 20, 2023 · 8953eb3 · 8953eb3
2 parents 92717bd + 05572ec
commit 8953eb3
Show file tree

Hide file tree

Showing 29 changed files with 553 additions and 342 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -207,7 +207,7 @@ jobs:
     if: needs.release-please.outputs.releases_created == 'true'
     with:
       tag_name: ${{ needs.release-please.outputs.tag_name }}
-    uses: keptn/docs-tooling/.github/workflows/release-docs.yml@v0.0.2-beta1
+    uses: keptn/docs-tooling/.github/workflows/release-docs.yml@v0.1.2
     secrets: inherit
 
   update-examples:

diff --git a/.github/workflows/security-scans.yml b/.github/workflows/security-scans.yml
@@ -66,7 +66,7 @@ jobs:
         with:
           name: manifests
           path: |
-            ./dist/*-manifest/
+            ./dist/*-manifest-test/
 
       - name: Upload manifests user run
         if: ${{ github.event_name  != 'schedule' }}

diff --git a/docs/Makefile b/docs/Makefile
@@ -1,7 +1,7 @@
 ROOT_DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
 VOLUMES := -v $(ROOT_DIR):/src 
 # renovate: datasource=docker depName=klakegg/hugo
-HUGO_VERSION := 0.107.0
+HUGO_VERSION := 0.111.3
 IMAGE := klakegg/hugo:$(HUGO_VERSION)-ext
 PORT := 1314
 DOCKER_CMD := docker run --rm -t -e HUGO_CACHEDIR=/src/tmp/.hugo -e HUGOxPARAMSxGITHUB_REPO=""

diff --git a/docs/config/_default/config.yaml b/docs/config/_default/config.yaml
@@ -27,6 +27,7 @@ module:
             - "mentorship"
         - source: "README.md"
           target: "./content/community/_index.md"
+
   proxy: direct
 languages:
   en:
@@ -40,3 +41,6 @@ menu:
         rel: external
       url: https://v1.keptn.sh/
       weight: 1
+
+ignoreErrors:
+  - "error-remote-getjson"
diff --git a/docs/config/_default/params.yaml b/docs/config/_default/params.yaml
@@ -14,6 +14,8 @@ versions:
 mermaid:
   enable: true
 
+currentversion: main
+
 links:
   developer:
     - desc: Development takes place here!

diff --git a/docs/content/en/docs/_index.md b/docs/content/en/docs/_index.md
@@ -4,4 +4,5 @@ linktitle: Docs
 description: Learn how to use Keptn.
 cascade:
   type: docs
+  currentversion: main
 ---
diff --git a/docs/content/en/docs/concepts/apps/assets/trace.png b/docs/content/en/docs/concepts/apps/assets/trace.png
diff --git a/docs/content/en/docs/concepts/keptnConfig/_index.md b/docs/content/en/docs/concepts/keptnConfig/_index.md
diff --git a/docs/content/en/docs/concepts/metrics/_index.md b/docs/content/en/docs/concepts/metrics/_index.md
diff --git a/docs/content/en/docs/concepts/overview/_index.md b/docs/content/en/docs/concepts/overview/_index.md
diff --git a/docs/content/en/docs/concepts/overview/how-it-works/_index.md b/docs/content/en/docs/concepts/overview/how-it-works/_index.md
diff --git a/docs/content/en/docs/concepts/overview/phases/_index.md b/docs/content/en/docs/concepts/overview/phases/_index.md
diff --git a/docs/content/en/docs/concepts/workloads/_index.md b/docs/content/en/docs/concepts/workloads/_index.md
@@ -1,5 +1,5 @@
 ---
-title: Workloads
+title: Keptn Workloads
 description: Learn what Keptn Workloads are and how to use them
 icon: concepts
 layout: quickstart
@@ -26,7 +26,7 @@ from metadata information;
 it is not necessary to manually create a YAML file that defines it.
 
 A `KeptnWorkload` instance is responsible for executing
-the pre- and post deployment checks of a workload.
+the pre- and post-deployment checks of a Workload.
 In its state, it keeps track of the current status of all checks,
 as well as the overall state of the Pre Deployment phase,
 which the scheduler can use to determine

diff --git a/docs/content/en/docs/getting-started/orchestrate/_index.md b/docs/content/en/docs/getting-started/orchestrate/_index.md
@@ -134,7 +134,7 @@ Tasks are resources that are defined in a
 file.
 In our example, the tasks are defined in the
 [keptn-tasks.yaml](https://github.com/keptn-sandbox/klt-on-k3s-with-argocd/blob/main/simplenode-dev/keptn-tasks.yaml)
-file
+file.
 As an example,
 we have a `notify` task that composes some markdown text
 to be sent as Slack notifications
@@ -165,6 +165,13 @@ For this example, the code to be executed is embedded in this file
 although, in practice,
 this script would probably be located on a remote webserver.
 
+Note that, beginning with KLT 0.8.0,
+you can also use Python 3 to define your task,
+or you can define a standard Kubernetes container
+that uses the image, runner, and runtime dependencies that you choose.
+For more information, see
+[Working with Keptn tasks](../../implementing/tasks).
+
 You can view the actual JavaScript code for the task in the repository.
 You see that "context" is important in this code.
 This refers to the context in which this code executes --

diff --git a/docs/content/en/docs/implementing/integrate/_index.md b/docs/content/en/docs/implementing/integrate/_index.md
@@ -51,7 +51,7 @@ and
 and
 [DaemonSets](https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/)
 in the namespaces where KLT is enabled.
-If KLT finds any of hese resources and the resource has either
+If KLT finds any of these resources and the resource has either
 the keptn.sh or the kubernetes recommended labels,
 it creates a `KeptnWorkload` resource for the version it detects.