fix: Repair merge issues in generate-kube
This commit is contained in:
		
							parent
							
								
									3edac79fb0
								
							
						
					
					
						commit
						2a5e6fcde3
					
				
					 2 changed files with 41 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -1,7 +1,13 @@
 | 
			
		|||
apiVersion: v1
 | 
			
		||||
kind: Namespace
 | 
			
		||||
metadata:
 | 
			
		||||
  name: legendary
 | 
			
		||||
---
 | 
			
		||||
apiVersion: apps/v1
 | 
			
		||||
kind: Deployment
 | 
			
		||||
metadata:
 | 
			
		||||
  name: legendary
 | 
			
		||||
  namespace: legendary
 | 
			
		||||
spec:
 | 
			
		||||
  replicas: 2
 | 
			
		||||
  selector:
 | 
			
		||||
| 
						 | 
				
			
			@ -14,7 +20,7 @@ spec:
 | 
			
		|||
    spec:
 | 
			
		||||
      containers:
 | 
			
		||||
        - name: app
 | 
			
		||||
          image: registry.gitlab.com/mythic-insight/legendary:1.2.1
 | 
			
		||||
          image: registry.gitlab.com/mythic-insight/legendary:1.2.3
 | 
			
		||||
          ports:
 | 
			
		||||
            - containerPort: 4000
 | 
			
		||||
          env:
 | 
			
		||||
| 
						 | 
				
			
			@ -28,3 +34,36 @@ spec:
 | 
			
		|||
                secretKeyRef:
 | 
			
		||||
                  name: legendary
 | 
			
		||||
                  key: secret-key-base
 | 
			
		||||
---
 | 
			
		||||
apiVersion: v1
 | 
			
		||||
kind: Service
 | 
			
		||||
metadata:
 | 
			
		||||
  name: legendary
 | 
			
		||||
  namespace: legendary
 | 
			
		||||
spec:
 | 
			
		||||
  selector:
 | 
			
		||||
    app: legendary
 | 
			
		||||
  ports:
 | 
			
		||||
    - protocol: TCP
 | 
			
		||||
      port: 80
 | 
			
		||||
      targetPort: 4000
 | 
			
		||||
---
 | 
			
		||||
apiVersion: networking.k8s.io/v1
 | 
			
		||||
kind: Ingress
 | 
			
		||||
metadata:
 | 
			
		||||
  name: legendary
 | 
			
		||||
  namespace: 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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -11,4 +11,4 @@ var packageConfig = JSON.parse(packageText);
 | 
			
		|||
 | 
			
		||||
const {version} = packageConfig;
 | 
			
		||||
 | 
			
		||||
fs.writeFileSync("infrastructure/kube.yaml", manifestText);
 | 
			
		||||
fs.writeFileSync("infrastructure/kube.yaml", dots.kube({version: version}));
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue