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

Edit Deployment Files by Kubernetes v1.16.13 and Fluidcr Registry #3848

Merged
merged 5 commits into from
Oct 9, 2020
Merged

Edit Deployment Files by Kubernetes v1.16.13 and Fluidcr Registry #3848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b305cfc
Edit the yaml for the k8s deployment
tianzhu007 Oct 6, 2020
03a3657
Edit the deployment file for historian
tianzhu007 Oct 7, 2020
78508dd
update the secrets' name
tianzhu007 Oct 7, 2020
0dde48c
Update cobalt-deployment.yaml
tianzhu007 Oct 7, 2020
97dbaef
Change to lower case
tianzhu007 Oct 7, 2020
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
2 changes: 1 addition & 1 deletion server/charts/historian/templates/cobalt-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
- name: data
mountPath: /var/lib/cobalt/
imagePullSecrets:
- name: regsecret
- name: legacyregsecret
volumes:
- name: data
persistentVolumeClaim:
Expand Down
6 changes: 3 additions & 3 deletions server/charts/historian/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ imagePullPolicy: IfNotPresent

historian:
name: historian
image: prague.azurecr.io/historian:4049
image: fluidcr.azurecr.io/build/fluidframework/routerlicious/historian:latest
Comment on lines 6 to +7
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aren't you overriding these values in your deployment?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup. I have overridden these values when doing the deployment and update these changes here. :)

redis:
url: redis_url
port: 6379
Expand All @@ -16,7 +16,7 @@ historian:

gitrest:
name: gitrest
image: prague.azurecr.io/gitrest:4048
image: fluidcr.azurecr.io/build/fluidframework/routerlicious/gitrest:latest
mode: latest
persistence:
storageClass: managed-premium
Expand All @@ -25,7 +25,7 @@ gitrest:

gitssh:
name: gitssh
image: prague.azurecr.io/gitssh:654
image: fluidcr.azurecr.io/build/fluidframework/routerlicious/gitssh:latest

cobalt:
name: cobalt
Expand Down
5 changes: 4 additions & 1 deletion server/charts/kafka/templates/kafka-stateful-set.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: apps/v1beta1
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: {{ template "kafka.fullname" . }}
Expand All @@ -11,6 +11,9 @@ metadata:
spec:
serviceName: kafka
replicas: 1
selector:
matchLabels:
app: {{ template "kafka.fullname" . }}
template:
metadata:
labels:
Expand Down
5 changes: 4 additions & 1 deletion server/charts/kafka/templates/zookeeper-stateful-set.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: apps/v1beta1
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: {{ template "zookeeper.fullname" . }}
Expand All @@ -11,6 +11,9 @@ metadata:
spec:
serviceName: zookeeper
replicas: 1
selector:
matchLabels:
app: {{ template "kafka.fullname" . }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

zookeeper.fullname

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this value be the same as template/metadata/labels/app's value, that is,
{{ template: "kafka.fullname" .}} ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah you are correct. I forgot that we use the same name for Kafka and zookeeper. Makes sense. I will merge it now. Thanks for the PR.

template:
metadata:
labels:
Expand Down
5 changes: 4 additions & 1 deletion server/routerlicious/kubernetes/nginx/nginx-ingress-controller-eastus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,16 @@ spec:
selector:
k8s-app: nginx-ingress-prod-lb
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: nginx-ingress-prod-controller
spec:
replicas: 2
revisionHistoryLimit: 2
selector:
matchLabels:
k8s-app: nginx-ingress-prod-lb
template:
metadata:
labels:
Expand Down