Skip to content

Commit 1672290

Browse files
jab-rhjab-rh
authored
Merge pull request #84362 from jab-rh/apis-4-17-3
Add OpenShift 4.17.3 APIs
2 parents abb7897 + ebaf530 commit 1672290

18 files changed

+1620
-509
lines changed

‎_topic_maps/_topic_map.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3893,6 +3893,8 @@ Topics:
38933893
File: ingressclass-networking-k8s-io-v1
38943894
- Name: 'IPPool [whereabouts.cni.cncf.io/v1alpha1]'
38953895
File: ippool-whereabouts-cni-cncf-io-v1alpha1
3896+
- Name: 'MultiNetworkPolicy [k8s.cni.cncf.io/v1beta1]'
3897+
File: multinetworkpolicy-k8s-cni-cncf-io-v1beta1
38963898
- Name: 'NetworkAttachmentDefinition [k8s.cni.cncf.io/v1]'
38973899
File: networkattachmentdefinition-k8s-cni-cncf-io-v1
38983900
- Name: 'NetworkPolicy [networking.k8s.io/v1]'

‎api-config.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,6 +449,9 @@ apiMap:
449449
# - kind: NetNamespace
450450
# group: network.openshift.io
451451
# version: v1
452+
- kind: MultiNetworkPolicy
453+
group: k8s.cni.cncf.io
454+
version: v1beta1
452455
- kind: NetworkAttachmentDefinition
453456
group: k8s.cni.cncf.io
454457
version: v1

‎rest_api/image_apis/imagestreamimport-image-openshift-io-v1.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2524,7 +2524,7 @@ Description::
25242524
| Parameter | Type | Description
25252525
| `body`
25262526
| xref:../image_apis/imagestreamimport-image-openshift-io-v1.adoc#imagestreamimport-image-openshift-io-v1[`ImageStreamImport`] schema
2527-
|
2527+
|
25282528
|===
25292529

25302530
.HTTP responses

‎rest_api/monitoring_apis/podmonitor-monitoring-coreos-com-v1.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ Cannot be set at the same time as `authorization`, or `basicAuth`.
349349

350350
| `params{}`
351351
| `array (string)`
352-
|
352+
|
353353

354354
| `path`
355355
| `string`
@@ -379,7 +379,7 @@ metadata labels.
379379
The Operator automatically adds relabelings for a few standard Kubernetes fields.
380380

381381

382-
The original scrape job's name is available via the `\__tmp_prometheus_job_name` label.
382+
The original scrape job's name is available via the `__tmp_prometheus_job_name` label.
383383

384384

385385
More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
@@ -964,7 +964,7 @@ metadata labels.
964964
The Operator automatically adds relabelings for a few standard Kubernetes fields.
965965

966966

967-
The original scrape job's name is available via the `\__tmp_prometheus_job_name` label.
967+
The original scrape job's name is available via the `__tmp_prometheus_job_name` label.
968968

969969

970970
More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
@@ -1520,7 +1520,7 @@ Description::
15201520
| Parameter | Type | Description
15211521
| `body`
15221522
| xref:../monitoring_apis/podmonitor-monitoring-coreos-com-v1.adoc#podmonitor-monitoring-coreos-com-v1[`PodMonitor`] schema
1523-
|
1523+
|
15241524
|===
15251525

15261526
.HTTP responses
@@ -1653,7 +1653,7 @@ Description::
16531653
| Parameter | Type | Description
16541654
| `body`
16551655
| xref:../monitoring_apis/podmonitor-monitoring-coreos-com-v1.adoc#podmonitor-monitoring-coreos-com-v1[`PodMonitor`] schema
1656-
|
1656+
|
16571657
|===
16581658

16591659
.HTTP responses

‎rest_api/monitoring_apis/probe-monitoring-coreos-com-v1.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -761,9 +761,9 @@ Type::
761761
| RelabelConfigs to apply to the label set of the target before it gets
762762
scraped.
763763
The original ingress address is available via the
764-
`\__tmp_prometheus_ingress_address` label. It can be used to customize the
764+
`__tmp_prometheus_ingress_address` label. It can be used to customize the
765765
probed URL.
766-
The original scrape job's name is available via the `\__tmp_prometheus_job_name` label.
766+
The original scrape job's name is available via the `__tmp_prometheus_job_name` label.
767767
More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
768768

