Skip to content

Commit 030c91f

Browse files
andraxyliaandraxylia
authored
Merge branch 'master' into costin-install
2 parents fe18026 + 273e064 commit 030c91f

File tree

11 files changed

+26
-26
lines changed

11 files changed

+26
-26
lines changed

‎install/kubernetes/istio-auth.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ metadata:
1313
kind: ClusterRole
1414
apiVersion: rbac.authorization.k8s.io/v1beta1
1515
metadata:
16-
name: istio-pilot
16+
name: istio-pilot-istio-system
1717
rules:
1818
- apiGroups: ["config.istio.io"]
1919
resources: ["*"]
@@ -40,7 +40,7 @@ rules:
4040
kind: ClusterRole
4141
apiVersion: rbac.authorization.k8s.io/v1beta1
4242
metadata:
43-
name: istio-mixer
43+
name: istio-mixer-istio-system
4444
rules:
4545
- apiGroups: ["config.istio.io"] # Istio CRD watcher
4646
resources: ["*"]
@@ -55,7 +55,7 @@ rules:
5555
kind: ClusterRole
5656
apiVersion: rbac.authorization.k8s.io/v1beta1
5757
metadata:
58-
name: istio-ca
58+
name: istio-ca-istio-system
5959
rules:
6060
- apiGroups: [""]
6161
resources: ["secrets"]
@@ -68,7 +68,7 @@ rules:
6868
kind: ClusterRole
6969
apiVersion: rbac.authorization.k8s.io/v1beta1
7070
metadata:
71-
name: istio-sidecar
71+
name: istio-sidecar-istio-system
7272
rules:
7373
- apiGroups: ["istio.io"]
7474
resources: ["istioconfigs"]

‎install/kubernetes/istio-cluster-wide.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ metadata:
1313
kind: ClusterRole
1414
apiVersion: rbac.authorization.k8s.io/v1beta1
1515
metadata:
16-
name: istio-pilot
16+
name: istio-pilot-istio-system
1717
rules:
1818
- apiGroups: ["config.istio.io"]
1919
resources: ["*"]
@@ -40,7 +40,7 @@ rules:
4040
kind: ClusterRole
4141
apiVersion: rbac.authorization.k8s.io/v1beta1
4242
metadata:
43-
name: istio-mixer
43+
name: istio-mixer-istio-system
4444
rules:
4545
- apiGroups: ["config.istio.io"] # Istio CRD watcher
4646
resources: ["*"]
@@ -55,7 +55,7 @@ rules:
5555
kind: ClusterRole
5656
apiVersion: rbac.authorization.k8s.io/v1beta1
5757
metadata:
58-
name: istio-ca
58+
name: istio-ca-istio-system
5959
rules:
6060
- apiGroups: [""]
6161
resources: ["secrets"]
@@ -68,7 +68,7 @@ rules:
6868
kind: ClusterRole
6969
apiVersion: rbac.authorization.k8s.io/v1beta1
7070
metadata:
71-
name: istio-sidecar
71+
name: istio-sidecar-istio-system
7272
rules:
7373
- apiGroups: ["istio.io"]
7474
resources: ["istioconfigs"]

‎install/kubernetes/istio-rbac-beta.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
kind: ClusterRole
77
apiVersion: rbac.authorization.k8s.io/v1beta1
88
metadata:
9-
name: istio-pilot
9+
name: istio-pilot-istio-system
1010
rules:
1111
- apiGroups: ["config.istio.io"]
1212
resources: ["*"]
@@ -33,7 +33,7 @@ rules:
3333
kind: ClusterRole
3434
apiVersion: rbac.authorization.k8s.io/v1beta1
3535
metadata:
36-
name: istio-mixer
36+
name: istio-mixer-istio-system
3737
rules:
3838
- apiGroups: ["config.istio.io"] # Istio CRD watcher
3939
resources: ["*"]
@@ -48,7 +48,7 @@ rules:
4848
kind: ClusterRole
4949
apiVersion: rbac.authorization.k8s.io/v1beta1
5050
metadata:
51-
name: istio-ca
51+
name: istio-ca-istio-system
5252
rules:
5353
- apiGroups: [""]
5454
resources: ["secrets"]
@@ -61,7 +61,7 @@ rules:
6161
kind: ClusterRole
6262
apiVersion: rbac.authorization.k8s.io/v1beta1
6363
metadata:
64-
name: istio-sidecar
64+
name: istio-sidecar-istio-system
6565
rules:
6666
- apiGroups: ["istio.io"]
6767
resources: ["istioconfigs"]

