Merge branch 'new-kube-script' into 'master'
fix: Switch to single manifest with .yaml extension See merge request mythic-insight/legendary!30
This commit is contained in:
		
						commit
						3edac79fb0
					
				
					 8 changed files with 3 additions and 61 deletions
				
			
		| 
						 | 
					@ -28,6 +28,8 @@ build_image_for_commit:
 | 
				
			||||||
  stage: test
 | 
					  stage: test
 | 
				
			||||||
  needs: []
 | 
					  needs: []
 | 
				
			||||||
  image: "docker:19.03.12"
 | 
					  image: "docker:19.03.12"
 | 
				
			||||||
 | 
					  only:
 | 
				
			||||||
 | 
					    - master
 | 
				
			||||||
  services:
 | 
					  services:
 | 
				
			||||||
    - name: docker:19.03.12-dind
 | 
					    - name: docker:19.03.12-dind
 | 
				
			||||||
  script:
 | 
					  script:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,18 +0,0 @@
 | 
				
			||||||
apiVersion: networking.k8s.io/v1
 | 
					 | 
				
			||||||
kind: Ingress
 | 
					 | 
				
			||||||
metadata:
 | 
					 | 
				
			||||||
  name: legendary
 | 
					 | 
				
			||||||
  annotations:
 | 
					 | 
				
			||||||
    kubernetes.io/ingress.class: nginx
 | 
					 | 
				
			||||||
spec:
 | 
					 | 
				
			||||||
  rules:
 | 
					 | 
				
			||||||
  - host: legendary-demo.mythicinsight.com
 | 
					 | 
				
			||||||
    http:
 | 
					 | 
				
			||||||
      paths:
 | 
					 | 
				
			||||||
      - backend:
 | 
					 | 
				
			||||||
          service:
 | 
					 | 
				
			||||||
            name: legendary
 | 
					 | 
				
			||||||
            port:
 | 
					 | 
				
			||||||
              number: 80
 | 
					 | 
				
			||||||
        path: /
 | 
					 | 
				
			||||||
        pathType: Prefix
 | 
					 | 
				
			||||||
| 
						 | 
					@ -1,11 +0,0 @@
 | 
				
			||||||
apiVersion: v1
 | 
					 | 
				
			||||||
kind: Service
 | 
					 | 
				
			||||||
metadata:
 | 
					 | 
				
			||||||
  name: legendary
 | 
					 | 
				
			||||||
spec:
 | 
					 | 
				
			||||||
  selector:
 | 
					 | 
				
			||||||
    app: legendary
 | 
					 | 
				
			||||||
  ports:
 | 
					 | 
				
			||||||
    - protocol: TCP
 | 
					 | 
				
			||||||
      port: 80
 | 
					 | 
				
			||||||
      targetPort: 4000
 | 
					 | 
				
			||||||
| 
						 | 
					@ -1,18 +0,0 @@
 | 
				
			||||||
apiVersion: networking.k8s.io/v1
 | 
					 | 
				
			||||||
kind: Ingress
 | 
					 | 
				
			||||||
metadata:
 | 
					 | 
				
			||||||
  name: legendary
 | 
					 | 
				
			||||||
  annotations:
 | 
					 | 
				
			||||||
    kubernetes.io/ingress.class: nginx
 | 
					 | 
				
			||||||
spec:
 | 
					 | 
				
			||||||
  rules:
 | 
					 | 
				
			||||||
  - host: legendary-demo.mythicinsight.com
 | 
					 | 
				
			||||||
    http:
 | 
					 | 
				
			||||||
      paths:
 | 
					 | 
				
			||||||
      - backend:
 | 
					 | 
				
			||||||
          service:
 | 
					 | 
				
			||||||
            name: legendary
 | 
					 | 
				
			||||||
            port:
 | 
					 | 
				
			||||||
              number: 80
 | 
					 | 
				
			||||||
        path: /
 | 
					 | 
				
			||||||
        pathType: Prefix
 | 
					 | 
				
			||||||
| 
						 | 
					@ -1,11 +0,0 @@
 | 
				
			||||||
apiVersion: v1
 | 
					 | 
				
			||||||
kind: Service
 | 
					 | 
				
			||||||
metadata:
 | 
					 | 
				
			||||||
  name: legendary
 | 
					 | 
				
			||||||
spec:
 | 
					 | 
				
			||||||
  selector:
 | 
					 | 
				
			||||||
    app: legendary
 | 
					 | 
				
			||||||
  ports:
 | 
					 | 
				
			||||||
    - protocol: TCP
 | 
					 | 
				
			||||||
      port: 80
 | 
					 | 
				
			||||||
      targetPort: 4000
 | 
					 | 
				
			||||||
| 
						 | 
					@ -11,6 +11,4 @@ var packageConfig = JSON.parse(packageText);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const {version} = packageConfig;
 | 
					const {version} = packageConfig;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
fs.writeFileSync("infrastructure/deployment.yaml", dots.deployment({version: version}));
 | 
					fs.writeFileSync("infrastructure/kube.yaml", manifestText);
 | 
				
			||||||
fs.writeFileSync("infrastructure/service.yaml", dots.service({version: version}));
 | 
					 | 
				
			||||||
fs.writeFileSync("infrastructure/ingress.yaml", dots.ingress({version: version}));
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue