make sure istio/knative examples are exactly same compared to upstream

prashantrewar · Mar 19, 2019 · 39339f9 · 39339f9
1 parent 0cc272e
commit 39339f9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/examples/knative-v0.2.1/release-no-mon.yml b/examples/knative-v0.2.1/release-no-mon.yml
@@ -702,7 +702,7 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  # TODO annotations: null
+  annotations: null
   labels:
     app: knative-ingressgateway
     chart: gateways-1.0.1
@@ -1352,7 +1352,7 @@ metadata:
 ---
 apiVersion: v1
 data:
-  istio.sidecar.includeOutboundIPRanges: '10.20.4.167/14,10.128.0.6/14'
+  istio.sidecar.includeOutboundIPRanges: '*'
 kind: ConfigMap
 metadata:
   name: config-network

diff --git a/examples/knative-v0.2.1/release.yml b/examples/knative-v0.2.1/release.yml
@@ -1352,7 +1352,7 @@ metadata:
 ---
 apiVersion: v1
 data:
-  istio.sidecar.includeOutboundIPRanges: '10.20.4.167/14,10.128.0.6/14'
+  istio.sidecar.includeOutboundIPRanges: '*'
 kind: ConfigMap
 metadata:
   name: config-network
@@ -1535,7 +1535,7 @@ metadata:
     app: elasticsearch-logging
     kubernetes.io/cluster-service: "true"
   name: elasticsearch-logging
-  # namespace: knative-monitoring TODO fix me
+  namespace: knative-monitoring
 roleRef:
   apiGroup: ""
   kind: ClusterRole
@@ -7359,7 +7359,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:
   name: kube-state-metrics
-  # namespace: knative-monitoring TODO fix me
+  namespace: knative-monitoring
 rules:
 - apiGroups:
   - ""
@@ -7427,7 +7427,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
   name: kube-state-metrics
-  # namespace: knative-monitoring TODO fix me
+  namespace: knative-monitoring
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -13810,7 +13810,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: node-exporter
-  # namespace: knative-monitoring TODO fix me
+  namespace: knative-monitoring
 rules:
 - apiGroups:
   - authentication.k8s.io
@@ -13829,7 +13829,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: node-exporter
-  # namespace: knative-monitoring TODO fix me
+  namespace: knative-monitoring
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -16960,7 +16960,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: prometheus-system
-  # namespace: knative-monitoring TODO fix me
+  namespace: knative-monitoring
 rules:
 - apiGroups:
   - ""

diff --git a/examples/knative-v0.2.3/release.yml b/examples/knative-v0.2.3/release.yml
@@ -1535,6 +1535,7 @@ metadata:
     app: elasticsearch-logging
     kubernetes.io/cluster-service: "true"
   name: elasticsearch-logging
+  namespace: knative-monitoring
 roleRef:
   apiGroup: ""
   kind: ClusterRole
@@ -1556,7 +1557,7 @@ metadata:
   name: elasticsearch-logging
   namespace: knative-monitoring
 spec:
-  replicas: 3
+  replicas: 2
   selector:
     matchLabels:
       app: elasticsearch-logging
@@ -7358,6 +7359,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:
   name: kube-state-metrics
+  namespace: knative-monitoring
 rules:
 - apiGroups:
   - ""
@@ -7425,6 +7427,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
   name: kube-state-metrics
+  namespace: knative-monitoring
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -13807,6 +13810,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: node-exporter
+  namespace: knative-monitoring
 rules:
 - apiGroups:
   - authentication.k8s.io
@@ -13825,6 +13829,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: node-exporter
+  namespace: knative-monitoring
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -16955,6 +16960,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: prometheus-system
+  namespace: knative-monitoring
 rules:
 - apiGroups:
   - ""

diff --git a/examples/knative-v0.4.0/release-no-mon.yml → examples/knative-v0.4.0/serving.yml b/examples/knative-v0.4.0/release-no-mon.yml → examples/knative-v0.4.0/serving.yml