From a135e53f6459872893d306c22b81e993509f3b02 Mon Sep 17 00:00:00 2001 From: Sebastian Plattner Date: Sun, 13 Aug 2023 11:18:14 +0200 Subject: [PATCH] mobi variant nod needed anymore --- config/mobi/config.toml | 15 ++-- .../additional-concepts/configmaps/_index.md | 7 -- .../configmaps/spring-boot-example-mobi.yaml | 49 ------------ .../cronjobs-and-jobs/_index.md | 3 - .../job-mariadb-dump-mobi.yaml | 49 ------------ .../sidecar-containers/_index.md | 3 - .../deploy_mariadb-sidecar_mobi.yaml | 13 ---- .../statefulsets/_index.md | 11 +-- .../statefulsets/sts_nginx-cluster_mobi.yaml | 28 ------- .../en/docs/attaching-a-database/_index.md | 4 - .../attaching-a-database/mariadb-mobi.yaml | 69 ---------------- content/en/docs/exposing-a-service/_index.md | 9 --- .../ingress-mobi.template.yaml | 17 ---- content/en/docs/helm/complex-example.md | 78 ------------------- content/en/docs/helm/installation.md | 20 ----- content/en/docs/helm/simplechart.md | 46 +---------- content/en/docs/scaling/_index.md | 17 ---- .../docs/scaling/ingress-mobi.template.yaml | 17 ---- 18 files changed, 8 insertions(+), 447 deletions(-) delete mode 100644 content/en/docs/additional-concepts/configmaps/spring-boot-example-mobi.yaml delete mode 100644 content/en/docs/additional-concepts/cronjobs-and-jobs/job-mariadb-dump-mobi.yaml delete mode 100644 content/en/docs/additional-concepts/sidecar-containers/deploy_mariadb-sidecar_mobi.yaml delete mode 100644 content/en/docs/additional-concepts/statefulsets/sts_nginx-cluster_mobi.yaml delete mode 100644 content/en/docs/attaching-a-database/mariadb-mobi.yaml delete mode 100644 content/en/docs/exposing-a-service/ingress-mobi.template.yaml delete mode 100644 content/en/docs/scaling/ingress-mobi.template.yaml diff --git a/config/mobi/config.toml b/config/mobi/config.toml index 207811f8..1189d662 100644 --- a/config/mobi/config.toml +++ b/config/mobi/config.toml @@ -16,19 +16,11 @@ disable = false [params] -enabledModule = "base customer mobi" +enabledModule = "base" copyright = "Puzzle ITC GmbH" imagePrefix = "puzzle_" customer = "mobi" -[params.images] -deployment-image-url = "REGISTRY-URL/puzzle/k8s/kurs/example-web-go:latest" -training-image-url = "REGISTRY-URL/puzzle/k8s/kurs/example-web-python:latest" -nginxinc-nginx-unprivileged = "REGISTRY-URL/puzzle/k8s/kurs/nginx-unprivileged" -nginx = "REGISTRY-URL/puzzle/k8s/kurs/nginx:latest" -stress = "REGISTRY-URL/puzzle/k8s/kurs/stress:latest" -busybox = "REGISTRY-URL/puzzle/k8s/kurs/busybox:1.28" - [[Languages.en.menu.main]] copyright = "Puzzle ITC GmbH" url = "https://www.puzzle.ch" @@ -36,6 +28,11 @@ url = "https://www.puzzle.ch" [params.replaceContent] allowedHrefHosts = ['localhost', 'puzzle.ch', 'acend.ch'] +[[params.replaceContent.placeholders]] +placeholder = "" +queryParam = "n" +defaultValue = "$USER" + [[params.replaceContent.placeholders]] placeholder = "REGISTRY-URL" queryParam = "r" diff --git a/content/en/docs/additional-concepts/configmaps/_index.md b/content/en/docs/additional-concepts/configmaps/_index.md index 7758547d..1201211a 100644 --- a/content/en/docs/additional-concepts/configmaps/_index.md +++ b/content/en/docs/additional-concepts/configmaps/_index.md @@ -102,16 +102,9 @@ Basically, a Deployment has to be extended with the following config: {{% onlyWhenNot openshift %}} Here is a complete example Deployment of a sample Java app: - -{{% onlyWhenNot customer %}} {{< readfile file="/content/en/docs/additional-concepts/configmaps/spring-boot-example.yaml" code="true" lang="yaml" >}} {{% /onlyWhenNot %}} -{{% onlyWhen mobi %}} -{{< readfile file="/content/en/docs/additional-concepts/configmaps/spring-boot-example-mobi.yaml" code="true" lang="yaml" >}} -{{% /onlyWhen %}} -{{% /onlyWhenNot %}} - This means that the container should now be able to access the ConfigMap's content in `/etc/config/java.properties`. Let's check: {{% onlyWhen openshift %}} diff --git a/content/en/docs/additional-concepts/configmaps/spring-boot-example-mobi.yaml b/content/en/docs/additional-concepts/configmaps/spring-boot-example-mobi.yaml deleted file mode 100644 index d276415b..00000000 --- a/content/en/docs/additional-concepts/configmaps/spring-boot-example-mobi.yaml +++ /dev/null @@ -1,49 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - labels: - app: spring-boot-example - name: spring-boot-example -spec: - progressDeadlineSeconds: 600 - replicas: 1 - revisionHistoryLimit: 10 - selector: - matchLabels: - app: spring-boot-example - strategy: - rollingUpdate: - maxSurge: 25% - maxUnavailable: 25% - type: RollingUpdate - template: - metadata: - labels: - app: spring-boot-example - spec: - containers: - - image: REGISTRY-URL/puzzle/k8s/kurs/example-spring-boot:latest - imagePullPolicy: Always - name: example-spring-boot - resources: - limits: - cpu: 1 - memory: 768Mi - requests: - cpu: 20m - memory: 32Mi - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /etc/config - name: config-volume - dnsPolicy: ClusterFirst - restartPolicy: Always - schedulerName: default-scheduler - securityContext: {} - terminationGracePeriodSeconds: 30 - volumes: - - configMap: - defaultMode: 420 - name: javaconfiguration - name: config-volume diff --git a/content/en/docs/additional-concepts/cronjobs-and-jobs/_index.md b/content/en/docs/additional-concepts/cronjobs-and-jobs/_index.md index 2eea937f..f644f3fc 100644 --- a/content/en/docs/additional-concepts/cronjobs-and-jobs/_index.md +++ b/content/en/docs/additional-concepts/cronjobs-and-jobs/_index.md @@ -33,9 +33,6 @@ Let's first look at the Job resource that we want to create. {{% onlyWhen baloise %}} {{< readfile file="/content/en/docs/additional-concepts/cronjobs-and-jobs/job-mariadb-dump-baloise.yaml" code="true" lang="yaml" >}} {{% /onlyWhen %}} -{{% onlyWhen mobi %}} -{{< readfile file="/content/en/docs/additional-concepts/cronjobs-and-jobs/job-mariadb-dump-mobi.yaml" code="true" lang="yaml" >}} -{{% /onlyWhen %}} The parameter `.spec.template.spec.containers[0].image` shows that we use the same image as the running database. In contrast to the database Pod, we don't start a database afterwards, but run a `mysqldump` command, specified with `.spec.template.spec.containers[0].command`. To perform the dump, we use the environment variables of the database deployment to set the hostname, user and password parameters of the `mysqldump` command. The `MYSQL_PASSWORD` variable refers to the value of the secret, which is already used for the database Pod. This way we ensure that the dump is performed with the same credentials. diff --git a/content/en/docs/additional-concepts/cronjobs-and-jobs/job-mariadb-dump-mobi.yaml b/content/en/docs/additional-concepts/cronjobs-and-jobs/job-mariadb-dump-mobi.yaml deleted file mode 100644 index b476b0bf..00000000 --- a/content/en/docs/additional-concepts/cronjobs-and-jobs/job-mariadb-dump-mobi.yaml +++ /dev/null @@ -1,49 +0,0 @@ -apiVersion: batch/v1 -kind: Job -metadata: - name: database-dump -spec: - template: - spec: - containers: - - name: mariadb - image: REGISTRY-URL/puzzle/k8s/kurs/mariadb:10.5 - command: - - 'bash' - - '-eo' - - 'pipefail' - - '-c' - - > - trap "echo Backup failed; exit 0" ERR; - FILENAME=backup-${MYSQL_DATABASE}-`date +%Y-%m-%d_%H%M%S`.sql.gz; - mysqldump --user=${MYSQL_USER} --password=${MYSQL_PASSWORD} --host=${MYSQL_HOST} --port=${MYSQL_PORT} --skip-lock-tables --quick --add-drop-database --routines ${MYSQL_DATABASE} | gzip > /tmp/$FILENAME; - echo ""; - echo "Backup successful"; du -h /tmp/$FILENAME; - env: - - name: MYSQL_DATABASE - valueFrom: - secretKeyRef: - key: database-name - name: mariadb - - name: MYSQL_USER - valueFrom: - secretKeyRef: - key: database-user - name: mariadb - - name: MYSQL_HOST - value: mariadb - - name: MYSQL_PORT - value: "3306" - - name: MYSQL_PASSWORD - valueFrom: - secretKeyRef: - key: database-password - name: mariadb - resources: - limits: - cpu: 100m - memory: 128Mi - requests: - cpu: 20m - memory: 64Mi - restartPolicy: Never diff --git a/content/en/docs/additional-concepts/sidecar-containers/_index.md b/content/en/docs/additional-concepts/sidecar-containers/_index.md index 3c9d288f..1363fd47 100644 --- a/content/en/docs/additional-concepts/sidecar-containers/_index.md +++ b/content/en/docs/additional-concepts/sidecar-containers/_index.md @@ -44,9 +44,6 @@ And add a new (sidecar) container to it: {{% onlyWhen baloise %}} {{< readfile file="/content/en/docs/additional-concepts/sidecar-containers/deploy_mariadb-sidecar_baloise.yaml" code="true" lang="yaml" >}} {{% /onlyWhen %}} -{{% onlyWhen mobi %}} -{{< readfile file="/content/en/docs/additional-concepts/sidecar-containers/deploy_mariadb-sidecar_mobi.yaml" code="true" lang="yaml" >}} -{{% /onlyWhen %}} and then apply the change with: diff --git a/content/en/docs/additional-concepts/sidecar-containers/deploy_mariadb-sidecar_mobi.yaml b/content/en/docs/additional-concepts/sidecar-containers/deploy_mariadb-sidecar_mobi.yaml deleted file mode 100644 index 17f6df24..00000000 --- a/content/en/docs/additional-concepts/sidecar-containers/deploy_mariadb-sidecar_mobi.yaml +++ /dev/null @@ -1,13 +0,0 @@ - containers: - - ... - - image: REGISTRY-URL/puzzle/k8s/kurs/mysqld-exporter:v0.12.1 - name: mysqld-exporter - env: - - name: MYSQL_DATABASE_ROOT_PASSWORD - valueFrom: - secretKeyRef: - key: database-root-password - name: mariadb - - name: DATA_SOURCE_NAME - value: root:$MYSQL_DATABASE_ROOT_PASSWORD@(localhost:3306)/ - ... diff --git a/content/en/docs/additional-concepts/statefulsets/_index.md b/content/en/docs/additional-concepts/statefulsets/_index.md index 2bb7ad99..cb969ddd 100644 --- a/content/en/docs/additional-concepts/statefulsets/_index.md +++ b/content/en/docs/additional-concepts/statefulsets/_index.md @@ -77,9 +77,6 @@ Create a file named `sts_nginx-cluster.yaml` with the following definition of a {{% onlyWhen baloise %}} {{< readfile file="/content/en/docs/additional-concepts/statefulsets/sts_nginx-cluster_baloise.yaml" code="true" lang="yaml" >}} {{% /onlyWhen %}} -{{% onlyWhen mobi %}} -{{< readfile file="/content/en/docs/additional-concepts/statefulsets/sts_nginx-cluster_mobi.yaml" code="true" lang="yaml" >}} -{{% /onlyWhen %}} Create the StatefulSet: @@ -114,16 +111,10 @@ You can again watch the pods' progress like you did in the first task. In order to update the image tag in use in a StatefulSet, you can use the `{{% param cliToolName %}} set image` command. Set the StatefulSet's image tag to `latest`: -{{% onlyWhenNot mobi %}} + ```bash {{% param cliToolName %}} set image statefulset nginx-cluster nginx={{% param "images.nginxinc-nginx-unprivileged" %}}:latest --namespace ``` -{{% /onlyWhenNot %}} -{{% onlyWhen mobi %}} -```bash -kubectl set image statefulset nginx-cluster nginx={{% param "images.nginx" %}} --namespace -``` -{{% /onlyWhen %}} ## {{% task %}} Rollback diff --git a/content/en/docs/additional-concepts/statefulsets/sts_nginx-cluster_mobi.yaml b/content/en/docs/additional-concepts/statefulsets/sts_nginx-cluster_mobi.yaml deleted file mode 100644 index e9c67b81..00000000 --- a/content/en/docs/additional-concepts/statefulsets/sts_nginx-cluster_mobi.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: nginx-cluster -spec: - serviceName: "nginx" - replicas: 1 - selector: - matchLabels: - app: nginx - template: - metadata: - labels: - app: nginx - spec: - containers: - - name: nginx - image: REGISTRY-URL/puzzle/k8s/kurs/nginx:1.12 - ports: - - containerPort: 80 - name: nginx - resources: - limits: - cpu: 40m - memory: 64Mi - requests: - cpu: 10m - memory: 32Mi diff --git a/content/en/docs/attaching-a-database/_index.md b/content/en/docs/attaching-a-database/_index.md index 08e17e16..9d792c9e 100644 --- a/content/en/docs/attaching-a-database/_index.md +++ b/content/en/docs/attaching-a-database/_index.md @@ -179,10 +179,6 @@ Save this snippet as `mariadb.yaml`: {{< readfile file="/content/en/docs/attaching-a-database/mariadb.yaml" code="true" lang="yaml" >}} {{% /onlyWhenNot %}} -{{% onlyWhen mobi %}} -{{< readfile file="/content/en/docs/attaching-a-database/mariadb-mobi.yaml" code="true" lang="yaml" >}} -{{% /onlyWhen %}} - Apply it with: ```bash diff --git a/content/en/docs/attaching-a-database/mariadb-mobi.yaml b/content/en/docs/attaching-a-database/mariadb-mobi.yaml deleted file mode 100644 index 276034c6..00000000 --- a/content/en/docs/attaching-a-database/mariadb-mobi.yaml +++ /dev/null @@ -1,69 +0,0 @@ ---- -apiVersion: v1 -kind: Service -metadata: - name: mariadb - labels: - app: mariadb -spec: - ports: - - port: 3306 - selector: - app: mariadb ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: mariadb - labels: - app: mariadb -spec: - selector: - matchLabels: - app: mariadb - strategy: - type: Recreate - template: - metadata: - labels: - app: mariadb - spec: - containers: - - image: REGISTRY-URL/puzzle/k8s/kurs/mariadb:10.5 - name: mariadb - args: - - "--ignore-db-dir=lost+found" - env: - - name: MYSQL_USER - valueFrom: - secretKeyRef: - key: database-user - name: mariadb - - name: MYSQL_PASSWORD - valueFrom: - secretKeyRef: - key: database-password - name: mariadb - - name: MYSQL_ROOT_PASSWORD - valueFrom: - secretKeyRef: - key: database-root-password - name: mariadb - - name: MYSQL_DATABASE - valueFrom: - secretKeyRef: - key: database-name - name: mariadb - livenessProbe: - tcpSocket: - port: 3306 - ports: - - containerPort: 3306 - name: mariadb - resources: - limits: - cpu: 500m - memory: 512Mi - requests: - cpu: 50m - memory: 128Mi diff --git a/content/en/docs/exposing-a-service/_index.md b/content/en/docs/exposing-a-service/_index.md index cea7c3c8..324021d0 100644 --- a/content/en/docs/exposing-a-service/_index.md +++ b/content/en/docs/exposing-a-service/_index.md @@ -173,10 +173,6 @@ In order to create the Ingress resource, we first need to create the file `ingre {{< readfile file="/content/en/docs/exposing-a-service/ingress.template.yaml" code="true" lang="yaml" >}} {{% /onlyWhenNot %}} -{{% onlyWhen mobi %}} -{{< readfile file="/content/en/docs/exposing-a-service/ingress-mobi.template.yaml" code="true" lang="yaml" >}} -{{% /onlyWhen %}} - As you see in the resource definition at `spec.rules[0].http.paths[0].backend.service.name` we use the previously created `example-web-go` ClusterIP Service. Let's create the Ingress resource with: @@ -185,13 +181,8 @@ Let's create the Ingress resource with: kubectl apply -f ingress.yaml --namespace ``` -{{% onlyWhenNot mobi %}} Afterwards, we are able to access our freshly created Ingress at `http://example-web-go-.` {{% /onlyWhenNot %}} -{{% onlyWhen mobi %}} -Afterwards, we are able to access our app via our freshly created Ingress at `https://example-web-go-.`. Although we have not configured the Ingress to use TLS, it is available with a `https` address. This is because of the setup at Mobiliar and not default behavior. -{{% /onlyWhen %}} -{{% /onlyWhenNot %}} {{% onlyWhen openshift %}} {{% onlyWhenNot baloise %}} diff --git a/content/en/docs/exposing-a-service/ingress-mobi.template.yaml b/content/en/docs/exposing-a-service/ingress-mobi.template.yaml deleted file mode 100644 index e335ca25..00000000 --- a/content/en/docs/exposing-a-service/ingress-mobi.template.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: example-web-go -spec: - rules: - - host: example-web-go-. - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: example-web-go - port: - number: 5000 diff --git a/content/en/docs/helm/complex-example.md b/content/en/docs/helm/complex-example.md index 87f489ca..4fea9ccf 100644 --- a/content/en/docs/helm/complex-example.md +++ b/content/en/docs/helm/complex-example.md @@ -16,29 +16,6 @@ Check out [Artifact Hub](https://artifacthub.io/) where you'll find a huge numbe As this WordPress Helm chart is published in Bitnami's Helm repository, we're first going to add it to our local repo list: -{{% onlyWhen mobi %}} -You have to set your `HTTP_PROXY` environment variable in order to access the bitnami helm repository: - -```bash -# Linux -export HTTP_PROXY="http://:@:" -export HTTPS_PROXY="http://:@:" - -# Windows cmd -setx HTTP_PROXY="http://:@:" -setx HTTPS_PROXY="http://:@:" -setx http_proxy="http://:@:" -setx https_proxy="http://:@:" - -# Windows Powershell -$env:HTTP_PROXY="http://:@:" -$env:HTTPS_PROXY="http://:@:" -$env:http_proxy="http://:@:" -$env:https_proxy="http://:@:" -``` - -Replace `` and `` with your account details. If you have special chars in your password, you have to escape them with hexadecimal value according to [this](https://en.wikipedia.org/wiki/Percent-encoding#Percent-encoding_reserved_characters). -{{% /onlyWhen %}} ```bash helm repo add bitnami https://charts.bitnami.com/bitnami @@ -93,63 +70,8 @@ mariadb: Make sure to set the proper value as hostname. `` will be provided by the trainer. {{% /alert %}} -{{% onlyWhen mobi %}} -Use `wordpress-.` as your hostname. It might take some time until your ingress hostname is accessible, as the DNS name first has to be propagated correctly. -{{% /onlyWhen %}} - If you look inside the [Chart.yaml](https://github.com/bitnami/charts/blob/master/bitnami/wordpress/Chart.yaml) file of the WordPress chart, you'll see a dependency to the [MariaDB Helm chart](https://github.com/bitnami/charts/tree/master/bitnami/mariadb). All the MariaDB values are used by this dependent Helm chart and the chart is automatically deployed when installing WordPress. -{{% onlyWhen mobi %}} -The WordPress and MariaDB charts use the following container images (at the time of writing): - -* `docker.io/bitnami/wordpress:5.4.0-debian-10-r6` -* `docker.io/bitnami/mariadb:10.3.22-debian-10-r60` - -As we cannot access these images, we'll have to overwrite them. Add the following to your `values.yaml` file in order to do so: - -```yaml -[...] -image: - registry: REGISTRY-URL - repository: puzzle/helm-techlab/wordpress - -mariadb: - image: - registry: REGISTRY-URL - repository: puzzle/helm-techlab/mariadb -[...] -``` - -You have to merge the `mariadb` part with the already defined `mariadb` part from the lab instructions above. Your final `values.yaml` should look like: - -```yaml ---- -image: - registry: REGISTRY-URL - repository: puzzle/helm-techlab/wordpress - -service: - type: ClusterIP - -ingress: - enabled: true - hostname: wordpress-. - -mariadb: - image: - registry: REGISTRY-URL - repository: puzzle/helm-techlab/mariadb - primary: - persistence: - size: 1Gi -``` - -Make sure to replace ``. - -The image tag remains as already defined in the orginial [`values.yaml`](https://github.com/bitnami/charts/blob/master/bitnami/wordpress/values.yaml) file from the chart. - -{{% /onlyWhen %}} - The `Chart.yaml` file allows us to define dependencies on other charts. In our Wordpress chart we use the `Chart.yaml` to add a `mariadb` to store the WordPress data in. ```yaml diff --git a/content/en/docs/helm/installation.md b/content/en/docs/helm/installation.md index e2637c1e..23d23342 100644 --- a/content/en/docs/helm/installation.md +++ b/content/en/docs/helm/installation.md @@ -22,26 +22,6 @@ Install the CLI for your **Operating System** * Windows: Find the `helm` binary in the unpacked directory and move it to its desired destination * The desired destination should be listed in your $PATH environment variable (`echo $PATH`) -{{% onlyWhen mobi %}} - - -## Proxy configuration - -{{% alert title="Note" color="info" %}} -If you have direct access to the internet from your location, the proxy configuration is not required. -{{% /alert %}} - -Set your HTTP proxy environment variables so that a chart repository can be added to your Helm repos in a later lab: - -```bash -export HTTP_PROXY="http://:@:" -export HTTPS_PROXY="http://:@:" -export NO_PROXY="" -``` - -Replace ` and `` with your credentials. If you have special characters in your password, escape them with their corresponding hexadecimal values according to [this article](https://en.wikipedia.org/wiki/Percent-encoding#Percent-encoding_reserved_characters). -{{% /onlyWhen %}} - ## {{% task %}} Verify diff --git a/content/en/docs/helm/simplechart.md b/content/en/docs/helm/simplechart.md index 48a18494..913e8201 100644 --- a/content/en/docs/helm/simplechart.md +++ b/content/en/docs/helm/simplechart.md @@ -17,19 +17,6 @@ helm create mychart You will now find a `mychart` directory with the newly created chart. It already is a valid and fully functional chart which deploys an nginx instance. Have a look at the generated files and their content. For an explanation of the files, visit the [Helm Developer Documentation](https://docs.helm.sh/developing_charts/#the-chart-file-structure). In a later section you'll find all the information about Helm templates. -{{% onlyWhen mobi %}} -Because you cannot pull the `nginx` container image on your cluster, you have to use the `REGISTRY-URL/puzzle/k8s/kurs/nginx` container image. Change your `mychart/values.yaml` to match the following: - -```yaml -[...] -image: - repository: REGISTRY-URL/puzzle/k8s/kurs/nginx - tag: stable - pullPolicy: IfNotPresent -[...] -``` - -{{% /onlyWhen %}} {{% onlyWhen openshift %}} The default image freshly created chart deploys is a simple nginx image listening on port `80`. @@ -96,9 +83,8 @@ helm ls --namespace Our freshly deployed nginx is not yet accessible from outside the {{% param distroName %}} cluster. To expose it, we have to make sure a so called ingress resource will be deployed as well. -{{% onlyWhenNot mobi %}} + Also make sure the application is accessible via TLS. -{{% /onlyWhenNot %}} A look into the file `templates/ingress.yaml` reveals that the rendering of the ingress and its values is configurable through values(`values.yaml`): @@ -214,35 +200,9 @@ ingress: {{% /onlyWhenNot %}} {{% /onlyWhenNot %}} -{{% onlyWhen mobi %}} -Therefore, we need to change this value inside our `values.yaml` file. - -```yaml -... -ingress: - enabled: true - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: mychart-. - paths: - - path: / - pathType: ImplementationSpecific - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local -... -``` - -{{% /onlyWhen %}} {{% alert title="Note" color="info" %}} Make sure to set the proper value as hostname. `` will be provided by the trainer. -{{% onlyWhen mobi %}} -Use `.` as your hostname. It might take some time until your ingress hostname is accessible, as the DNS name first has to be propagated correctly. -{{% /onlyWhen %}} {{% /alert %}} Apply the change by upgrading our release: @@ -269,10 +229,6 @@ NOTES: Check whether the ingress was successfully deployed by accessing the URL `http://mychart-./` {{% /onlyWhenNot %}} -{{% onlyWhen mobi %}} -Check whether the ingress was successfully deployed by accessing the URL `https://mychart-./` - -{{% /onlyWhen %}} ## {{% task %}} Overwrite value using commandline param diff --git a/content/en/docs/scaling/_index.md b/content/en/docs/scaling/_index.md index 2469d2c3..e9309e90 100644 --- a/content/en/docs/scaling/_index.md +++ b/content/en/docs/scaling/_index.md @@ -163,10 +163,6 @@ Then we add the Ingress to access our application: {{< readfile file="/content/en/docs/scaling/ingress.template.yaml" code="true" lang="yaml" >}} {{% /onlyWhenNot %}} -{{% onlyWhen mobi %}} -{{< readfile file="/content/en/docs/scaling/ingress-mobi.template.yaml" code="true" lang="yaml" >}} -{{% /onlyWhen %}} - Apply this Ingress definition using, e.g.: ```yaml @@ -284,23 +280,10 @@ while true; do sleep 1; curl -s https://${URL}/pod/; date "+ TIME: %H:%M:%S,%3N" {{% /onlyWhen %}} {{% /onlyWhen %}} {{% onlyWhenNot openshift %}} -{{% onlyWhenNot mobi %}} - ```bash URL=(kubectl get ingress example-web-app -o go-template="{{ (index .spec.rules 0).host }}" --namespace ) while true; do sleep 1; curl -s http://${URL}/pod/; date "+ TIME: %H:%M:%S,%3N"; done ``` - -{{% /onlyWhenNot %}} -{{% onlyWhen mobi %}} - -```bash -URL=(kubectl get ingress example-web-app -o go-template="{{ (index .spec.rules 0).host }}" --namespace ) -while true; do sleep 1; curl -ks https://${URL}/pod/; date "+ TIME: %H:%M:%S,%3N"; done -``` - -{{% /onlyWhen %}} - {{% /onlyWhenNot %}} {{% onlyWhenNot baloise %}} diff --git a/content/en/docs/scaling/ingress-mobi.template.yaml b/content/en/docs/scaling/ingress-mobi.template.yaml deleted file mode 100644 index c7c6e374..00000000 --- a/content/en/docs/scaling/ingress-mobi.template.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: example-web-app -spec: - rules: - - host: example-web-app-. - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: example-web-app - port: - number: 5000