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

Ma branche #6

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
f8d3bd6
Update web-service.yaml
aminamegzari12 Jun 7, 2024
320ba2c
Update cart-deployment.yaml
aminamegzari12 Jun 7, 2024
8790bb9
Delete EKS/helm/templates/cart-deployment.yaml
aminamegzari12 Jun 7, 2024
d615f93
Delete EKS/helm/templates/cart-service.yaml
aminamegzari12 Jun 7, 2024
e4bc7ab
Add files via upload
aminamegzari12 Jun 7, 2024
c2bf0cc
Update web-deployment.yaml
aminamegzari12 Jun 7, 2024
ac41292
Update cart-deployment.yaml
aminamegzari12 Jun 7, 2024
e6a5169
Delete AKS/helm/templates/cart-deployment.yaml
aminamegzari12 Jun 7, 2024
2255f8c
Delete AKS/helm/templates/cart-service.yaml
aminamegzari12 Jun 7, 2024
71762ee
Delete AKS/helm/templates/catalogue-deployment.yaml
aminamegzari12 Jun 7, 2024
47567a2
Delete AKS/helm/templates/catalogue-service.yaml
aminamegzari12 Jun 7, 2024
8f7d4f3
Delete AKS/helm/templates/clusterrole.yaml
aminamegzari12 Jun 7, 2024
99fee64
Delete AKS/helm/templates/clusterrolebinding.yaml
aminamegzari12 Jun 7, 2024
9de5dcd
add files
aminamegzari12 Jun 7, 2024
e4632c9
Delete AKS/helm/templates/dispatch-deployment.yaml
aminamegzari12 Jun 7, 2024
de4961c
Delete AKS/helm/templates/dispatch-service.yaml
aminamegzari12 Jun 7, 2024
6111114
Delete AKS/helm/templates/mongodb-deployment.yaml
aminamegzari12 Jun 7, 2024
ffa2f47
Delete AKS/helm/templates/mongodb-service.yaml
aminamegzari12 Jun 7, 2024
e824894
Delete AKS/helm/templates/mysql-deployment.yaml
aminamegzari12 Jun 7, 2024
46832b5
Delete AKS/helm/templates/mysql-service.yaml
aminamegzari12 Jun 7, 2024
22ac2e7
Delete AKS/helm/templates/payment-deployment.yaml
aminamegzari12 Jun 7, 2024
edfa3d3
Delete AKS/helm/templates/payment-service.yaml
aminamegzari12 Jun 7, 2024
d7ef578
Delete AKS/helm/templates/podsecuritypolicy.yaml
aminamegzari12 Jun 7, 2024
65909e9
add files
aminamegzari12 Jun 7, 2024
d3b533a
Delete AKS/helm/templates/ratings-deployment.yaml
aminamegzari12 Jun 7, 2024
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
Original file line number Diff line number Diff line change
@@ -1,50 +1,50 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: cart
labels:
service: cart
spec:
replicas: 1
selector:
matchLabels:
service: cart
template:
metadata:
labels:
service: cart
spec:
{{ if .Values.psp.enabled }}
serviceAccountName: robot-shop
{{ end }}
containers:
- name: cart
image: {{ .Values.image.repo }}/rs-cart:{{ .Values.image.version }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
# agent networking access
env:
- name: INSTANA_AGENT_HOST
valueFrom:
fieldRef:
fieldPath: status.hostIP
ports:
- containerPort: 8080
resources:
limits:
cpu: 200m
memory: 100Mi
requests:
cpu: 100m
memory: 50Mi
{{- with .Values.cart.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.cart.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.cart.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
apiVersion: apps/v1
kind: Deployment
metadata:
name: cart
labels:
service: cart
spec:
replicas: 1
selector:
matchLabels:
service: cart
template:
metadata:
labels:
service: cart
spec:
{{ if .Values.psp.enabled }}
serviceAccountName: robot-shop
{{ end }}
containers:
- name: cart
image: {{ .Values.image.repo }}/rs-cart:{{ .Values.image.version }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
# agent networking access
env:
- name: INSTANA_AGENT_HOST
valueFrom:
fieldRef:
fieldPath: status.hostIP
ports:
- containerPort: 8080
resources:
limits:
cpu: 200m
memory: 100Mi
requests:
cpu: 100m
memory: 50Mi
{{- with .Values.cart.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.cart.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.cart.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
22 changes: 11 additions & 11 deletions AKS/helm/templates/cart-service.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apiVersion: v1
kind: Service
metadata:
name: cart
spec:
ports:
- name: http
port: 8080
targetPort: 8080
selector:
service: cart
apiVersion: v1
kind: Service
metadata:
name: cart
spec:
ports:
- name: http
port: 8080
targetPort: 8080
selector:
service: cart
100 changes: 50 additions & 50 deletions AKS/helm/templates/catalogue-deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,50 +1,50 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: catalogue
labels:
service: catalogue
spec:
replicas: 1
selector:
matchLabels:
service: catalogue
template:
metadata:
labels:
service: catalogue
spec:
{{ if .Values.psp.enabled }}
serviceAccountName: robot-shop
{{ end }}
containers:
- name: catalogue
image: {{ .Values.image.repo }}/rs-catalogue:{{ .Values.image.version }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
- name: INSTANA_AGENT_HOST
valueFrom:
fieldRef:
fieldPath: status.hostIP
ports:
- containerPort: 8080
resources:
limits:
cpu: 200m
memory: 100Mi
requests:
cpu: 100m
memory: 50Mi
restartPolicy: Always
{{- with .Values.catalogue.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.catalogue.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.catalogue.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
apiVersion: apps/v1
kind: Deployment
metadata:
name: catalogue
labels:
service: catalogue
spec:
replicas: 1
selector:
matchLabels:
service: catalogue
template:
metadata:
labels:
service: catalogue
spec:
{{ if .Values.psp.enabled }}
serviceAccountName: robot-shop
{{ end }}
containers:
- name: catalogue
image: {{ .Values.image.repo }}/rs-catalogue:{{ .Values.image.version }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
- name: INSTANA_AGENT_HOST
valueFrom:
fieldRef:
fieldPath: status.hostIP
ports:
- containerPort: 8080
resources:
limits:
cpu: 200m
memory: 100Mi
requests:
cpu: 100m
memory: 50Mi
restartPolicy: Always
{{- with .Values.catalogue.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.catalogue.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.catalogue.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
26 changes: 13 additions & 13 deletions AKS/helm/templates/catalogue-service.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apiVersion: v1
kind: Service
metadata:
labels:
service: catalogue
name: catalogue
spec:
ports:
- name: http
port: 8080
targetPort: 8080
selector:
service: catalogue
apiVersion: v1
kind: Service
metadata:
labels:
service: catalogue
name: catalogue
spec:
ports:
- name: http
port: 8080
targetPort: 8080
selector:
service: catalogue
30 changes: 15 additions & 15 deletions AKS/helm/templates/clusterrole.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{{ if .Values.psp.enabled }}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: robot-shop
rules:
- apiGroups:
- policy
resourceNames:
- robot-shop
resources:
- podsecuritypolicies
verbs:
- use
{{ end }}
{{ if .Values.psp.enabled }}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: robot-shop
rules:
- apiGroups:
- policy
resourceNames:
- robot-shop
resources:
- podsecuritypolicies
verbs:
- use
{{ end }}
28 changes: 14 additions & 14 deletions AKS/helm/templates/clusterrolebinding.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{{ if .Values.psp.enabled }}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: robot-shop
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: robot-shop
subjects:
- kind: ServiceAccount
name: robot-shop
namespace: robot-shop
{{ end }}
{{ if .Values.psp.enabled }}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: robot-shop
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: robot-shop
subjects:
- kind: ServiceAccount
name: robot-shop
namespace: robot-shop
{{ end }}
Loading