You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: content/includes/use-cases/docker-registry-instructions.md
+4-4Lines changed: 4 additions & 4 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -14,9 +14,9 @@ For more details on Docker Engine security, you can refer to the [Docker Engine
14
14
15
15
{{< /call-out >}}
16
16
17
-
{{<tabsname="docker_login">}}
17
+
{{<tabs name="docker_login">}}
18
18
19
-
{{%tab name="JSON Web Token"%}}
19
+
{{%tab name="JSON Web Token"%}}
20
20
21
21
Open the JSON Web Token file previously downloaded from [MyF5](https://my.f5.com) customer portal (for example, `nginx-repo-12345abc.jwt`) and copy its contents.
@@ -97,10 +97,9 @@ If the Helm chart you have been using is `v1.0.2` or earlier (NGINX Ingress Cont
97
97
98
98
The example below shows the change for a Policy resource: you must do the same for all GlobalConfiguration and TransportServer resources.
99
99
100
-
{{<tabsname="resource-version-update">}}
100
+
{{<tabs name="resource-version-update">}}
101
101
102
-
{{< comment >}} Keep this left aligned. {{< /comment >}}
103
-
{{<tabname="Before">}}
102
+
{{% tab name="Before" %}}
104
103
105
104
```yaml
106
105
apiVersion: k8s.nginx.org/v1alpha1
@@ -113,9 +112,11 @@ spec:
113
112
key: ${binary_remote_addr}
114
113
zoneSize: 10M
115
114
```
116
-
{{< /tab >}}
117
115
118
-
{{<tab name="After">}}
116
+
{{% /tab %}}
117
+
118
+
{{% tab name="After" %}}
119
+
119
120
```yaml
120
121
apiVersion: k8s.nginx.org/v1
121
122
kind: Policy
@@ -127,13 +128,16 @@ spec:
127
128
key: ${binary_remote_addr}
128
129
zoneSize: 10M
129
130
```
130
-
{{< /tab >}}
131
131
132
-
{{</tabs>}}
132
+
{{% /tab %}}
133
+
134
+
{{< /tabs >}}
135
+
136
+
{{< call-out "warning" >}}
133
137
134
-
{{< warning >}}
135
138
If a *GlobalConfiguration*, *Policy* or *TransportServer* resource is deployed with `apiVersion: k8s.nginx.org/v1alpha1`, it will be **deleted** during the upgrade process.
136
-
{{</ warning >}}
139
+
140
+
{{</ call-out >}}
137
141
138
142
After you move the custom resources to `v1`, run the following `kubectl` commands before upgrading to v4.0.0 Custom Resource Definitions (CRDs) to avoid webhook errors caused by leftover `v1alpha1` resources. For details, see [GitHub issue #7010](https://github.com/nginx/kubernetes-ingress/issues/7010).
139
143
@@ -160,9 +164,9 @@ To configure structured logging, you must update your log deployment arguments f
160
164
| `error` | |
161
165
| `fatal` | |
162
166
163
-
{{<tabs name="structured logging">}}
167
+
{{<tabs name="structured logging">}}
164
168
165
-
{{<tab name="Helm">}}
169
+
{{% tab name="Helm" %}}
166
170
167
171
The Helm value `controller.logLevel` is now a string instead of an integer.
168
172
@@ -173,9 +177,9 @@ controller:
173
177
logLevel: info
174
178
logFormat: json
175
179
```
176
-
{{< /tab >}}
180
+
{{% /tab %}}
177
181
178
-
{{<tab name="Manifests">}}
182
+
{{% tab name="Manifests" %}}
179
183
180
184
The command line argument `-v` has been replaced with `-log-level`, and takes a string instead of an integer. The argument `-logtostderr` has also been deprecated.
181
185
@@ -186,9 +190,9 @@ args:
186
190
- -log-level=info
187
191
- -log-format=json
188
192
```
189
-
{{< /tab >}}
193
+
{{% /tab %}}
190
194
191
-
{{</tabs>}}
195
+
{{</tabs>}}
192
196
193
197
### Create License secret
194
198
@@ -210,9 +214,9 @@ To reduce downtime, update all resources to use the new naming convention. The f
210
214
211
215
The steps you should follow depend on your Helm release name:
212
216
213
-
{{<tabs name="upgrade-helm">}}
217
+
{{<tabs name="upgrade-helm">}}
214
218
215
-
{{<tab name="nginx-ingress">}}
219
+
{{% tab name="nginx-ingress" %}}
216
220
217
221
Use `kubectl describe` on deployment/daemonset to get the `Selector` value:
218
222
@@ -260,9 +264,9 @@ Normal ScalingReplicaSet 101s deployment-controller Scaled up replica set n
260
264
Normal ScalingReplicaSet 98s deployment-controller Scaled down replica set nginx-ingress-nginx-ingress-<old_version> to 0 from 1
261
265
```
262
266
263
-
{{</tab>}}
267
+
{{% /tab %}}
264
268
265
-
{{<tab name="Other release names">}}
269
+
{{<tab name="Other release names">}}
266
270
267
271
Use `kubectl describe` on deployment/daemonset to get the `Selector` value:
268
272
@@ -309,6 +313,6 @@ Normal ScalingReplicaSet 101s deployment-controller Scaled up replica set t
309
313
Normal ScalingReplicaSet 98s deployment-controller Scaled down replica set test-release-nginx-ingress-<old_version> to 0 from 1
0 commit comments