From d56ffb0b909ca930f070af42f67fb636ba08ce16 Mon Sep 17 00:00:00 2001 From: Robert Parker Date: Mon, 9 Dec 2019 13:24:35 -0800 Subject: [PATCH] fix/remove images --- .../admin-settings/config-private-registry/_index.md | 6 +++--- .../vsphere/provisioning-vsphere-clusters/_index.md | 4 ++-- .../creating-credentials/_index.md | 12 ++++++------ .../enabling-uuids/_index.md | 4 ++-- .../v2.x/en/v1.6-migration/expose-services/_index.md | 2 +- .../cloud-providers/vsphere/enabling-uuid/_index.md | 4 ++-- .../en/etcd-snapshots/example-scenarios/_index.md | 6 +++--- layouts/shortcodes/img.html | 7 ++----- 8 files changed, 21 insertions(+), 24 deletions(-) diff --git a/content/rancher/v2.x/en/admin-settings/config-private-registry/_index.md b/content/rancher/v2.x/en/admin-settings/config-private-registry/_index.md index 692802124aa..c62577e04cf 100644 --- a/content/rancher/v2.x/en/admin-settings/config-private-registry/_index.md +++ b/content/rancher/v2.x/en/admin-settings/config-private-registry/_index.md @@ -23,15 +23,15 @@ If your private registry requires credentials, it cannot be used as the default 1. Go into the **Settings** view. - ![Settings]({{< baseurl >}}/img/rancher/airgap/settings.png) + {{< img "/img/rancher/airgap/settings.png" "Settings" >}} 1. Look for the setting called `system-default-registry` and choose **Edit**. - ![Edit]({{< baseurl >}}/img/rancher/airgap/edit-system-default-registry.png) + {{< img "/img/rancher/airgap/edit-system-default-registry.png" "Edit" >}} 1. Change the value to your registry (e.g. `registry.yourdomain.com:port`). Do not prefix the registry with `http://` or `https://`. - ![Save]({{< baseurl >}}/img/rancher/airgap/enter-system-default-registry.png) + {{< img "/img/rancher/airgap/enter-system-default-registry.png" "Save" >}} **Result:** Rancher will use your private registry to pull system images. diff --git a/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/provisioning-vsphere-clusters/_index.md b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/provisioning-vsphere-clusters/_index.md index 3efc9d140d6..bbb2059cdcc 100644 --- a/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/provisioning-vsphere-clusters/_index.md +++ b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/provisioning-vsphere-clusters/_index.md @@ -131,7 +131,7 @@ In the **Scheduling** section, enter: - The name of the **VM Network** to attach to - The name/path of the **Datastore** to store the disks in - ![image]({{< baseurl >}}/img/rancher/vsphere-node-template-2.png) + {{< img "/img/rancher/vsphere-node-template-2.png" "image" >}} {{% /tab %}} {{% /tabs %}} @@ -289,7 +289,7 @@ For an example of how to provision storage in vSphere using Rancher, refer to th 1. Set **Cloud Provider** option to `Custom`. - ![vsphere-node-driver-cloudprovider]({{< baseurl >}}/img/rancher/vsphere-node-driver-cloudprovider.png) + {{< img "/img/rancher/vsphere-node-driver-cloudprovider.png" "vsphere-node-driver-cloudprovider">}} 1. Click on **Edit as YAML** 1. Insert the following structure to the pre-populated cluster YAML. As of Rancher v2.3+, this structure must be placed under `rancher_kubernetes_engine_config`. In versions prior to v2.3, it has to be defined as a top-level field. Note that the `name` *must* be set to `vsphere`. diff --git a/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/provisioning-vsphere-clusters/creating-credentials/_index.md b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/provisioning-vsphere-clusters/creating-credentials/_index.md index 26479897974..9c5bc71a0e2 100644 --- a/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/provisioning-vsphere-clusters/creating-credentials/_index.md +++ b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/provisioning-vsphere-clusters/creating-credentials/_index.md @@ -22,20 +22,20 @@ The following steps create a role with the required privileges and then assign i 3. Create a new role. Give it a name and select the privileges listed in the permissions table above. - ![image]({{< baseurl >}}/img/rancher/rancherroles1.png) + {{< img "/img/rancher/rancherroles1.png" "image" >}} 4. Go to the **Users and Groups** tab. 5. Create a new user. Fill out the form and then click **OK**. Make sure to note the username and password, because you will need it when configuring node templates in Rancher. - ![image]({{< baseurl >}}/img/rancher/rancheruser.png) + {{< img "/img/rancher/rancheruser.png" "image" >}} 6. Go to the **Global Permissions** tab. 7. Create a new Global Permission. Add the user you created earlier and assign it the role you created earlier. Click **OK**. - ![image]({{< baseurl >}}/img/rancher/globalpermissionuser.png) + {{< img "/img/rancher/globalpermissionuser.png" "image" >}} + + {{< img "/img/rancher/globalpermissionrole.png" "image" >}} - ![image]({{< baseurl >}}/img/rancher/globalpermissionrole.png) - -**Result:** You now have credentials that Rancher can use to manipulate vSphere resources. \ No newline at end of file +**Result:** You now have credentials that Rancher can use to manipulate vSphere resources. diff --git a/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/provisioning-vsphere-clusters/enabling-uuids/_index.md b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/provisioning-vsphere-clusters/enabling-uuids/_index.md index 55e8c2a2ae0..2388ad4e8ad 100644 --- a/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/provisioning-vsphere-clusters/enabling-uuids/_index.md +++ b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/provisioning-vsphere-clusters/enabling-uuids/_index.md @@ -17,8 +17,8 @@ To enable disk UUIDs for all VMs created for a cluster, 4. Enter `disk.enableUUID` as key with a value of **TRUE**. - ![vsphere-nodedriver-enable-uuid]({{< baseurl >}}/img/rke/vsphere-nodedriver-enable-uuid.png) + {{< img "/img/rke/vsphere-nodedriver-enable-uuid.png" "vsphere-nodedriver-enable-uuid" >}} 5. Click **Create** or **Save**. -**Result:** The disk UUID is enabled in the vSphere node template. \ No newline at end of file +**Result:** The disk UUID is enabled in the vSphere node template. diff --git a/content/rancher/v2.x/en/v1.6-migration/expose-services/_index.md b/content/rancher/v2.x/en/v1.6-migration/expose-services/_index.md index 3896fe2087f..35c81ae5e58 100644 --- a/content/rancher/v2.x/en/v1.6-migration/expose-services/_index.md +++ b/content/rancher/v2.x/en/v1.6-migration/expose-services/_index.md @@ -99,6 +99,6 @@ For example, for the `web-deployment.yml` file parsed from v1.6 that we've been
Port Mapping: Setting NodePort
-![Set NodePort]({{< baseurl >}}/img/rancher/set-nodeport.gif) +{{< img "/img/rancher/set-nodeport.gif" "Set NodePort" >}} ### [Next: Configure Health Checks]({{< baseurl >}}/rancher/v2.x/en/v1.6-migration/monitor-apps) diff --git a/content/rke/latest/en/config-options/cloud-providers/vsphere/enabling-uuid/_index.md b/content/rke/latest/en/config-options/cloud-providers/vsphere/enabling-uuid/_index.md index 0277e725a07..fb8ae19158d 100644 --- a/content/rke/latest/en/config-options/cloud-providers/vsphere/enabling-uuid/_index.md +++ b/content/rke/latest/en/config-options/cloud-providers/vsphere/enabling-uuid/_index.md @@ -18,7 +18,7 @@ The required property can be set while creating or modifying VMs in the vSphere 1. For each VM navigate to the tab **VM Options** and click on **Edit Configuration**. 2. Add the parameter `disk.EnableUUID` with a value of **TRUE**. - ![vsphere-advanced-parameters]({{< baseurl >}}/img/rke/vsphere-advanced-parameters.png) + {{< img "/img/rke/vsphere-advanced-parameters.png" "vsphere-advanced-parameters" >}} ### Using the GOVC CLI tool @@ -32,4 +32,4 @@ $ govc vm.change -vm -e disk.enableUUID=TRUE In Rancher v2.0.4+, disk UUIDs are enabled in vSphere node templates by default. -If you are using Rancher prior to v2.0.4, refer to the [Rancher documentation.]({{}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/#enabling-disk-uuids-with-a-node-template) for details on how to enable a UUID with a Rancher node template. \ No newline at end of file +If you are using Rancher prior to v2.0.4, refer to the [Rancher documentation.]({{}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/#enabling-disk-uuids-with-a-node-template) for details on how to enable a UUID with a Rancher node template. diff --git a/content/rke/latest/en/etcd-snapshots/example-scenarios/_index.md b/content/rke/latest/en/etcd-snapshots/example-scenarios/_index.md index 5ddd113ff71..e57fd3d5871 100644 --- a/content/rke/latest/en/etcd-snapshots/example-scenarios/_index.md +++ b/content/rke/latest/en/etcd-snapshots/example-scenarios/_index.md @@ -34,7 +34,7 @@ You can upload this snapshot directly to an S3 backend with the [S3 options]({{< $ rke etcd snapshot-save --name snapshot.db --config cluster.yml ``` -![etcd snapshot]({{< baseurl >}}/img/rke/rke-etcd-backup.png) +{{< img "/img/rke/rke-etcd-backup.png" "etcd snapshot" >}} ### 2. Simulate a Node Failure @@ -133,7 +133,7 @@ Back up the Kubernetes cluster by taking a local snapshot: $ rke etcd snapshot-save --name snapshot.db --config cluster.yml ``` -![etcd snapshot]({{< baseurl >}}/img/rke/rke-etcd-backup.png) +{{< img "/img/rke/rke-etcd-backup.png" "etcd snapshot" >}} ### 2. Store the Snapshot Externally @@ -250,4 +250,4 @@ nginx-65899c769f-qkhml 1/1 Running 0 17s ``` {{% /tab %}} -{{% /tabs %}} \ No newline at end of file +{{% /tabs %}} diff --git a/layouts/shortcodes/img.html b/layouts/shortcodes/img.html index 174d4b38e2b..e7a85ae6d4d 100644 --- a/layouts/shortcodes/img.html +++ b/layouts/shortcodes/img.html @@ -1,17 +1,14 @@ {{ $img := .Get 0 }} {{ $alt := .Get 1 }} {{ with resources.Get $img }} - {{ $thumb20 := .Resize "2000x" }} - {{ $thumb16 := .Resize "1600x" }} - {{ $thumb12 := .Resize "1200x" }} {{ $thumb10 := .Resize "1000x" }} {{ $thumb8 := .Resize "800x" }} {{ $thumb6 := .Resize "600x" }} {{ $thumb4 := .Resize "400x" }} {{ $thumb2 := .Resize "200x" }} {{$alt}} {{ end }}