Skip to content

Commit 0afc056

Browse files
authored
Update Istio to 1.10.0
1 parent 7ab6f84 commit 0afc056

File tree

2 files changed

+55
-41
lines changed

2 files changed

+55
-41
lines changed

istio/operator/manifests.yaml

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,50 @@
11
---
22
# Source: crds/crd-operator.yaml
33
# SYNC WITH manifests/charts/base/files
4-
apiVersion: apiextensions.k8s.io/v1beta1
4+
apiVersion: apiextensions.k8s.io/v1
55
kind: CustomResourceDefinition
66
metadata:
77
name: istiooperators.install.istio.io
8+
labels:
9+
release: istio
810
spec:
11+
conversion:
12+
strategy: None
913
group: install.istio.io
1014
names:
1115
kind: IstioOperator
16+
listKind: IstioOperatorList
1217
plural: istiooperators
1318
singular: istiooperator
1419
shortNames:
1520
- iop
21+
- io
1622
scope: Namespaced
17-
subresources:
18-
status: {}
19-
validation:
20-
openAPIV3Schema:
21-
properties:
22-
apiVersion:
23-
description: 'APIVersion defines the versioned schema of this representation
24-
of an object. Servers should convert recognized schemas to the latest
25-
internal value, and may reject unrecognized values.
26-
More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#resources'
27-
type: string
28-
kind:
29-
description: 'Kind is a string value representing the REST resource this
30-
object represents. Servers may infer this from the endpoint the client
31-
submits requests to. Cannot be updated. In CamelCase.
32-
More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
33-
type: string
34-
spec:
35-
description: 'Specification of the desired state of the istio control plane resource.
36-
More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status'
37-
type: object
38-
status:
39-
description: 'Status describes each of istio control plane component status at the current time.
40-
0 means NONE, 1 means UPDATING, 2 means HEALTHY, 3 means ERROR, 4 means RECONCILING.
41-
More info: https://github.com/istio/api/blob/master/operator/v1alpha1/istio.operator.v1alpha1.pb.html &
42-
https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status'
43-
type: object
4423
versions:
45-
- name: v1alpha1
24+
- additionalPrinterColumns:
25+
- description: Istio control plane revision
26+
jsonPath: .spec.revision
27+
name: Revision
28+
type: string
29+
- description: IOP current state
30+
jsonPath: .status.status
31+
name: Status
32+
type: string
33+
- description: 'CreationTimestamp is a timestamp representing the server time
34+
when this object was created. It is not guaranteed to be set in happens-before
35+
order across separate operations. Clients may not set this value. It is represented
36+
in RFC3339 form and is in UTC. Populated by the system. Read-only. Null for
37+
lists. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata'
38+
jsonPath: .metadata.creationTimestamp
39+
name: Age
40+
type: date
41+
name: v1alpha1
42+
subresources:
43+
status: {}
44+
schema:
45+
openAPIV3Schema:
46+
type: object
47+
x-kubernetes-preserve-unknown-fields: true
4648
served: true
4749
storage: true
4850
---
@@ -230,7 +232,7 @@ spec:
230232
serviceAccountName: istio-operator
231233
containers:
232234
- name: istio-operator
233-
image: docker.io/istio/operator:1.9.5
235+
image: docker.io/istio/operator:1.10.0
234236
command:
235237
- operator
236238
- server

