Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: aws-samples/eks-blueprints-workloads
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: rodrigobersa/eks-blueprints-workloads
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Mar 2, 2023

  1. feature: adding skiapp which uses alb

    EC2 Default User committed Mar 2, 2023
    Copy the full SHA
    6f58998 View commit details

  2. feature: adding rollout resource

    EC2 Default User committed Mar 2, 2023
    Copy the full SHA
    5df38af View commit details

  3. feature: adding rollout resource

    EC2 Default User committed Mar 2, 2023
    Copy the full SHA
    b6320e7 View commit details
27 changes: 27 additions & 0 deletions teams/team-riker/dev/templates/alb-skiapp/deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: skiapp-deployment
namespace: team-riker
spec:
selector:
matchLabels:
app: skiapp
replicas: 2
template:
metadata:
labels:
app: skiapp
spec:
containers:
- name: skiapp
image: sharepointoscar/skiapp:v1
ports:
- containerPort: 8080
resources:
requests:
memory: '64Mi'
cpu: '250m'
limits:
memory: '128Mi'
cpu: '500m'
26 changes: 26 additions & 0 deletions teams/team-riker/dev/templates/alb-skiapp/ingress.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: skiapp-ingress
namespace: team-riker
annotations:
alb.ingress.kubernetes.io/group.name: riker
alb.ingress.kubernetes.io/scheme: internet-facing
alb.ingress.kubernetes.io/target-type: ip
alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}]'
#alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS":443}]'
#alb.ingress.kubernetes.io/actions.ssl-redirect: '{"Type": "redirect", "RedirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_301"}}'
alb.ingress.kubernetes.io/tags: Environment=dev,Team=Riker
spec:
ingressClassName: alb
rules:
- host: #skiapp.{{ .Values.spec.ingress.host }}
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: skiapp-service
port:
number: 80
97 changes: 97 additions & 0 deletions teams/team-riker/dev/templates/alb-skiapp/rollout.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
apiVersion: argoproj.io/v1alpha1
kind: Rollout
metadata:
name: skiapp-rollout
namespace: team-riker
labels:
app: skiapp
spec:
replicas: 3
revisionHistoryLimit: 1
selector:
matchLabels:
app: skiapp
template:
metadata:
labels:
app: skiapp
spec:
containers:
- name: skiapp
image: sharepointoscar/skiapp:v2
imagePullPolicy: Always
ports:
- name: http
containerPort: 8080
protocol: TCP
resources:
requests:
memory: "64Mi"
cpu: "250m"
limits:
memory: "128Mi"
cpu: "500m"
{{ if .Values.spec.karpenterInstanceProfile }}
nodeSelector: # <- add nodeselector, toleration and spread constraitns
team: default
type: karpenter
tolerations:
- key: 'karpenter'
operator: 'Exists'
effect: 'NoSchedule'
{{ end }}
topologySpreadConstraints:
- maxSkew: 1
topologyKey: topology.kubernetes.io/zone
whenUnsatisfiable: DoNotSchedule
labelSelector:
matchLabels:
app: skiapp
tolerations:
- key: 'karpenter'
operator: 'Exists'
effect: 'NoSchedule'
strategy:
blueGreen:
autoPromotionEnabled: false
activeService: skiapp-service
previewService: skiapp-service-preview
---
apiVersion: v1
kind: Service
metadata:
name: skiapp-service-preview
namespace: team-riker
spec:
ports:
- port: 80
targetPort: 8080
protocol: TCP
type: NodePort
selector:
app: skiapp
---
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: skiapp-ingress-preview
namespace: team-riker
annotations:
alb.ingress.kubernetes.io/group.name: riker-preview
alb.ingress.kubernetes.io/scheme: internet-facing
alb.ingress.kubernetes.io/target-type: ip
alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}]'
alb.ingress.kubernetes.io/tags: 'Environment=dev,Team=Riker'
spec:
ingressClassName: alb
rules:
- host:
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: skiapp-service-preview
port:
number: 80
13 changes: 13 additions & 0 deletions teams/team-riker/dev/templates/alb-skiapp/service.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
apiVersion: v1
kind: Service
metadata:
name: skiapp-service
namespace: team-riker
spec:
ports:
- port: 80
targetPort: 8080
protocol: TCP
type: NodePort
selector:
app: skiapp