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.

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

Staging #7

Merged
merged 154 commits into from
Mar 31, 2023
Merged
Changes from 21 commits
Commits
Show all changes
154 commits
Select commit Hold shift + click to select a range
16599e4
adding instrumentation to docker compose
cahillsf Jan 16, 2022
ae8da15
updating notes
cahillsf Jan 16, 2022
4e58b16
enabling instrumentation, adding logging + k8s con
cahillsf Jan 16, 2022
3e5f6fc
switching to debug level logging in flask
cahillsf Jan 16, 2022
27c98fc
adding nginx.conf in image buil
cahillsf Jan 16, 2022
48400d6
updating conf to include proxy_pass to flask
cahillsf Jan 16, 2022
7269e45
updating expected envvars for RUM init
cahillsf Jan 16, 2022
82c8bfa
enabling rum + calling envvars
cahillsf Jan 16, 2022
ec2b539
adding base path /api k8s deploy for axios call
cahillsf Jan 16, 2022
69dd664
removing hashbang from base url of served vue app
cahillsf Jan 16, 2022
f64ee1a
adding k8s-config deployment files
cahillsf Jan 16, 2022
c18344d
adding dockerfile for mongodb container
cahillsf Jan 16, 2022
ce1fe77
removing carryover unused components
cahillsf Jan 19, 2022
af08a21
updating notes
cahillsf Jan 19, 2022
2abb255
dynamicallu assigning api call routes
cahillsf Jan 29, 2022
6a86fce
updating backend routes to include /api
cahillsf Jan 29, 2022
229545d
adding dynamic app build env var for vue
cahillsf Jan 29, 2022
93519bc
updating styles and correcting logo click behavior
cahillsf Jan 29, 2022
4984da5
removing unused component from router
cahillsf Jan 29, 2022
bc895e0
calling api routes dynamically
cahillsf Jan 29, 2022
6f24a98
updating notes
cahillsf Feb 6, 2022
3024487
updating nginx server conf in case of page refresh
cahillsf Feb 6, 2022
9f4e641
adding notes for finding custom theming
cahillsf Feb 6, 2022
a3b11ea
shell script for applying all yaml files in dir
cahillsf Feb 6, 2022
89a6fe0
always pull image + adding envvars to vue
cahillsf Feb 17, 2022
68b5278
adding ingress resource
cahillsf Feb 17, 2022
5cfb06b
updating api version for ingress resource
cahillsf Feb 17, 2022
0c3cb71
updating namspace to default
cahillsf Feb 17, 2022
86d6c3c
adding helm values
cahillsf Feb 17, 2022
d285613
updating clustername
cahillsf Feb 17, 2022
d986869
updating clustername
cahillsf Feb 17, 2022
cb890ff
updating target type for ingress
cahillsf Feb 17, 2022
abc21dc
updating ingress annotations
cahillsf Feb 17, 2022
9da724b
updating namespace
cahillsf Feb 17, 2022
fe6639d
updating namespace
cahillsf Feb 17, 2022
5b5160f
updating namespace for ingress to default
cahillsf Feb 17, 2022
1034c5d
adding elb
cahillsf Feb 17, 2022
d15697e
adding ingress controller
cahillsf Feb 17, 2022
52b81b5
updating type of vue service to LoadBalancer
cahillsf Feb 20, 2022
dc485c1
updating yaml files
cahillsf Feb 20, 2022
02310d8
adding kubeadm init config
cahillsf Feb 20, 2022
9bb9a1e
updating init-config
cahillsf Feb 20, 2022
c690ad5
updating init-config
cahillsf Feb 20, 2022
ea7bacb
updating init file
cahillsf Feb 20, 2022
e0d1325
enable apm in values.yaml
cahillsf Feb 20, 2022
d3ae291
updating for dev
cahillsf Feb 21, 2022
d3ee62e
updating notes
cahillsf Feb 21, 2022
f289bbd
adding recapchta server validation
cahillsf Feb 21, 2022
90ddccd
updating flask reqs for recaptcha
cahillsf Feb 21, 2022
4d944ea
adding recaptcha and datadog-ci
cahillsf Feb 21, 2022
1580ad2
hide recaptcha badge
cahillsf Feb 21, 2022
e5d72df
adding recaptcha and email validation
cahillsf Feb 21, 2022
0e42418
adding favicon
cahillsf Feb 21, 2022
3c03d3e
Merge branch 'adding_recaptcha' of github.com:cahillsf/personal_site …
cahillsf Feb 21, 2022
e21823b
adding sh script for building/pushing imgs
cahillsf Feb 22, 2022
5c8b44e
adding debounce for window resize event listener
cahillsf Feb 22, 2022
28052e8
adding link to faviconn
cahillsf Feb 22, 2022
0766880
adding debounce dep
cahillsf Feb 22, 2022
a82d3e0
removing unused dependency
cahillsf Feb 23, 2022
c9210cb
Merge branch 'staging' of github.com:cahillsf/personal_site into staging
cahillsf Feb 23, 2022
431af5a
adding docker updates
cahillsf Mar 1, 2022
9ad3b64
update flask to read from config
cahillsf Mar 1, 2022
981a7c0
add config.py to container deploy
cahillsf Mar 1, 2022
296c337
add dev containerized build for vue
cahillsf Mar 1, 2022
9d0dc2b
update host for dev build to 0.0.0.0
cahillsf Mar 1, 2022
027bef8
update vales for dd-helm to pull latest agent
cahillsf Mar 1, 2022
1aaf9bf
adding default nginx config /etc/nginx
cahillsf Mar 1, 2022
d76b184
updateing vuenotes
cahillsf Mar 1, 2022
95067b4
move docker_push
cahillsf Mar 1, 2022
5620163
adding nginx w/apm dockerfile
cahillsf Mar 1, 2022
0d0ae2c
adding trace propogation to nginx
cahillsf Mar 1, 2022
09effc7
update main nginx.conf- /etc/nginx
cahillsf Mar 1, 2022
9d308d9
adding apm specific docker entrypoint
cahillsf Mar 1, 2022
ba05aef
adding shell script to generate the ddtrace config
cahillsf Mar 1, 2022
7e45801
update values to include commented config
cahillsf Mar 1, 2022
c218e5b
adding envvars to flask deploy + logs source
cahillsf Mar 1, 2022
65a80cd
adding ust + apm to vue deploy
cahillsf Mar 1, 2022
abc7705
adding source annotations to mongo deploy
cahillsf Mar 1, 2022
f817544
removing unnecessary NodePort type from svcs
cahillsf Mar 1, 2022
39e4026
adding more notes
cahillsf Mar 21, 2022
b211fda
adding headless option to flask config
cahillsf Mar 21, 2022
2cc296b
adding hl ss and svc
cahillsf Mar 21, 2022
989ed73
updating to prevent conflict
cahillsf Apr 3, 2022
f5fa149
adding tls encryption
cahillsf Apr 3, 2022
738f9c7
adding host to rule
cahillsf Apr 3, 2022
f11a6e6
udating targetPort for https to nlb to 80
cahillsf Apr 3, 2022
a063935
updating app protocol to http
cahillsf Apr 3, 2022
9229443
updating ingress service to use ssl
cahillsf Apr 3, 2022
894bb2e
adding ssl redirect annotations
cahillsf Apr 3, 2022
9c29ba6
removing ssl redirect at ingress level
cahillsf Apr 3, 2022
a1510a4
removing tls at ingress resource
cahillsf Apr 3, 2022
768c76f
removing tls updates
cahillsf Apr 3, 2022
86c71f1
adding default ssl cert to controller deployment
cahillsf Apr 3, 2022
4c338df
adding tls options back to ingress
cahillsf Apr 3, 2022
5c75d72
adding ingressclassname
cahillsf Apr 3, 2022
e9489b5
https://github.com/kubernetes/ingress-nginx/issues/2724#issuecomment-…
cahillsf Apr 3, 2022
7434e3c
small updates
cahillsf Apr 3, 2022
d88c347
removing unnecessary tls at Ingress
cahillsf Apr 3, 2022
1958ffe
cleaning up ingress
cahillsf Apr 3, 2022
d838aa3
removing default ssl opt
cahillsf Apr 3, 2022
493a22d
cleaning up nginx-elb
cahillsf Apr 3, 2022
181ead0
Merge branch 'staging' into adding_k8s_config
cahillsf Apr 3, 2022
01faa39
Merge pull request #5 from cahillsf/adding_k8s_config
cahillsf Apr 3, 2022
9018c9e
reconciling merge
cahillsf Apr 3, 2022
4b34e3f
updating notes
cahillsf Apr 15, 2022
d0be844
updating mongo deploy to always pull image
cahillsf Apr 15, 2022
cce04bb
statefulset image config for mongo
cahillsf Apr 15, 2022
4b4fe78
adding updates to ingress for aws deploy on dev
cahillsf Apr 15, 2022
83d4fe2
removing duplicate init files
cahillsf Apr 17, 2022
1e7cc23
adding notes
cahillsf Apr 17, 2022
a8781f5
adding multiConnect config to flask config file
cahillsf Apr 17, 2022
2b7dff7
adding working statefulset image
cahillsf Apr 17, 2022
b82a8be
adding authorization to mongo statefulset
cahillsf Apr 17, 2022
53ea5da
adding updated mongo init file and script for RS
cahillsf Apr 17, 2022
d921aaa
adding dd annotations to mongodb
cahillsf Apr 17, 2022
cf39ab3
improve css styling
cahillsf Aug 2, 2022
50e3386
improve hamburger animation
cahillsf Aug 2, 2022
06bb12c
add playfair font as default
cahillsf Aug 3, 2022
5cb0b13
update year in bottombar
cahillsf Aug 3, 2022
71b914d
update .ignore to add DS_STORE
cahillsf Aug 3, 2022
8416920
update values for kubeadm
cahillsf Aug 5, 2022
ebe34b8
add ingress controller tracing
cahillsf Aug 8, 2022
6e66e87
update service name of ingress
cahillsf Aug 8, 2022
ce834ed
adding clusterconf
cahillsf Aug 9, 2022
ac0789f
update bind addr for contollermgr and scheduler
cahillsf Aug 9, 2022
2708eba
update ing contr servicename for tracing
cahillsf Aug 9, 2022
f88e59b
add pv for mongo ss
cahillsf Aug 10, 2022
7023baf
updating mongo init for envvar ref
cahillsf Aug 10, 2022
eb1b9fd
udpating notes
cahillsf Aug 18, 2022
3c8b0c4
update log format for trace id injection
cahillsf Aug 18, 2022
c385e26
update rum init config in vue app
cahillsf Aug 18, 2022
6dde650
add testing values.yaml for helm deployment
cahillsf Aug 18, 2022
3414989
update img of vue deploy to latest
cahillsf Aug 18, 2022
c79edf4
delete unused conf file
cahillsf Aug 18, 2022
86df03d
fix merge conflict
cahillsf Aug 18, 2022
81e0c2e
update flask image to latest
cahillsf Aug 18, 2022
e0dcaac
add env to nginx ingress tracing config
cahillsf Sep 3, 2022
76fde77
add modsecurity configmap
cahillsf Sep 3, 2022
acba9ee
update nginx ingr controller to enable modsecurity
cahillsf Sep 3, 2022
ce08ce3
add to-do in notes
cahillsf Sep 3, 2022
d81b9f8
fixing vuenotes
cahillsf Sep 3, 2022
5ac95c1
upgrading datadog-ci
cahillsf Sep 3, 2022
4c56c6f
update ns for modsec configmap
cahillsf Sep 4, 2022
e1a8a0c
add dd-env to nginx-elb
cahillsf Sep 5, 2022
6b756dd
enable logging for debugging modsec
cahillsf Mar 1, 2023
16a04cc
update flask
cahillsf Mar 3, 2023
c6c8c93
enable rule processing
cahillsf Mar 6, 2023
95ea21c
update notes
cahillsf Mar 6, 2023
9b8d2d1
clean up logging in flask
cahillsf Mar 6, 2023
c8ca0ce
update dockerpush to accept alt dockerfile path
cahillsf Mar 31, 2023
b4881c0
update aboutme description
cahillsf Mar 31, 2023
6023ab7
fix docker push
cahillsf Mar 31, 2023
87e6766
update ps-vue version
cahillsf Mar 31, 2023
b9685a7
Merge pull request #6 from cahillsf/enable-modsecurity
cahillsf Mar 31, 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
12 changes: 10 additions & 2 deletions k8s-config/ingress/nginx-elb.yaml
Original file line number Diff line number Diff line change
@@ -38,6 +38,9 @@ metadata:
namespace: ingress-nginx
data:
allow-snippet-annotations: 'true'
ssl-redirect: 'false'
server-snippet: |
listen 8000;
---
# Source: ingress-nginx/templates/clusterrole.yaml
apiVersion: rbac.authorization.k8s.io/v1
@@ -266,6 +269,9 @@ metadata:
service.beta.kubernetes.io/aws-load-balancer-backend-protocol: tcp
service.beta.kubernetes.io/aws-load-balancer-cross-zone-load-balancing-enabled: 'true'
service.beta.kubernetes.io/aws-load-balancer-type: nlb
service.beta.kubernetes.io/aws-load-balancer-ssl-ports: '443'
service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:187286695231:certificate/ddd727c2-f2c3-4e44-b0c3-fe0651ea5f7b
service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: '*'
labels:
helm.sh/chart: ingress-nginx-4.0.15
app.kubernetes.io/name: ingress-nginx
@@ -290,8 +296,7 @@ spec:
- name: https
port: 443
protocol: TCP
targetPort: https
appProtocol: https
targetPort: special
selector:
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
@@ -390,6 +395,9 @@ spec:
- name: https
containerPort: 443
protocol: TCP
- name: special
containerPort: 8000
protocol: TCP
- name: webhook
containerPort: 8443
protocol: TCP
8 changes: 6 additions & 2 deletions k8s-config/ingress/vue-service-ingress.yaml
Original file line number Diff line number Diff line change
@@ -6,10 +6,14 @@ metadata:
annotations:
kubernetes.io/ingress.class: nginx
nginx.ingress.kubernetes.io/rewrite-target: /