istio/system/prometheus.yaml

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
component: "server"
88
app: prometheus
99
release: prometheus
10-
chart: prometheus-11.16.2
10+
chart: prometheus-13.6.0
1111
heritage: Helm
1212
name: prometheus
1313
namespace: istio-system
@@ -22,7 +22,7 @@ metadata:
2222
component: "server"
2323
app: prometheus
2424
release: prometheus
25-
chart: prometheus-11.16.2
25+
chart: prometheus-13.6.0
2626
heritage: Helm
2727
name: prometheus
2828
namespace: istio-system
@@ -222,6 +222,11 @@ data:
222222
regex: true
223223
source_labels:
224224
- __meta_kubernetes_pod_annotation_prometheus_io_scrape
225+
- action: replace
226+
regex: (https?)
227+
source_labels:
228+
- __meta_kubernetes_pod_annotation_prometheus_io_scheme
229+
target_label: __scheme__
225230
- action: replace
226231
regex: (.+)
227232
source_labels:
@@ -256,6 +261,11 @@ data:
256261
regex: true
257262
source_labels:
258263
- __meta_kubernetes_pod_annotation_prometheus_io_scrape_slow
264+
- action: replace
265+
regex: (https?)
266+
source_labels:
267+
- __meta_kubernetes_pod_annotation_prometheus_io_scheme
268+
target_label: __scheme__
259269
- action: replace
260270
regex: (.+)
261271
source_labels:
@@ -297,7 +307,7 @@ metadata:
297307
component: "server"
298308
app: prometheus
299309
release: prometheus
300-
chart: prometheus-11.16.2
310+
chart: prometheus-13.6.0
301311
heritage: Helm
302312
name: prometheus
303313
rules:
@@ -339,7 +349,7 @@ metadata:
339349
component: "server"
340350
app: prometheus
341351
release: prometheus
342-
chart: prometheus-11.16.2
352+
chart: prometheus-13.6.0
343353
heritage: Helm
344354
name: prometheus
345355
subjects:
@@ -359,7 +369,7 @@ metadata:
359369
component: "server"
360370
app: prometheus
361371
release: prometheus
362-
chart: prometheus-11.16.2
372+
chart: prometheus-13.6.0
363373
heritage: Helm
364374
name: prometheus
365375
namespace: istio-system
@@ -384,7 +394,7 @@ metadata:
384394
component: "server"
385395
app: prometheus
386396
release: prometheus
387-
chart: prometheus-11.16.2
397+
chart: prometheus-13.6.0
388398
heritage: Helm
389399
name: prometheus
390400
namespace: istio-system
@@ -404,13 +414,13 @@ spec:
404414
component: "server"
405415
app: prometheus
406416
release: prometheus
407-
chart: prometheus-11.16.2
417+
chart: prometheus-13.6.0
408418
heritage: Helm
409419
spec:
410420
serviceAccountName: prometheus
411421
containers:
412422
- name: prometheus-server-configmap-reload
413-
image: "jimmidyson/configmap-reload:v0.4.0"
423+
image: "jimmidyson/configmap-reload:v0.5.0"
414424
imagePullPolicy: "IfNotPresent"
415425
args:
416426
- --volume-dir=/etc/config
@@ -423,7 +433,7 @@ spec:
423433
readOnly: true
424434

425435
- name: prometheus-server
426-
image: "prom/prometheus:v2.21.0"
436+
image: "prom/prometheus:v2.24.0"
427437
imagePullPolicy: "IfNotPresent"
428438
args:
429439
- --storage.tsdb.retention.time=15d
@@ -440,7 +450,7 @@ spec:
440450
port: 9090
441451
initialDelaySeconds: 0
442452
periodSeconds: 5
443-
timeoutSeconds: 30
453+
timeoutSeconds: 4
444454
failureThreshold: 3
445455
successThreshold: 1
446456
livenessProbe:
@@ -449,7 +459,7 @@ spec:
449459
port: 9090
450460
initialDelaySeconds: 30
451461
periodSeconds: 15
452-
timeoutSeconds: 30
462+
timeoutSeconds: 10
453463
failureThreshold: 3
454464
successThreshold: 1
455465
resources:
@@ -460,6 +470,8 @@ spec:
460470
- name: storage-volume
461471
mountPath: /data
462472
subPath: ""
473+
hostNetwork: false
474+
dnsPolicy: ClusterFirst
463475
securityContext:
464476
fsGroup: 65534
465477
runAsGroup: 65534

0 commit comments

Comments
 (0)