Compare commits
	
		
			8 Commits
		
	
	
		
			2b8b8390bc
			...
			904f16bfc0
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 904f16bfc0 | |||
| 4f0a0289fc | |||
| 718df09e88 | |||
| 97f4a5e175 | |||
| bb27ca2c86 | |||
| 8927f278f3 | |||
| 7bbb9af15b | |||
| 09ba656ae7 | 
| @@ -21,12 +21,14 @@ spec: | |||||||
|         ports: |         ports: | ||||||
|         - containerPort: 8000 |         - containerPort: 8000 | ||||||
|         env: |         env: | ||||||
|  |         - name: MEMCACHED_HOST_PATH | ||||||
|  |           value: "memcached:11211" | ||||||
|         - name: NUM_WORKERS |         - name: NUM_WORKERS | ||||||
|           value: "3" |           value: "3" | ||||||
|         - name: OSM_CACHE_DIR |         - name: OSM_CACHE_DIR | ||||||
|           value: "/osm-cache" |           value: "/osm-cache" | ||||||
|         - name: MEMCACHED_HOST_PATH |         - name: LOKI_URL | ||||||
|           value: "memcached:11211" |           value: "http://loki.monitoring.svc:3100/loki/api/v1/push" | ||||||
|         volumeMounts: |         volumeMounts: | ||||||
|         - name: osm-cache |         - name: osm-cache | ||||||
|           mountPath: /osm-cache |           mountPath: /osm-cache | ||||||
|   | |||||||
| @@ -6,6 +6,10 @@ resources: | |||||||
|  |  | ||||||
| namespace: anyway-backend | namespace: anyway-backend | ||||||
| nameSuffix: -prod | nameSuffix: -prod | ||||||
|  | labels: | ||||||
|  |   - includeSelectors: true | ||||||
|  |     pairs: | ||||||
|  |       env: prod | ||||||
|  |  | ||||||
| images: | images: | ||||||
|   - name: backend-image |   - name: backend-image | ||||||
| @@ -17,3 +21,7 @@ patches: | |||||||
|     target: |     target: | ||||||
|       kind: IngressRoute |       kind: IngressRoute | ||||||
|       name: anyway-ingress |       name: anyway-ingress | ||||||
|  |   - path: patch-deployment-memcached-address.yaml | ||||||
|  |     target: | ||||||
|  |       kind: Deployment | ||||||
|  |       name: anyway-backend | ||||||
|   | |||||||
							
								
								
									
										3
									
								
								overlays/prod/patch-deployment-memcached-address.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								overlays/prod/patch-deployment-memcached-address.yaml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,3 @@ | |||||||
|  | - op: replace | ||||||
|  |   path: /spec/template/spec/containers/0/env/0/value | ||||||
|  |   value: "memcached-prod:11211" | ||||||
| @@ -1,3 +1,6 @@ | |||||||
| - op: replace #action  | - op: replace | ||||||
|   path: /spec/routes/0/match |   path: /spec/routes/0/match | ||||||
|   value: Host(`anyway.anydev.info`) || Host(`anyway.kluster.moll.re`)  |   value: Host(`anyway.anydev.info`) || Host(`anyway.kluster.moll.re`)  | ||||||
|  | - op: replace | ||||||
|  |   path: /spec/routes/0/services/0/name | ||||||
|  |   value: anyway-backend-prod | ||||||
| @@ -6,6 +6,12 @@ resources: | |||||||
|  |  | ||||||
| namespace: anyway-backend | namespace: anyway-backend | ||||||
| nameSuffix: -stg | nameSuffix: -stg | ||||||
|  | labels: | ||||||
|  |   - includeSelectors: true | ||||||
|  |     pairs: | ||||||
|  |       env: stg | ||||||
|  |  | ||||||
|  |  | ||||||
| images: | images: | ||||||
|   - name: backend-image |   - name: backend-image | ||||||
|     newName: git.kluster.moll.re/anydev/anyway-backend |     newName: git.kluster.moll.re/anydev/anyway-backend | ||||||
| @@ -16,3 +22,12 @@ patches: | |||||||
|     target: |     target: | ||||||
|       kind: IngressRoute |       kind: IngressRoute | ||||||
|       name: anyway-ingress |       name: anyway-ingress | ||||||
|  |   - path: patch-deployment-memcached-address.yaml | ||||||
|  |     target: | ||||||
|  |       kind: Deployment | ||||||
|  |       name: anyway-backend | ||||||
|  |   - path: patch-deployment.yaml | ||||||
|  |     target: | ||||||
|  |       kind: Deployment | ||||||
|  |       name: anyway-backend | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										3
									
								
								overlays/stg/patch-deployment-memcached-address.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								overlays/stg/patch-deployment-memcached-address.yaml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,3 @@ | |||||||
|  | - op: replace | ||||||
|  |   path: /spec/template/spec/containers/0/env/0/value | ||||||
|  |   value: "memcached-stg:11211" | ||||||
							
								
								
									
										5
									
								
								overlays/stg/patch-deployment.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								overlays/stg/patch-deployment.yaml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,5 @@ | |||||||
|  | - op: add | ||||||
|  |   path: /spec/template/spec/containers/0/env/- | ||||||
|  |   value: | ||||||
|  |     name: DEBUG | ||||||
|  |     value: "true" | ||||||
| @@ -1,3 +1,6 @@ | |||||||
| - op: replace #action  | - op: replace #action  | ||||||
|   path: /spec/routes/0/match |   path: /spec/routes/0/match | ||||||
|   value: Host(`anyway-stg.anydev.info`) || Host(`anyway-stg.kluster.moll.re`)  |   value: Host(`anyway-stg.anydev.info`) || Host(`anyway-stg.kluster.moll.re`)  | ||||||
|  | - op: replace | ||||||
|  |   path: /spec/routes/0/services/0/name | ||||||
|  |   value: anyway-backend-stg | ||||||
							
								
								
									
										10
									
								
								rbac.yaml
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								rbac.yaml
									
									
									
									
									
								
							| @@ -4,12 +4,16 @@ metadata: | |||||||
|   namespace: anyway-backend |   namespace: anyway-backend | ||||||
|   name: deployment-role |   name: deployment-role | ||||||
| rules: | rules: | ||||||
| - apiGroups: [""] # "" indicates the core API group | - apiGroups: | ||||||
|  |     - "" | ||||||
|  |     - "apps" | ||||||
|  |     - "traefik.io" | ||||||
|   resources: |   resources: | ||||||
|     - pods |     - pods | ||||||
|     - services |     - services | ||||||
|     - deployments |     - deployments | ||||||
|     - ingresses |     - ingressroutes | ||||||
|  |     - persistentvolumeclaims | ||||||
|   verbs: |   verbs: | ||||||
|     - create |     - create | ||||||
|     - delete |     - delete | ||||||
| @@ -55,5 +59,3 @@ metadata: | |||||||
|   annotations: |   annotations: | ||||||
|     kubernetes.io/service-account.name: deployment-sa |     kubernetes.io/service-account.name: deployment-sa | ||||||
| type: kubernetes.io/service-account-token | type: kubernetes.io/service-account-token | ||||||
|  |  | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user