Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions docs/user/tutorials/01-10-add-delete-modules.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ This tutorial shows how you can add and delete a new module using Kyma CLI.
* To add a new module with the default policy set to `CreateAndDelete`, use the following command:

```bash
kyma module add {MODULE-NAME} --default-cr
kyma module add {MODULE-NAME} --default-config-cr
```

* To add a module with a different CR, use the `--cr-path={CR-FILEPATH}` flag:
* To add a module with a different CR, use the `--config-cr-path={CR-FILEPATH}` flag:

```bash
kyma module add {MODULE-NAME} --cr-path={CR-PATH-FILEPATH}
kyma module add {MODULE-NAME} --config-cr-path={CR-PATH-FILEPATH}
```

* To specify which channel the module should use, add the `-c {CHANNEL-NAME}` flag:

```bash
kyma module add {MODULE-NAME} -c {CHANNEL-NAME} --default-cr
kyma module add {MODULE-NAME} -c {CHANNEL-NAME} --default-config-cr
```

3. To see if your module is added, run the following command:
Expand Down
6 changes: 3 additions & 3 deletions docs/user/tutorials/01-20-app-push-command-usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ To use `kyma app push`, you must also provide either a Dockerfile, Docker image,
1. Add the Istio, Docker Registry, and API Gateway modules:

```bash
kyma module add istio --default-cr
kyma module add docker-registry -c experimental --default-cr
kyma module add api-gateway --default-cr
kyma module add istio --default-config-cr
kyma module add docker-registry -c experimental --default-config-cr
kyma module add api-gateway --default-config-cr
```

2. Clone the [Paketo code examples](https://github.com/paketo-buildpacks/samples/tree/main) repository into the desired folder:
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/alpha/module/pull.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,6 @@ func getWarningTextForCommunityModuleUsage(pulledModule *dtos.PullResult) string
"Next Steps:\n" +
"To install this module on your cluster, you can use the sample command:\n\n" +
" # Install with default configuration:\n" +
fmt.Sprintf(" kyma module add %s/%s --default-cr\n\n", pulledModule.Namespace, pulledModule.ModuleTemplateName) +
fmt.Sprintf(" kyma module add %s/%s --default-config-cr\n\n", pulledModule.Namespace, pulledModule.ModuleTemplateName) +
"For more information about module installation, run: kyma module add --help\n"
}
2 changes: 1 addition & 1 deletion internal/cmd/module/pull.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,6 @@ func getWarningTextForCommunityModuleUsage(moduleTemplate *kyma.ModuleTemplate)
"Next Steps:\n" +
"To install this module on your cluster, you can use the sample command:\n" +
" # Install with default configuration:\n" +
fmt.Sprintf(" kyma module add %s/%s --default-cr\n\n", moduleTemplate.Namespace, moduleTemplate.Name) +
fmt.Sprintf(" kyma module add %s/%s --default-config-cr\n\n", moduleTemplate.Namespace, moduleTemplate.Name) +
"For more information about module installation, run: kyma module add --help\n"
}
2 changes: 1 addition & 1 deletion internal/registry/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func GetInternalConfig(ctx context.Context, client kube.Client) (*InternalRegist
return nil, clierror.Wrap(err,
clierror.New("failed to load the in-cluster registry configuration",
"ensure cluster is available and properly configured",
"add the Docker Registry module by calling `kyma module add docker-registry -c experimental --default-cr`",
"add the Docker Registry module by calling `kyma module add docker-registry -c experimental --default-config-cr`",
),
)
}
Expand Down
4 changes: 2 additions & 2 deletions tests/btp/integration-test-btp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ echo -e "\n---------------------------------------------------------------------
echo -e "Step2: Manage modules \n"

../../bin/kyma module catalog
../../bin/kyma module add serverless --default-cr
../../bin/kyma module add serverless --default-config-cr
echo "..waiting for serverless module to be installed"
while ! kubectl get crd serverlesses.operator.kyma-project.io; do echo "Waiting for CRD serverless..."; sleep 1; done
kubectl wait --for condition=established crd/serverlesses.operator.kyma-project.io
Expand Down Expand Up @@ -76,7 +76,7 @@ while ! kubectl get secret object-store-reference-binding --namespace kyma-syste
echo -e "\n--------------------------------------------------------------------------------------\n"
echo -e "Step5: Enable Docker Registry community module (with persistent BTP based storage)\n"
../../bin/kyma module pull docker-registry
../../bin/kyma module add default/docker-registry-0.11.0 --cr-path k8s-resources/custom-docker-registry.yaml --auto-approve
../../bin/kyma module add default/docker-registry-0.11.0 --config-cr-path k8s-resources/custom-docker-registry.yaml --auto-approve

echo "..waiting for docker registry"
kubectl wait --for condition=Installed dockerregistries.operator.kyma-project.io/custom-dr -n kyma-system --timeout=360s
Expand Down