Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MAISTRA-929: Remove limits as advised #269

Merged
merged 1 commit into from
Oct 30, 2019
Merged

MAISTRA-929: Remove limits as advised #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 4 additions & 13 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ spec:
### Resource Limits

If you will be installing into an instance that is resource constrained, you most likely will need to modify the
resource limits used by default. Resource limits can be set by default in `.spec.istio.global.defaultResources`. For
resource requirements used by default. Resource requirements can be set by default in `.spec.istio.global.defaultResources`. For
example:

```yaml
Expand All @@ -230,9 +230,6 @@ spec:
requests:
cpu: 10m
memory: 128Mi
limits:
cpu: 100m
memory: 256Mi

...
```
Expand All @@ -255,20 +252,14 @@ spec:
proxy:
resources:
requests:
cpu: 100m
memory: 128Mi
limits:
cpu: 500m
cpu: 10m
memory: 128Mi
mixer:
telemetry:
resources:
requests:
cpu: 100m
memory: 1G
limits:
cpu: 500m
memory: 4G
cpu: 10m
memory: 128Mi

...
```
Expand Down
18 changes: 0 additions & 18 deletions deploy/examples/maistra_v1_servicemeshcontrolplane_cr_auth.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,6 @@ spec:
mtls:
enabled: true

proxy:
# constrain resources for use in smaller environments
resources:
requests:
cpu: 100m
memory: 128Mi
limits:
cpu: 500m
memory: 128Mi

gateways:
istio-egressgateway:
# disable autoscaling for use in smaller environments
Expand All @@ -43,14 +33,6 @@ spec:
telemetry:
# disable autoscaling for use in smaller environments
autoscaleEnabled: false
# constrain resources for use in smaller environments
resources:
requests:
cpu: 100m
memory: 1G
limits:
cpu: 500m
memory: 4G

pilot:
# disable autoscaling for use in smaller environments
Expand Down
19 changes: 0 additions & 19 deletions deploy/examples/maistra_v1_servicemeshcontrolplane_cr_full.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,6 @@ spec:
# For a complete list of all options, see the docs at https://maistra-1-0.maistra.io/docs/installation/installation-options/

istio:
global:
proxy:
# constrain resources for use in smaller environments
resources:
requests:
cpu: 100m
memory: 128Mi
limits:
cpu: 500m
memory: 128Mi

gateways:
istio-egressgateway:
# disable autoscaling for use in smaller environments
Expand All @@ -38,14 +27,6 @@ spec:
telemetry:
# disable autoscaling for use in smaller environments
autoscaleEnabled: false
# constrain resources for use in smaller environments
resources:
requests:
cpu: 100m
memory: 1G
limits:
cpu: 500m
memory: 4G

pilot:
# disable autoscaling for use in smaller environments
Expand Down
19 changes: 0 additions & 19 deletions deploy/examples/maistra_v1_servicemeshcontrolplane_cr_minimal.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,6 @@ spec:
# For a complete list of all options, see the docs at https://maistra-1-0.maistra.io/docs/installation/installation-options/

istio:
global:
proxy:
# constrain resources for use in smaller environments
resources:
requests:
cpu: 100m
memory: 128Mi
limits:
cpu: 500m
memory: 128Mi

gateways:
istio-egressgateway:
# disable autoscaling for use in smaller environments
Expand All @@ -33,14 +22,6 @@ spec:
telemetry:
# disable autoscaling for use in smaller environments
autoscaleEnabled: false
# constrain resources for use in smaller environments
resources:
requests:
cpu: 100m
memory: 1G
limits:
cpu: 500m
memory: 4G

pilot:
# disable autoscaling for use in smaller environments
Expand Down
18 changes: 0 additions & 18 deletions deploy/smcp-templates/base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ spec:
cpu: 10m
memory: 128Mi
limits:
cpu: 50m
memory: 256Mi
proxy:
autoInject: disabled
dnsRefreshRate: 300s
Expand All @@ -21,8 +19,6 @@ spec:
cpu: 10m
memory: 128Mi
limits:
cpu: 50m
memory: 256Mi
oauthproxy:
tag: 4.1
imagePullPolicy: IfNotPresent
Expand All @@ -35,25 +31,19 @@ spec:
cpu: 10m
memory: 128Mi
limits:
cpu: 100m
memory: 256Mi
galley:
# constrain resources for use in smaller environments
resources:
requests:
cpu: 10m
memory: 128Mi
limits:
cpu: 100m
memory: 256Mi
pilot:
resources:
requests:
cpu: 10m
memory: 128Mi
limits:
cpu: 100m
memory: 256Mi
env:
GODEBUG: null
mixer:
Expand All @@ -64,8 +54,6 @@ spec:
cpu: 10m
memory: 128Mi
limits:
cpu: 50m
memory: 256Mi
env:
GODEBUG: null
grafana:
Expand Down Expand Up @@ -96,8 +84,6 @@ spec:
cpu: 10m
memory: 128Mi
limits:
cpu: 50m
memory: 256Mi
istio-ingressgateway:
enabled: true
type: ClusterIP
Expand All @@ -107,8 +93,6 @@ spec:
cpu: 10m
memory: 128Mi
limits:
cpu: 50m
memory: 256Mi
prometheus:
service:
annotations:
Expand All @@ -121,6 +105,4 @@ spec:
cpu: 10m
memory: 128Mi
limits:
cpu: 50m
memory: 512Mi
threeScale: {}
2 changes: 0 additions & 2 deletions helm/istio/charts/tracing/templates/jaeger-production-elasticsearch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,6 @@ spec:
requests:
memory: "16Gi"
cpu: "1"
limits:
memory: "16Gi"
{{- end }}

ingress:
Expand Down
3 changes: 0 additions & 3 deletions helm/istio_cni/templates/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,6 @@ spec:
requests:
cpu: 10m
memory: 100Mi
limits:
cpu: 100m
memory: 100Mi
{{- end }}
volumes:
# Used to install CNI.
Expand Down
26 changes: 1 addition & 25 deletions manifests-maistra/1.0.2/maistraoperator.v1.0.2.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,6 @@ metadata:
},
"spec": {
"istio": {
"global": {
"proxy": {
"resources": {
"requests": {
"cpu": "100m",
"memory": "128Mi"
},
"limits": {
"cpu": "500m",
"memory": "128Mi"
}
}
}
},
"gateways": {
"istio-egressgateway": {
"autoscaleEnabled": false
Expand All @@ -51,17 +37,7 @@ metadata:
"autoscaleEnabled": false
},
"telemetry": {
"autoscaleEnabled": false,
"resources": {
"requests": {
"cpu": "100m",
"memory": "1G"
},
"limits": {
"cpu": "500m",
"memory": "4G"
}
}
"autoscaleEnabled": false
}
},
"pilot": {
Expand Down
26 changes: 1 addition & 25 deletions tmp/build/manifest-templates/clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,6 @@ metadata:
},
"spec": {
"istio": {
"global": {
"proxy": {
"resources": {
"requests": {
"cpu": "100m",
"memory": "128Mi"
},
"limits": {
"cpu": "500m",
"memory": "128Mi"
}
}
}
},
"gateways": {
"istio-egressgateway": {
"autoscaleEnabled": false
Expand All @@ -51,17 +37,7 @@ metadata:
"autoscaleEnabled": false
},
"telemetry": {
"autoscaleEnabled": false,
"resources": {
"requests": {
"cpu": "100m",
"memory": "1G"
},
"limits": {
"cpu": "500m",
"memory": "4G"
}
}
"autoscaleEnabled": false
}
},
"pilot": {
Expand Down