Skip to content

Commit 2a0190e

Browse files
authored
Merge pull request #34 from cert-manager/istio-1.9
Adds istio v1.9 to tests, and make it the default
2 parents 6842929 + 2dbdcd4 commit 2a0190e

File tree

3 files changed

+57
-2
lines changed

3 files changed

+57
-2
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
BINDIR ?= $(CURDIR)/bin
1616
ARCH ?= $(shell go env GOARCH)
17-
ISTIO_VERSION ?= 1.8.2
17+
ISTIO_VERSION ?= 1.9.1
1818
K8S_VERSION ?= 1.20.0
1919
HELM_VERSION ?= 3.4.1
2020

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ and control plane components to be secured using
66
and intra cluster, will be signed, delivered and renewed using [cert-manager
77
issuers](https://cert-manager.io/docs/concepts/issuer).
88

9-
Currently supports istio versions v1.7 and v1.8
9+
Currently supports istio versions v1.7+
1010

1111
---
1212

hack/istio-config-1.9.1.yaml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
apiVersion: install.istio.io/v1alpha1
2+
kind: IstioOperator
3+
metadata:
4+
namespace: istio-system
5+
spec:
6+
profile: "demo"
7+
hub: gcr.io/istio-release
8+
values:
9+
global:
10+
# Change certificate provider to cert-manager istio agent for istio agent
11+
caAddress: cert-manager-istio-csr.cert-manager.svc:443
12+
components:
13+
pilot:
14+
k8s:
15+
env:
16+
# Disable istiod CA Sever functionality
17+
- name: ENABLE_CA_SERVER
18+
value: "false"
19+
overlays:
20+
- apiVersion: apps/v1
21+
kind: Deployment
22+
name: istiod
23+
patches:
24+
25+
# Mount istiod serving and webhook certificate from Secret mount
26+
- path: spec.template.spec.containers.[name:discovery].args[7]
27+
value: "--tlsCertFile=/etc/cert-manager/tls/tls.crt"
28+
- path: spec.template.spec.containers.[name:discovery].args[8]
29+
value: "--tlsKeyFile=/etc/cert-manager/tls/tls.key"
30+
- path: spec.template.spec.containers.[name:discovery].args[9]
31+
value: "--caCertFile=/etc/cert-manager/ca/root-cert.pem"
32+
33+
- path: spec.template.spec.containers.[name:discovery].volumeMounts[6]
34+
value:
35+
name: cert-manager
36+
mountPath: "/etc/cert-manager/tls"
37+
readOnly: true
38+
- path: spec.template.spec.containers.[name:discovery].volumeMounts[7]
39+
value:
40+
name: ca-root-cert
41+
mountPath: "/etc/cert-manager/ca"
42+
readOnly: true
43+
44+
- path: spec.template.spec.volumes[6]
45+
value:
46+
name: cert-manager
47+
secret:
48+
secretName: istiod-tls
49+
- path: spec.template.spec.volumes[7]
50+
value:
51+
name: ca-root-cert
52+
configMap:
53+
name: istiod-tls
54+
defaultMode: 420
55+
name: istio-ca-root-cert

0 commit comments

Comments
 (0)