Skip to content

Add HorizontalPodAutoscaler and PodDisruptionBudget resources to aws-crossplane blueprint #186

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

Merged
Michael Vittrup Larsen (michaelvl) merged 8 commits into from
Jun 9, 2023
Merged

Add HorizontalPodAutoscaler and PodDisruptionBudget resources to aws-crossplane blueprint #186

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6eef1fa
Add HorizontalPodAutoscaler and PodDisruptionBudget resources to aws-…
michaelvl May 25, 2023
74873d5
Add annotations to aws-crossplabe hpa and pbd
michaelvl May 26, 2023
1966ef0
Update contour-istio blueprints with hpa and pdb. Update chart values…
michaelvl May 26, 2023
7be3b45
Include metrics-server for hpa testing
michaelvl May 26, 2023
15cf1c7
Move metrics-server deployment to other tooling deployment
michaelvl May 26, 2023
fac889d
Remove unsupported annotation
michaelvl Jun 9, 2023
b73d475
Clarify blueprint comment
michaelvl Jun 9, 2023
64c42f3
Clarify blueprint comment
michaelvl Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Makefile.local
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,11 @@ deploy-multitool:
deploy-external-dns:
helm upgrade -i --repo https://kubernetes-sigs.github.io/external-dns external-dns external-dns --version 1.12.2 --values test-data/external-dns-values.yaml

#################
.PHONY: deploy-metrics-server
deploy-metrics-server:
helm upgrade -i --repo https://kubernetes-sigs.github.io/metrics-server metrics-server metrics-server --version 3.8.3 -n kube-system --set args={--kubelet-insecure-tls}

#################
# https://kind.sigs.k8s.io/docs/user/loadbalancer/
.PHONY: deploy-metallb
Expand Down Expand Up @@ -246,6 +251,7 @@ setup-getting-started: setup-getting-started-cluster setup-getting-started-contr
setup-getting-started-cluster:
make create-cluster deploy-gateway-api
make deploy-metallb
make deploy-metrics-server
make deploy-istio
make deploy-contour deploy-contour-provisioner
make setup-external-dns-test
Expand Down
5 changes: 4 additions & 1 deletion blueprints/aws-alb-crossplane/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ infrastructure:
- Application load balancer (ALB).
- Security group for ALB, together with ingress and egress rules (for
both data and healthchecks).
- ALB target group and listener definitions.
- ALB target group
- ALB listener definitions for both terminating TLS (port 443) and redirecting HTTP (port 80) to HTTPS.

This definition also includes the following Kubernetes infrastructure:

Expand All @@ -17,6 +18,8 @@ This definition also includes the following Kubernetes infrastructure:
for propagating Kubernetes endpoints for the Istio ingress gateway
to the AWS ALB target group. This links the Kubernetes internal and
AWS infrastructure.
- Optional HorizontalPodAutoscaler
- Optional PodDisruptionBudget

