Migrering til team namespace

Author: AlexGaard

.github/workflows/main.yml

@@ -66,8 +66,8 @@ jobs:
           PUBLISH_BRANCH: gh-pages
           PUBLISH_DIR: build
 
-  deploy-q0:
-    name: Deploy application to Q0
+  deploy-dev:
+    name: Deploy application to dev
     if: github.ref == 'refs/heads/dev'
     needs: test-build-and-push
     runs-on: ubuntu-latest
@@ -79,23 +79,17 @@ jobs:
         env:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-fss
-          RESOURCE: nais-q.yaml
-          VAR: version=${{ env.IMAGE_TAG }},namespace=q0
-  deploy-q1:
-    name: Deploy application to Q1
-    if: github.ref == 'refs/heads/dev'
-    needs: test-build-and-push
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v1
-      - name: Deploy application
-        uses: nais/deploy/actions/deploy@v1
+          RESOURCE: nais-dev.yaml
+          VAR: version=${{ env.IMAGE_TAG }}
+      - name: Create release
+        uses: actions/create-release@v1
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
-          CLUSTER: dev-fss
-          RESOURCE: nais-q.yaml
-          VAR: version=${{ env.IMAGE_TAG }},namespace=q1
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: release/dev@${{ env.IMAGE_TAG }}
+          release_name: Release to dev
+          prerelease: true
+
   deploy-prod:
     name: Deploy application to prod
     if: github.ref == 'refs/heads/master'
@@ -109,31 +103,13 @@ jobs:
         env:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: prod-fss
-          RESOURCE: nais.yaml
+          RESOURCE: nais-prod.yaml
           VAR: version=${{ env.IMAGE_TAG }}
-  release-dev:
-    name: Create dev release
-    needs: [deploy-q0, deploy-q1]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Create release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: release/dev@${{ env.IMAGE_TAG }}
-          release_name: Release to dev
-          prerelease: true
-  release-prod:
-    name: Create prod release
-    needs: deploy-prod
-    runs-on: ubuntu-latest
-    steps:
       - name: Create release
         uses: actions/create-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: release/prod@${{ env.IMAGE_TAG }}
           release_name: Release to prod
-          prerelease: false
+          prerelease: false

nais-q.yaml renamed to nais-dev.yaml

@@ -2,8 +2,7 @@ apiVersion: "nais.io/v1alpha1"
 kind: "Application"
 metadata:
   name: beslutteroversikt
-  namespace: {{namespace}}
-  cluster: dev-fss
+  namespace: pto
   labels:
     team: pto
 spec:
@@ -27,7 +26,7 @@ spec:
       cpu: "1"
       memory: 1Gi
   ingresses:
-    - https://beslutteroversikt-{{namespace}}.nais.preprod.local
-    - https://app-{{namespace}}.adeo.no/beslutteroversikt
+    - https://beslutteroversikt-q1.nais.preprod.local
+    - https://app-q1.adeo.no/beslutteroversikt
   envFrom:
     - configmap: pto-config

nais.yaml renamed to nais-prod.yaml

@@ -2,8 +2,7 @@ apiVersion: "nais.io/v1alpha1"
 kind: "Application"
 metadata:
   name: beslutteroversikt
-  namespace: default
-  cluster: prod-fss
+  namespace: pto
   labels:
     team: pto
 spec: