Skip to content

Commit

Permalink
Merge pull request #1 from devtron-labs/quay-migration
Browse files Browse the repository at this point in the history
image migration
  • Loading branch information
nishant-d authored Nov 4, 2020
2 parents 10298d7 + 0dd5439 commit 03dea68
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 47 deletions.
2 changes: 1 addition & 1 deletion install/install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ spec:
spec:
containers:
-
image: '686244538589.dkr.ecr.us-east-2.amazonaws.com/devtron:3ff97234-130-2178'
image: quay.io/devtron/inception:3ff97234-130-2201
imagePullPolicy: IfNotPresent
name: inception
ports:
Expand Down
4 changes: 2 additions & 2 deletions yamls/dashboard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ spec:
- name: envoy-config-volume
mountPath: /etc/envoy-config/
- name: dashboard
image: "686244538589.dkr.ecr.us-east-2.amazonaws.com/release/dashboard:f159ee76-6-1949"
image: "quay.io/devtron/dashboard:5896c5a5-6-2195"
imagePullPolicy: IfNotPresent
ports:
- name: app
Expand Down Expand Up @@ -317,4 +317,4 @@ spec:
app: dashboard
namespaceSelector:
matchNames:
- devtroncd
- devtroncd:w
4 changes: 2 additions & 2 deletions yamls/devtron.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ data:
CD_NODE_TAINTS_VALUE: ""
CD_ARTIFACT_LOCATION_FORMAT: "%d/%d.zip"
DEFAULT_CD_NAMESPACE: "devtron-cd"
DEFAULT_CI_IMAGE: "686244538589.dkr.ecr.us-east-2.amazonaws.com/release/ci-runner:deb514a7-91-1768"
DEFAULT_CI_IMAGE: "quay.io/devtron/ci-runner:eb46339a-119-2190"
DEFAULT_CD_TIMEOUT: "3600"
WF_CONTROLLER_INSTANCE_ID: "devtron-runner"
CI_LOGS_KEY_PREFIX: "ci-artifacts"
Expand Down Expand Up @@ -156,7 +156,7 @@ spec:
serviceAccountName: devtron
containers:
- name: devtron
image: "686244538589.dkr.ecr.us-east-2.amazonaws.com/devtron:3f12bbc5-127-2180"
image: "quay.io/devtron/devtron:f7932f2b-127-2188"
imagePullPolicy: IfNotPresent
ports:
- name: devtron
Expand Down
4 changes: 2 additions & 2 deletions yamls/gitsensor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
terminationGracePeriodSeconds: 10
containers:
- name: git-sensor
image: 686244538589.dkr.ecr.us-east-2.amazonaws.com/release/git-sensor:81173eda-17-223
image: quay.io/devtron/git-sensor:8badb037-121-2189
ports:
- containerPort: 8080
name: sensor
Expand Down Expand Up @@ -83,4 +83,4 @@ spec:
path: /metrics
selector:
matchLabels:
app: git-sensor
app: git-sensor
4 changes: 2 additions & 2 deletions yamls/guard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ spec:
restartPolicy: Always
containers:
- name: guard
image: "686244538589.dkr.ecr.us-east-2.amazonaws.com/release/guard:4bea84da-113-1767"
image: quay.io/devtron/guard:62058d7c-122-2192
imagePullPolicy: IfNotPresent
ports:
- name: app
Expand Down Expand Up @@ -145,4 +145,4 @@ webhooks:
apiGroups: [""]
apiVersions: ["v1"]
resources: ["pods"]
failurePolicy: Ignore
failurePolicy: Ignore
2 changes: 1 addition & 1 deletion yamls/image-scanner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ spec:
restartPolicy: Always
containers:
- name: image-scanner
image: "686244538589.dkr.ecr.us-east-2.amazonaws.com/release/image-scanner:aa3386b4-112-2002"
image: quay.io/devtron/imge-scanner:0c6ce5c2-123-2193
imagePullPolicy: IfNotPresent
ports:
- name: app
Expand Down
2 changes: 1 addition & 1 deletion yamls/kubewatch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ spec:
spec:
containers:
- name: kubewatch
image: 686244538589.dkr.ecr.us-east-2.amazonaws.com/release/kubewatch:a85ea237-21-87
image: quay.io/devtron/kubewatch:8aef551d-128-2196
env:
- name: devtroncd_NAMESPACE
value: "devtron-ci"
Expand Down
2 changes: 1 addition & 1 deletion yamls/lens.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ spec:
- name: envoy-config-volume
mountPath: /etc/envoy-config/
- name: lens
image: "686244538589.dkr.ecr.us-east-2.amazonaws.com/release/lens:7a5365f7-19-257"
image: quay.io/devtron/lens:772fcb2a-125-2194
imagePullPolicy: IfNotPresent
ports:
- name: app
Expand Down
12 changes: 6 additions & 6 deletions yamls/migrator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
spec:
containers:
- name: postgresql-migrate-devtron
image: 686244538589.dkr.ecr.us-east-2.amazonaws.com/release/migrator:0.0.1-rc23
image: quay.io/devtron/migrator:4a7dfc0e-133-2200
env:
- name: GIT_BRANCH
value: main
Expand Down Expand Up @@ -60,7 +60,7 @@ spec:
spec:
containers:
- name: postgresql-migrate-casbin
image: 686244538589.dkr.ecr.us-east-2.amazonaws.com/release/migrator:0.0.1-rc23
image: quay.io/devtron/migrator:4a7dfc0e-133-2200
env:
- name: SCRIPT_LOCATION
value: scripts/casbin/
Expand Down Expand Up @@ -100,7 +100,7 @@ spec:
spec:
containers:
- name: postgresql-migrate-gitsensor
image: 686244538589.dkr.ecr.us-east-2.amazonaws.com/release/migrator:0.0.1-rc23
image: quay.io/devtron/migrator:4a7dfc0e-133-2200
env:
- name: SCRIPT_LOCATION
value: scripts/sql/
Expand Down Expand Up @@ -140,7 +140,7 @@ spec:
spec:
containers:
- name: postgresql-migrate-lens
image: 686244538589.dkr.ecr.us-east-2.amazonaws.com/release/migrator:0.0.1-rc23
image: quay.io/devtron/migrator:4a7dfc0e-133-2200
env:
- name: SCRIPT_LOCATION
value: scripts/sql/
Expand Down Expand Up @@ -184,7 +184,7 @@ spec:
containers:
- name: chart-sync
image: perl
image: 686244538589.dkr.ecr.us-east-2.amazonaws.com/chart-sync:63ee2b
image: quay.io/devtron/chart-sync:83282a4d-132-2199
env:
- name: PG_ADDR
value: postgresql-postgresql.devtroncd
Expand All @@ -206,7 +206,7 @@ spec:
containers:
- name: chart-sync
image: perl
image: 686244538589.dkr.ecr.us-east-2.amazonaws.com/chart-sync:63ee2b
image: quay.io/devtron/chart-sync:83282a4d-132-2199
env:
- name: PG_ADDR
value: postgresql-postgresql.devtroncd
Expand Down
31 changes: 2 additions & 29 deletions yamls/notifier.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,33 +40,6 @@ spec:
selector:
app: notifier
---
# Source: notifier/templates/ingress.yaml
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: notifier-ingress
namespace:
labels:
app: notifier
chart: notifier-3.7.1
release: devtron
annotations:
nginx.ingress.kubernetes.io/cors-allow-headers: DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization,token,
content-type, Access-Control-Allow-Origin,Access-Control-Allow-Credentials
nginx.ingress.kubernetes.io/enable-cors: "true"
nginx.ingress.kubernetes.io/rewrite-target: /
nginx.ingress.kubernetes.io/ssl-redirect: "false"

spec:
rules:
- host:
http:
paths:
- path: /notifier(/|$)(.*)
backend:
serviceName: notifier-service
servicePort: 80
---
# Source: notifier/templates/deployment.yaml
apiVersion: apps/v1
kind: Deployment
Expand All @@ -93,7 +66,7 @@ spec:
restartPolicy: Always
containers:
- name: notifier
image: "686244538589.dkr.ecr.us-east-2.amazonaws.com/release/notifier:75c88932-74-1077"
image: quay.io/devtron/notifier:3b7b5d33-74-2197
imagePullPolicy: IfNotPresent
ports:
- name: app
Expand Down Expand Up @@ -122,4 +95,4 @@ spec:
memory: 100Mi
volumeMounts: []
volumes: []
revisionHistoryLimit: 3
revisionHistoryLimit: 3

0 comments on commit 03dea68

Please sign in to comment.