**Note** the ALB terminates TLS and forwards traffic un-encrypted to
the Istio ingress gateway.
Expand Down
73 changes: 72 additions & 1 deletion blueprints/aws-alb-crossplane/gatewayclassblueprint-aws-alb-crossplane.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,16 @@ spec:
threshold: 2
path: /healthz/ready
port: 15021
hpa:
minReplicas: 1 # optional
maxReplicas: 3 # Optional, will default to minReplicas if minReplicas is defined
averageUtilization: 60
ingressAcls:
cidrs:
- 0.0.0.0/0
pdb:
minAvailable: "1"
maxUnavailable:
tags: []
# Values required by this blueprint without defaults:
# providerConfigName: "example-crossplane-provider-name"
Expand Down Expand Up @@ -42,6 +49,7 @@ spec:
namespace: {{ .Gateway.metadata.namespace }}
annotations:
networking.istio.io/service-type: ClusterIP
sidecar.istio.io/proxyCPU: "1"
{{ if .Values.tags }}
{{ toYaml .Values.tags | nindent 4 }}
{{ end }}
Expand Down Expand Up @@ -176,7 +184,9 @@ spec:
namespace: {{ .Gateway.metadata.namespace }}
{{ if .Values.tags }}
annotations:
{{- toYaml .Values.tags | nindent 4 }}
{{ if .Values.tags }}
{{ toYaml .Values.tags | nindent 4 }}
{{ end }}
{{ end }}
spec:
targetGroupARN: {{ (index .Resources.LBTargetGroup 0).status.atProvider.arn }}
Expand Down Expand Up @@ -337,6 +347,67 @@ spec:
tv2.dk/gw: {{ .Gateway.metadata.namespace }}-{{ .Gateway.metadata.name }}
toPort: 15021
type: ingress
hpa: |
{{ if or (get .Values.hpa "minReplicas") (get .Values.hpa "maxReplicas") }}
apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler
metadata:
labels:
tv2.dk/gw: {{ .Gateway.metadata.namespace }}-{{ .Gateway.metadata.name }}
name: gw-{{ .Gateway.metadata.namespace }}-{{ .Gateway.metadata.name }}
namespace: {{ .Gateway.metadata.namespace }}
annotations:
{{ if .Values.tags }}
{{ toYaml .Values.tags | nindent 4 }}
{{ end }}
spec:
scaleTargetRef:
apiVersion: apps/v1
kind: Deployment
name: {{ .Gateway.metadata.name }}-child-istio
{{ if get .Values.hpa "minReplicas" }}
minReplicas: {{ .Values.hpa.minReplicas }}
{{ end }}
{{ if get .Values.hpa "maxReplicas" }}
maxReplicas: {{ .Values.hpa.maxReplicas }}
{{ else }} # Ensure that max >= min
{{ if get .Values.hpa "minReplicas" }}
maxReplicas: {{ .Values.hpa.minReplicas }}
{{ end }}
{{ end }}
metrics:
- type: Resource
resource:
name: cpu
target:
type: Utilization
averageUtilization: {{ .Values.hpa.averageUtilization }}
{{ end }}
pdb: |
{{ if or (get .Values.pdb "minAvailable") (get .Values.pdb "maxUnavailable") }}
apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
labels:
tv2.dk/gw: {{ .Gateway.metadata.namespace }}-{{ .Gateway.metadata.name }}
name: gw-{{ .Gateway.metadata.namespace }}-{{ .Gateway.metadata.name }}
namespace: {{ .Gateway.metadata.namespace }}
annotations:
{{ if .Values.tags }}
{{ toYaml .Values.tags | nindent 4 }}
{{ end }}
spec:
{{ if get .Values.pdb "minAvailable" }}
minAvailable: {{ .Values.pdb.minAvailable }}
{{ else }}
maxUnavailable: {{ .Values.pdb.maxUnavailable }}
{{ end }}
selector:
# Match the generated Deployment by label
matchLabels:
tv2.dk/gw: {{ .Gateway.metadata.namespace }}-{{ .Gateway.metadata.name }}
istio.io/gateway-name: {{ .Gateway.metadata.name }}-child
{{ end }}

# The following are templates used to 'implement' a 'parent' HTTPRoute
httpRouteTemplate:
Expand Down
86 changes: 86 additions & 0 deletions blueprints/contour-istio/gatewayclassblueprint-contour-istio-cert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@ kind: GatewayClassBlueprint
metadata:
name: contour-istio-cert
spec:
values:
default:
hpa:
minReplicas: 1 # optional
maxReplicas: 3 # Optional, will default to minReplicas if minReplicas is defined
averageUtilization: 60
pdb:
minAvailable: "1"
maxUnavailable:
tags: []

# The following are templates used to 'implement' a 'parent' Gateway
gatewayTemplate:
Expand All @@ -22,6 +32,9 @@ spec:
namespace: {{ .Gateway.metadata.namespace }}
annotations:
networking.istio.io/service-type: ClusterIP
{{ if .Values.tags }}
{{ toYaml .Values.tags | nindent 4 }}
{{ end }}
spec:
gatewayClassName: istio
listeners:
Expand All @@ -43,6 +56,10 @@ spec:
metadata:
name: {{ .Gateway.metadata.name }}
namespace: {{ .Gateway.metadata.namespace }}
annotations:
{{ if .Values.tags }}
{{ toYaml .Values.tags | nindent 4 }}
{{ end }}
spec:
ingressClassName: contour
tls:
Expand All @@ -64,12 +81,77 @@ spec:
port:
number: 80
{{- end }}
hpa: |
{{ if or (get .Values.hpa "minReplicas") (get .Values.hpa "maxReplicas") }}
apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler
metadata:
labels:
tv2.dk/gw: {{ .Gateway.metadata.namespace }}-{{ .Gateway.metadata.name }}
name: gw-{{ .Gateway.metadata.namespace }}-{{ .Gateway.metadata.name }}
namespace: {{ .Gateway.metadata.namespace }}
annotations:
{{ if .Values.tags }}
{{ toYaml .Values.tags | nindent 4 }}
{{ end }}
spec:
scaleTargetRef:
apiVersion: apps/v1
kind: Deployment
name: {{ .Gateway.metadata.name }}-child-istio
{{ if get .Values.hpa "minReplicas" }}
minReplicas: {{ .Values.hpa.minReplicas }}
{{ end }}
{{ if get .Values.hpa "maxReplicas" }}
maxReplicas: {{ .Values.hpa.maxReplicas }}
{{ else }} # Ensure that max >= min
{{ if get .Values.hpa "minReplicas" }}
maxReplicas: {{ .Values.hpa.minReplicas }}
{{ end }}
{{ end }}
metrics:
- type: Resource
resource:
name: cpu
target:
type: Utilization
averageUtilization: {{ .Values.hpa.averageUtilization }}
{{ end }}
pdb: |
{{ if or (get .Values.pdb "minAvailable") (get .Values.pdb "maxUnavailable") }}
apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
labels:
tv2.dk/gw: {{ .Gateway.metadata.namespace }}-{{ .Gateway.metadata.name }}
name: gw-{{ .Gateway.metadata.namespace }}-{{ .Gateway.metadata.name }}
namespace: {{ .Gateway.metadata.namespace }}
annotations:
{{ if .Values.tags }}
{{ toYaml .Values.tags | nindent 4 }}
{{ end }}
spec:
{{ if get .Values.pdb "minAvailable" }}
minAvailable: {{ .Values.pdb.minAvailable }}
{{ else }}
maxUnavailable: {{ .Values.pdb.maxUnavailable }}
{{ end }}
selector:
# Match the generated Deployment by label
matchLabels:
tv2.dk/gw: {{ .Gateway.metadata.namespace }}-{{ .Gateway.metadata.name }}
istio.io/gateway-name: {{ .Gateway.metadata.name }}-child
{{ end }}
tlsCertificate: |
apiVersion: cert-manager.io/v1
kind: Certificate
metadata:
name: {{ .Gateway.metadata.name }}-cert
namespace: {{ .Gateway.metadata.namespace }}
annotations:
{{ if .Values.tags }}
{{ toYaml .Values.tags | nindent 4 }}
{{ end }}
spec:
secretName: {{ .Gateway.metadata.name }}-tls
duration: 2160h # 90d
Expand Down Expand Up @@ -103,6 +185,10 @@ spec:
metadata:
name: {{ .HTTPRoute.metadata.name }}-child
namespace: {{ .HTTPRoute.metadata.namespace }}
annotations:
{{ if .Values.tags }}
{{ toYaml .Values.tags | nindent 4 }}
{{ end }}
spec:
parentRefs:
{{ range .HTTPRoute.spec.parentRefs }}
Expand Down
82 changes: 82 additions & 0 deletions blueprints/contour-istio/gatewayclassblueprint-contour-istio.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@ kind: GatewayClassBlueprint
metadata:
name: contour-istio
spec:
values:
default:
hpa:
minReplicas: 1 # optional
maxReplicas: 3 # Optional, will default to minReplicas if minReplicas is defined
averageUtilization: 60
pdb:
minAvailable: "1"
maxUnavailable:
tags: []

