fix: compatibility with kubernetes 1.22 (#827)

* fix kubernetes api version * fix error * migrate other steps according to https://kubernetes.io/docs/reference/using-api/deprecation-guide/#ingress-v122 * beta migration * update to higher kubernetes version comatibility * Restyled by prettier (#828) Co-authored-by: Restyled.io <[email protected]> * Update Phonebook.pr.yml for Azure Pipelines * update pipeline vm specifiers * Update demo/Phonebook.MockBackend.yml Co-authored-by: restyled-io[bot] <32688539+restyled-io[bot]@users.noreply.github.com> Co-authored-by: Restyled.io <[email protected]>
T-Systems-MMS · Oct 9, 2022 · 9881db9 · 9881db9
1 parent 76a6de0
commit 9881db9
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 28 deletions.
diff --git a/.azure/pipelines/Phonebook.preview.yml b/.azure/pipelines/Phonebook.preview.yml
@@ -14,7 +14,7 @@ jobs:
   - job: build_phonebook_frontend
     displayName: 'Phonebook Frontend'
     pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-latest'
     steps:
       - task: UseNode@1
         inputs:
@@ -40,7 +40,7 @@ jobs:
   - job: build_phonebook_source_peoplesoft
     displayName: 'Phonebook Source Peoplesoft'
     pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-latest'
     steps:
       - task: UseNode@1
         inputs:
@@ -63,7 +63,7 @@ jobs:
   - job: build_phonebook_helm
     displayName: Phonebook Helm Chart
     pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-latest'
     steps:
       - task: HelmInstaller@1
         displayName: Helm install latest
@@ -86,7 +86,7 @@ jobs:
       - build_phonebook_helm
     displayName: 'Deploy Preview'
     pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-latest'
     variables:
       namespace: $(image_tag_frontend)
     steps:
@@ -159,7 +159,7 @@ jobs:
     condition: succeededOrFailed()
     displayName: 'Delete Preview Environment'
     pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-latest'
     variables:
       namespace: $(image_tag_frontend)
     steps:

diff --git a/.azure/pipelines/pr/Phonebook.Assets.pr.yml b/.azure/pipelines/pr/Phonebook.Assets.pr.yml
@@ -11,7 +11,7 @@ jobs:
   - job: build
     displayName: build docker image
     pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-latest'
     steps:
       - bash: |
           docker build .

diff --git a/.azure/pipelines/pr/Phonebook.Frontend.pr.yml b/.azure/pipelines/pr/Phonebook.Frontend.pr.yml
@@ -11,7 +11,7 @@ jobs:
   - job: E2E
     displayName: E2E Tests
     pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-latest'
     steps:
       - task: UseNode@1
         inputs:
@@ -33,7 +33,7 @@ jobs:
   - job: Unit
     displayName: Unit Tests
     pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-latest'
     steps:
       - task: UseNode@1
         inputs:
@@ -55,7 +55,7 @@ jobs:
   - job: build
     displayName: Build
     pool:
-      vmImage: 'Ubuntu-16.04'
+      vmImage: 'ubuntu-latest'
     steps:
       - task: UseNode@1
         inputs:

diff --git a/.azure/pipelines/pr/Phonebook.Source.MockPeopleBackend.pr.yml b/.azure/pipelines/pr/Phonebook.Source.MockPeopleBackend.pr.yml
@@ -11,7 +11,7 @@ jobs:
   - job: build
     displayName: build docker image
     pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-latest'
     steps:
       - bash: |
           docker build -f synthetic.Dockerfile .

diff --git a/.azure/pipelines/pr/Phonebook.Source.PeopleSoft.pr.yml b/.azure/pipelines/pr/Phonebook.Source.PeopleSoft.pr.yml
@@ -11,7 +11,7 @@ jobs:
   - job: build
     displayName: build docker image
     pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-latest'
     steps:
       - bash: |
           docker build .

diff --git a/.azure/pipelines/pr/Phonebook.pr.yml b/.azure/pipelines/pr/Phonebook.pr.yml
@@ -11,7 +11,7 @@ jobs:
   - job: helm
     displayName: helm
     pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-latest'
     steps:
       - task: HelmInstaller@1
         displayName: Helm install latest

diff --git a/.azure/pipelines/pr/docs.pr.yml b/.azure/pipelines/pr/docs.pr.yml
@@ -11,7 +11,7 @@ jobs:
   - job: build
     displayName: build docs
     pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-latest'
     steps:
       - task: UseRubyVersion@0
         displayName: 'Use Ruby >= 2.5'

diff --git a/.azure/pipelines/production/Phonebook.Assets.yml b/.azure/pipelines/production/Phonebook.Assets.yml
@@ -12,7 +12,7 @@ jobs:
   - job: build
     displayName: build docker image
     pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-latest'
     steps:
       - bash: |
           docker build -t $dockerRepo:$tag .

diff --git a/.azure/pipelines/production/Phonebook.Frontend.yml b/.azure/pipelines/production/Phonebook.Frontend.yml
@@ -9,7 +9,7 @@ trigger:
 pr: none
 
 pool:
-  vmImage: 'Ubuntu-16.04'
+  vmImage: 'ubuntu-latest'
 steps:
   - task: UseNode@1
     inputs:

diff --git a/.azure/pipelines/production/Phonebook.Source.MockPeopleBackend.yml b/.azure/pipelines/production/Phonebook.Source.MockPeopleBackend.yml
@@ -12,7 +12,7 @@ jobs:
   - job: build
     displayName: build docker image
     pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-latest'
     steps:
       - bash: |
           docker build -t $dockerRepo:$tag -f synthetic.Dockerfile .

diff --git a/.azure/pipelines/production/Phonebook.Source.PeopleSoft.yml b/.azure/pipelines/production/Phonebook.Source.PeopleSoft.yml
@@ -12,7 +12,7 @@ jobs:
   - job: build
     displayName: build docker image
     pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-latest'
     steps:
       - bash: |
           docker build -t $dockerRepo:$tag -t $dockerRepo:latest  .

diff --git a/.azure/pipelines/production/Phonebook.yml b/.azure/pipelines/production/Phonebook.yml
@@ -12,7 +12,7 @@ jobs:
   - job: helm
     displayName: helm
     pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-latest'
     steps:
       - task: HelmInstaller@1
         displayName: Install Helm latest

diff --git a/Phonebook/phonebook/requirements.lock b/Phonebook/phonebook/requirements.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: traefik
   repository: https://helm.traefik.io/traefik
-  version: 9.4.3
-digest: sha256:fd64faa165f4cd75bce09c96fd7e5c0222fde2427ace15ce144e32bc452869f3
-generated: "2020-10-11T21:50:24.9918945+02:00"
+  version: 10.19.4
+digest: sha256:44bbac96c43c0f9199601bc75c76bb6470822996e6abff3b85323d94934c91f5
+generated: "2022-04-25T15:41:54.906223332Z"
diff --git a/Phonebook/phonebook/requirements.yaml b/Phonebook/phonebook/requirements.yaml
@@ -1,7 +1,7 @@
 dependencies:
   - name: traefik
     condition: traefik.enabled
-    version: 9.4.3
+    version: 10.19.4
     appVersion: 2.3.1
     repository: https://helm.traefik.io/traefik
 
diff --git a/demo/Phonebook.Assets.yml b/demo/Phonebook.Assets.yml
@@ -40,7 +40,7 @@ spec:
   selector:
     app: phonebook-assets
 ---
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: phonebook-assets-ingress
@@ -53,6 +53,9 @@ spec:
     - http:
         paths:
           - path: /assets
+            pathType: Prefix
             backend:
-              serviceName: phonebook-assets-service
-              servicePort: http
+              service:
+                name: phonebook-assets-service
+                port:
+                  name: http
diff --git a/demo/Phonebook.MockBackend.yml b/demo/Phonebook.MockBackend.yml
@@ -40,7 +40,7 @@ spec:
   selector:
     app: phonebook-mock-backend
 ---
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: phonebook-mock-backend-ingress
@@ -53,6 +53,9 @@ spec:
     - http:
         paths:
           - path: /api
+            pathType: Prefix
             backend:
-              serviceName: phonebook-mock-backend-service
-              servicePort: http
+              service:
+                name: phonebook-mock-backend-service
+                port:
+                  name: http