769769
| `relabelingConfigs[]`
@@ -813,9 +813,9 @@ Description::
813813
RelabelConfigs to apply to the label set of the target before it gets
814814
scraped.
815815
The original ingress address is available via the
816-
`\__tmp_prometheus_ingress_address` label. It can be used to customize the
816+
`__tmp_prometheus_ingress_address` label. It can be used to customize the
817817
probed URL.
818-
The original scrape job's name is available via the `\__tmp_prometheus_job_name` label.
818+
The original scrape job's name is available via the `__tmp_prometheus_job_name` label.
819819
More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
820820
--
821821

@@ -1500,7 +1500,7 @@ Description::
15001500
| Parameter | Type | Description
15011501
| `body`
15021502
| xref:../monitoring_apis/probe-monitoring-coreos-com-v1.adoc#probe-monitoring-coreos-com-v1[`Probe`] schema
1503-
|
1503+
|
15041504
|===
15051505

15061506
.HTTP responses
@@ -1633,7 +1633,7 @@ Description::
16331633
| Parameter | Type | Description
16341634
| `body`
16351635
| xref:../monitoring_apis/probe-monitoring-coreos-com-v1.adoc#probe-monitoring-coreos-com-v1[`Probe`] schema
1636-
|
1636+
|
16371637
|===
16381638

16391639
.HTTP responses

‎rest_api/monitoring_apis/prometheus-monitoring-coreos-com-v1.adoc

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,7 @@ in a breaking way.
847847

848848
| `scrapeClasses[]`
849849
| `object`
850-
|
850+
|
851851

852852
| `scrapeConfigNamespaceSelector`
853853
| `object`
@@ -995,7 +995,7 @@ the triple <key,value,effect> using the matching operator <operator>.
995995

996996
| `topologySpreadConstraints[]`
997997
| `object`
998-
|
998+
|
999999

10001000
| `tracingConfig`
10011001
| `object`
@@ -4461,7 +4461,7 @@ Type::
44614461

44624462
| `deny`
44634463
| `boolean`
4464-
|
4464+
|
44654465

44664466
|===
44674467
=== .spec.containers
@@ -10240,7 +10240,7 @@ It requires Prometheus >= v2.43.0.
1024010240

1024110241
| `proxyConnectHeader{}`
1024210242
| `array`
10243-
|
10243+
|
1024410244

1024510245
| `proxyConnectHeader{}[]`
1024610246
| `object`
@@ -11161,7 +11161,7 @@ It requires Prometheus >= v2.43.0.
1116111161

1116211162
| `proxyConnectHeader{}`
1116311163
| `array`
11164-
|
11164+
|
1116511165

1116611166
| `proxyConnectHeader{}[]`
1116711167
| `object`
@@ -12862,7 +12862,7 @@ More info: https://prometheus.io/docs/prometheus/latest/configuration/configurat
1286212862

1286312863

1286412864
The Operator automatically adds relabelings for a few standard Kubernetes fields
12865-
like `\__meta_kubernetes_namespace` and `\__meta_kubernetes_service_name`.
12865+
like `__meta_kubernetes_namespace` and `__meta_kubernetes_service_name`.
1286612866
Then the Operator adds the scrape class relabelings defined here.
1286712867
Then the Operator adds the target-specific relabelings defined in the scrape object.
1286812868

@@ -12989,7 +12989,7 @@ Relabelings configures the relabeling rules to apply to all scrape targets.
1298912989

1299012990

1299112991
The Operator automatically adds relabelings for a few standard Kubernetes fields
12992-
like `\__meta_kubernetes_namespace` and `\__meta_kubernetes_service_name`.
12992+
like `__meta_kubernetes_namespace` and `__meta_kubernetes_service_name`.
1299312993
Then the Operator adds the scrape class relabelings defined here.
1299412994
Then the Operator adds the target-specific relabelings defined in the scrape object.
1299512995