# The following are templates used to 'implement' a 'parent' Gateway
gatewayTemplate:
Expand All @@ -15,6 +25,9 @@ spec:
namespace: {{ .Gateway.metadata.namespace }}
annotations:
networking.istio.io/service-type: ClusterIP
{{ if .Values.tags }}
{{ toYaml .Values.tags | nindent 4 }}
{{ end }}
spec:
gatewayClassName: istio
listeners:
Expand All @@ -36,6 +49,10 @@ spec:
metadata:
name: {{ .Gateway.metadata.name }}
namespace: {{ .Gateway.metadata.namespace }}
annotations:
{{ if .Values.tags }}
{{ toYaml .Values.tags | nindent 4 }}
{{ end }}
spec:
ingressClassName: contour
tls:
Expand All @@ -57,6 +74,67 @@ spec:
port:
number: 80
{{- end }}
hpa: |
{{ if or (get .Values.hpa "minReplicas") (get .Values.hpa "maxReplicas") }}
apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler
metadata:
labels:
tv2.dk/gw: {{ .Gateway.metadata.namespace }}-{{ .Gateway.metadata.name }}
name: gw-{{ .Gateway.metadata.namespace }}-{{ .Gateway.metadata.name }}
namespace: {{ .Gateway.metadata.namespace }}
annotations:
{{ if .Values.tags }}
{{ toYaml .Values.tags | nindent 4 }}
{{ end }}
spec:
scaleTargetRef:
apiVersion: apps/v1
kind: Deployment
name: {{ .Gateway.metadata.name }}-child-istio
{{ if get .Values.hpa "minReplicas" }}
minReplicas: {{ .Values.hpa.minReplicas }}
{{ end }}
{{ if get .Values.hpa "maxReplicas" }}
maxReplicas: {{ .Values.hpa.maxReplicas }}
{{ else }} # Ensure that max >= min
{{ if get .Values.hpa "minReplicas" }}
maxReplicas: {{ .Values.hpa.minReplicas }}
{{ end }}
{{ end }}
metrics:
- type: Resource
resource:
name: cpu
target:
type: Utilization
averageUtilization: {{ .Values.hpa.averageUtilization }}
{{ end }}
pdb: |
{{ if or (get .Values.pdb "minAvailable") (get .Values.pdb "maxUnavailable") }}
apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
labels:
tv2.dk/gw: {{ .Gateway.metadata.namespace }}-{{ .Gateway.metadata.name }}
name: gw-{{ .Gateway.metadata.namespace }}-{{ .Gateway.metadata.name }}
namespace: {{ .Gateway.metadata.namespace }}
annotations:
{{ if .Values.tags }}
{{ toYaml .Values.tags | nindent 4 }}
{{ end }}
spec:
{{ if get .Values.pdb "minAvailable" }}
minAvailable: {{ .Values.pdb.minAvailable }}
{{ else }}
maxUnavailable: {{ .Values.pdb.maxUnavailable }}
{{ end }}
selector:
# Match the generated Deployment by label
matchLabels:
tv2.dk/gw: {{ .Gateway.metadata.namespace }}-{{ .Gateway.metadata.name }}
istio.io/gateway-name: {{ .Gateway.metadata.name }}-child
{{ end }}

# The following are templates used to 'implement' a 'parent' HTTPRoute
httpRouteTemplate:
Expand All @@ -67,6 +145,10 @@ spec:
metadata:
name: {{ .HTTPRoute.metadata.name }}-child
namespace: {{ .HTTPRoute.metadata.namespace }}
annotations:
{{ if .Values.tags }}
{{ toYaml .Values.tags | nindent 4 }}
{{ end }}
spec:
parentRefs:
{{ range .HTTPRoute.spec.parentRefs }}
Expand Down
6 changes: 5 additions & 1 deletion charts/bifrost-gateway-controller/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@

## [UNRELEASED]

- Example text, add your PR info according to example below below this line. Do not bump chart version in Chart.yaml.
- Example text, add your PR info according to example below below this line. Do not bump chart version in Chart.yaml unless a chart release will be made following your PR.

## [0.1.7]

- Add HorizontalPodAutoscaler and PodDisruptionBudget resources to aws-crossplane blueprint and update Helm chart example values with RBAC for HPA and PDB. ([#186](https://github.com/tv2-oss/bifrost-gateway-controller/pull/186)) [@michaelvl](https://github.com/michaelvl)

## [0.1.8]

Expand Down
Loading