‎install/kubernetes/istio.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ metadata:
1313
kind: ClusterRole
1414
apiVersion: rbac.authorization.k8s.io/v1beta1
1515
metadata:
16-
name: istio-pilot
16+
name: istio-pilot-istio-system
1717
rules:
1818
- apiGroups: ["config.istio.io"]
1919
resources: ["*"]
@@ -40,7 +40,7 @@ rules:
4040
kind: ClusterRole
4141
apiVersion: rbac.authorization.k8s.io/v1beta1
4242
metadata:
43-
name: istio-mixer
43+
name: istio-mixer-istio-system
4444
rules:
4545
- apiGroups: ["config.istio.io"] # Istio CRD watcher
4646
resources: ["*"]
@@ -55,7 +55,7 @@ rules:
5555
kind: ClusterRole
5656
apiVersion: rbac.authorization.k8s.io/v1beta1
5757
metadata:
58-
name: istio-ca
58+
name: istio-ca-istio-system
5959
rules:
6060
- apiGroups: [""]
6161
resources: ["secrets"]
@@ -68,7 +68,7 @@ rules:
6868
kind: ClusterRole
6969
apiVersion: rbac.authorization.k8s.io/v1beta1
7070
metadata:
71-
name: istio-sidecar
71+
name: istio-sidecar-istio-system
7272
rules:
7373
- apiGroups: ["istio.io"]
7474
resources: ["istioconfigs"]

‎install/kubernetes/templates/istio-rbac-beta.yaml.tmpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
kind: ClusterRole
77
apiVersion: rbac.authorization.k8s.io/v1beta1
88
metadata:
9-
name: istio-pilot
9+
name: istio-pilot-{ISTIO_NAMESPACE}
1010
rules:
1111
- apiGroups: ["config.istio.io"]
1212
resources: ["*"]
@@ -33,7 +33,7 @@ rules:
3333
kind: ClusterRole
3434
apiVersion: rbac.authorization.k8s.io/v1beta1
3535
metadata:
36-
name: istio-mixer
36+
name: istio-mixer-{ISTIO_NAMESPACE}
3737
rules:
3838
- apiGroups: ["config.istio.io"] # Istio CRD watcher
3939
resources: ["*"]
@@ -48,7 +48,7 @@ rules:
4848
kind: ClusterRole
4949
apiVersion: rbac.authorization.k8s.io/v1beta1
5050
metadata:
51-
name: istio-ca
51+
name: istio-ca-{ISTIO_NAMESPACE}
5252
rules:
5353
- apiGroups: [""]
5454
resources: ["secrets"]
@@ -61,7 +61,7 @@ rules:
6161
kind: ClusterRole
6262
apiVersion: rbac.authorization.k8s.io/v1beta1
6363
metadata:
64-
name: istio-sidecar
64+
name: istio-sidecar-{ISTIO_NAMESPACE}
6565
rules:
6666
- apiGroups: ["istio.io"]
6767
resources: ["istioconfigs"]

‎prow/e2e-suite-no_rbac-auth.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ set -u
2929
set -x
3030

3131
echo 'Running e2e no rbac, with auth Tests'
32-
./prow/e2e-suite.sh --auth_enable
32+
./prow/e2e-suite.sh --auth_enable "${@}"

‎prow/e2e-suite-no_rbac-no_auth.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ set -u
2929
set -x
3030

3131
echo 'Running e2e no rbac, no auth Tests'
32-
./prow/e2e-suite.sh
32+
./prow/e2e-suite.sh "${@}"

‎prow/e2e-suite-rbac-auth.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ set -x
3131
RBAC_FILE='install/kubernetes/istio-rbac-beta.yaml'
3232

3333
echo 'Running e2e with rbac, with auth Tests'
34-
./prow/e2e-suite.sh --rbac_path="${RBAC_FILE}" --auth_enable
34+
./prow/e2e-suite.sh --rbac_path="${RBAC_FILE}" --auth_enable "${@}"

‎prow/e2e-suite-rbac-no_auth.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ set -x
3131
RBAC_FILE='install/kubernetes/istio-rbac-beta.yaml'
3232

3333
echo 'Running e2e with rbac, no auth Tests'
34-
./prow/e2e-suite.sh --rbac_path="${RBAC_FILE}"
34+
./prow/e2e-suite.sh --rbac_path="${RBAC_FILE}" "${@}"

‎prow/e2e.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ if [ "${CI:-}" == 'bootstrap' ]; then
3636
fi
3737

3838
echo 'Running Integration Tests'
39-
./tests/e2e.sh ${E2E_ARGS[@]:-} ${@}
39+
./tests/e2e.sh ${E2E_ARGS[@]:-} "${@}"

0 commit comments

Comments
 (0)