@@ -15172,7 +15172,7 @@ persistent volume is being resized.
1517215172

1517315173
| `status`
1517415174
| `string`
15175-
|
15175+
|
1517615176

1517715177
| `type`
1517815178
| `string`
@@ -20326,7 +20326,7 @@ being performed. Only delete actions will be performed.
2032620326

2032720327
| `shardStatuses[]`
2032820328
| `object`
20329-
|
20329+
|
2033020330

2033120331
| `shards`
2033220332
| `integer`
@@ -20580,7 +20580,7 @@ Description::
2058020580
| Parameter | Type | Description
2058120581
| `body`
2058220582
| xref:../monitoring_apis/prometheus-monitoring-coreos-com-v1.adoc#prometheus-monitoring-coreos-com-v1[`Prometheus`] schema
20583-
|
20583+
|
2058420584
|===
2058520585

2058620586
.HTTP responses
@@ -20713,7 +20713,7 @@ Description::
2071320713
| Parameter | Type | Description
2071420714
| `body`
2071520715
| xref:../monitoring_apis/prometheus-monitoring-coreos-com-v1.adoc#prometheus-monitoring-coreos-com-v1[`Prometheus`] schema
20716-
|
20716+
|
2071720717
|===
2071820718

2071920719
.HTTP responses
@@ -20815,7 +20815,7 @@ Description::
2081520815
| Parameter | Type | Description
2081620816
| `body`
2081720817
| xref:../autoscale_apis/scale-autoscaling-v1.adoc#scale-autoscaling-v1[`Scale`] schema
20818-
|
20818+
|
2081920819
|===
2082020820

2082120821
.HTTP responses
@@ -20917,7 +20917,7 @@ Description::
2091720917
| Parameter | Type | Description
2091820918
| `body`
2091920919
| xref:../monitoring_apis/prometheus-monitoring-coreos-com-v1.adoc#prometheus-monitoring-coreos-com-v1[`Prometheus`] schema
20920-
|
20920+
|
2092120921
|===
2092220922

2092320923
.HTTP responses

‎rest_api/monitoring_apis/servicemonitor-monitoring-coreos-com-v1.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ Cannot be set at the same time as `authorization`, or `basicAuth`.
335335

336336
| `params{}`
337337
| `array (string)`
338-
|
338+
|
339339

340340
| `path`
341341
| `string`
@@ -365,7 +365,7 @@ metadata labels.
365365
The Operator automatically adds relabelings for a few standard Kubernetes fields.
366366

367367

368-
The original scrape job's name is available via the `\__tmp_prometheus_job_name` label.
368+
The original scrape job's name is available via the `__tmp_prometheus_job_name` label.
369369

370370

371371
More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
@@ -947,7 +947,7 @@ metadata labels.
947947
The Operator automatically adds relabelings for a few standard Kubernetes fields.
948948

949949

950-
The original scrape job's name is available via the `\__tmp_prometheus_job_name` label.
950+
The original scrape job's name is available via the `__tmp_prometheus_job_name` label.
951951

952952

953953
More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
@@ -1543,7 +1543,7 @@ Description::
15431543
| Parameter | Type | Description
15441544
| `body`
15451545
| xref:../monitoring_apis/servicemonitor-monitoring-coreos-com-v1.adoc#servicemonitor-monitoring-coreos-com-v1[`ServiceMonitor`] schema
1546-
|
1546+
|
15471547
|===
15481548

15491549
.HTTP responses
@@ -1676,7 +1676,7 @@ Description::
16761676
| Parameter | Type | Description
16771677
| `body`
16781678
| xref:../monitoring_apis/servicemonitor-monitoring-coreos-com-v1.adoc#servicemonitor-monitoring-coreos-com-v1[`ServiceMonitor`] schema
1679-
|
1679+
|
16801680
|===
16811681

16821682
.HTTP responses

0 commit comments

Comments
 (0)