forked from kyma-project/lifecycle-manager
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/main' into feature/kyma-projec…
…t#1839-deprecate-channel-field-module-template
- Loading branch information
Showing
115 changed files
with
2,991 additions
and
983 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,7 +21,6 @@ | |
| atlassian-ide-plugin.xml | ||
|
|
||
| ## VSCode | ||
| **/*.vscode | ||
| **/*.devcontainer* | ||
|
|
||
| ### OSX template | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| { | ||
| // Use IntelliSense to learn about possible attributes. | ||
| // Hover to view descriptions of existing attributes. | ||
| // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 | ||
| "version": "0.2.0", | ||
| "configurations": [ | ||
| { | ||
| // use task "Deploy Kyma" with "localhost" option | ||
| "name": "Launch KLM", | ||
| "type": "go", | ||
| "request": "launch", | ||
| "mode": "auto", | ||
| "program": "${cwd}/cmd/main.go", | ||
| "args": ["--in-kcp-mode"], | ||
| "env": { | ||
| "KUBECONFIG": "${env:HOME}/.k3d/kcp-local.yaml", | ||
| "ENABLE_WEBHOOKS": "false" | ||
| }, | ||
| "preLaunchTask": "Install CRDs" | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,181 @@ | ||
| { | ||
| // See https://go.microsoft.com/fwlink/?LinkId=733558 | ||
| // for the documentation about the tasks.json format | ||
| "version": "2.0.0", | ||
| "tasks": [ | ||
| { | ||
| "label": "Delete Test Clusters", | ||
| "type": "shell", | ||
| "command": "k3d cluster rm kcp skr", | ||
| }, | ||
| { | ||
| "label": "Ensure Test Clusters", | ||
| "type": "shell", | ||
| "command": "${cwd}/scripts/tests/create_test_clusters.sh", | ||
| }, | ||
| { | ||
| "label": "Create New Test Clusters", | ||
| "type": "shell", | ||
| "command": "${cwd}/scripts/tests/create_test_clusters.sh", | ||
| "dependsOn": [ | ||
| "Delete Test Clusters" | ||
| ] | ||
| }, | ||
| // re-run if encountering error that the watcher CRD is missing | ||
| { | ||
| "label": "Deploy KLM from sources", | ||
| "type": "shell", | ||
| "command": "TAG=\"$(date +%Y%m%d%H%M%S)\" && make docker-build IMG=${LOCAL_IMG}:${TAG}; make docker-push IMG=${LOCAL_IMG}:${TAG}; make local-deploy-with-watcher IMG=${CLUSTER_IMG}:${TAG}", | ||
| "options": { | ||
| "env": { | ||
| "LOCAL_IMG": "localhost:5111/lifecycle-manager", | ||
| "CLUSTER_IMG": "k3d-myregistry.localhost:5000/lifecycle-manager", | ||
| "KUBECONFIG": "${env:HOME}/.k3d/kcp-local.yaml", | ||
|
|
||
| } | ||
| } | ||
| }, | ||
| // re-run if encountering error that the watcher CRD is missing | ||
| { | ||
| "label": "Deploy KLM from registry", | ||
| "type": "shell", | ||
| "command": "make local-deploy-with-watcher IMG=${IMG_REGISTRY_HOST}/${input:klmImageRegistry}/${IMG_NAME}:${input:klmImageTag}", | ||
| "options": { | ||
| "env": { | ||
| "IMG_REGISTRY_HOST": "europe-docker.pkg.dev/kyma-project", | ||
| "IMG_NAME": "lifecycle-manager", | ||
| "KUBECONFIG": "${env:HOME}/.k3d/kcp-local.yaml", | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "label": "Deploy template-operator", | ||
| "type": "shell", | ||
| "command": "kubectl apply -f ${cwd}/tests/moduletemplates/${input:templateOperatorVersion}", | ||
| "options": { | ||
| "env": { | ||
| "KUBECONFIG": "${env:HOME}/.k3d/kcp-local.yaml", | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "label": "Deploy kyma", | ||
| "type": "shell", | ||
| "command": "export SKR_HOST=${input:skrHost} && ${cwd}/scripts/tests/deploy_kyma.sh", | ||
| "options": { | ||
| "env": { | ||
| "KUBECONFIG": "${env:HOME}/.k3d/kcp-local.yaml", | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "label": "Un-Deploy kyma", | ||
| "type": "shell", | ||
| "command": "kubectl -n kcp-system delete kyma kyma-sample; kubectl -n kcp-system delete secret kyma-sample", | ||
| "options": { | ||
| "env": { | ||
| "KUBECONFIG": "${env:HOME}/.k3d/kcp-local.yaml", | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "label": "E2E Tests", | ||
| "type": "shell", | ||
| "command": "make -C ${cwd}/tests/e2e ${input:e2eTestTarget}", | ||
| "group": { | ||
| "kind": "test" | ||
| }, | ||
| "options": { | ||
| "env": { | ||
| "KCP_KUBECONFIG": "${env:HOME}/.k3d/kcp-local.yaml", | ||
| "SKR_KUBECONFIG": "${env:HOME}/.k3d/skr-local.yaml" | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "label": "Install CRDs", | ||
| "type": "shell", | ||
| "command": "make install", | ||
| "options": { | ||
| "env": { | ||
| "KUBECONFIG": "${env:HOME}/.k3d/kcp-local.yaml", | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "inputs": [ | ||
| { | ||
| // not all of the options work OOTB, see deploy-lifecycle-manager-e2e action.yaml for specific patches | ||
| "id": "e2eTestTarget", | ||
| "type": "pickString", | ||
| "description": "E2E test target", | ||
| "options": [ | ||
| "watcher-enqueue", | ||
| "rbac-privileges", | ||
| "kyma-deprovision-with-foreground-propagation", | ||
| "kyma-deprovision-with-background-propagation", | ||
| "module-status-decoupling-with-statefulset", | ||
| "module-status-decoupling-with-deployment", | ||
| "kyma-metrics", | ||
| "module-without-default-cr", | ||
| "module-consistency", | ||
| "non-blocking-deletion", | ||
| "upgrade-under-deletion", | ||
| "purge-controller", | ||
| "purge-metrics", | ||
| "module-upgrade-channel-switch", | ||
| "module-upgrade-new-version", | ||
| "unmanage-module", | ||
| "skip-manifest-reconciliation", | ||
| "ca-certificate-rotation", | ||
| "self-signed-certificate-rotation", | ||
| "mandatory-module", | ||
| "mandatory-module-metrics", | ||
| "misconfigured-kyma-secret", | ||
| "ocm-compatible-module-template", | ||
| ] | ||
| }, | ||
| { | ||
| "id": "templateOperatorVersion", | ||
| "type": "pickString", | ||
| "description": "Template-operator manifest", | ||
| "options": [ | ||
| "mandatory_moduletemplate_template_operator_v1.yaml", | ||
| "mandatory_moduletemplate_template_operator_v2.yaml", | ||
| "moduletemplate_template_operator_regular_new_ocm.yaml", | ||
| "moduletemplate_template_operator_v1_regular.yaml", | ||
| "moduletemplate_template_operator_v2_fast.yaml", | ||
| "moduletemplate_template_operator_v2_regular_new_version.yaml", | ||
| "operator_v1beta2_moduletemplate_kcp-module_updated.yaml", | ||
| "operator_v1beta2_moduletemplate_kcp-module-cred-label.yaml", | ||
| "operator_v1beta2_moduletemplate_kcp-module.yaml", | ||
| "operator_v1beta2_moduletemplate_ocm.software.v3alpha1.yaml" | ||
| ] | ||
| }, | ||
| { | ||
| "id": "klmImageRegistry", | ||
| "type": "pickString", | ||
| "description": "Registry of KLM image", | ||
| "options": [ | ||
| "dev", | ||
| "prod" | ||
| ] | ||
| }, | ||
| { | ||
| "id": "klmImageTag", | ||
| "type": "promptString", | ||
| "description": "Tag of the KLM image, e.g. 'latest'", | ||
| }, | ||
| { | ||
| "id": "skrHost", | ||
| "type": "pickString", | ||
| "description": "Host of the SKR", | ||
| "options": [ | ||
| // use host.k3d.internal when deploying KLM into the cluster | ||
| "host.k3d.internal", | ||
| // use localhost when running KLM locally on the machine | ||
| "localhost" | ||
| ] | ||
| }, | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.