nginx.ingress.kubernetes.io/server-snippet: |
if ( $server_port = 80 ) {
return 308 https://$host$request_uri;
}
spec:
rules:
- http:
- host: dev.stephencahill.net
http:
paths:
- path: /
pathType: Prefix
28 changes: 27 additions & 1 deletion vuenotes.md
Original file line number Diff line number Diff line change
@@ -27,6 +27,7 @@
* ~writing kube yaml deployment~
* ~update how services are accessed within k8s cluster - is it necessary to expose as `NodePort`?~ NO
* ~working AWS K8s config~
* https encryption - (in progress)
* assess aws networking/sgs/etc
* unified service tagging
* go live
@@ -165,4 +166,29 @@ look for this in style sheet
curl -d "secret=<SECRET>&response=<RESPONSE_TOKEN>" -X POST https://www.google.com/recaptcha/api/siteverify


docker compose -f docker-compose-fromfile.yml up --build

docker compose -f docker-compose-fromfile.yml up --build


#mongo
rs.initiate({ _id: "MainRepSet", version: 1,
members: [
{ _id: 0, host: "mongod-0.mongodb-service.default.svc.cluster.local:27017" } ]});

rs.status();

mongo localhost:27017/test populate_db.sh

mongoimport --type csv -d sitecontent -c cards --headerline /docker-entrypoint-initdb.d/homepage.csv

mongoimport --type csv -d sitecontent -c users --headerline /docker-entrypoint-initdb.d/users.csv


### MongoDB Operato

kubectl create namespace mongodb

kubectl create secret generic my-mongodb-user-password -n mongodb --from-literal="password=TXs3ZsuIqT-pQFvwxOec"

docker compose -f docker-compose-fromfile.yml up --build