Merge branch 'master' of https://github.com/volosoft/abp

7 years ago · b16fdbf227
29 changed files with 360 additions and 438 deletions
--- a/samples/MicroserviceDemo/k8s/auth-server-deployment.yaml
+++ b/samples/MicroserviceDemo/k8s/auth-server-deployment.yaml
@ -1,33 +1,31 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
-  labels:
-    io.kompose.service: auth-server
  name: auth-server
 spec:
+  selector:
+    matchLabels:
+      app: auth-server
  replicas: 1
-  strategy: {}
  template:
    metadata:
      labels:
-        io.kompose.service: auth-server
+        app: auth-server
    spec:
      containers:
-      - env:
-        - name: ASPNETCORE_ENVIRONMENT
-          value: Development
-        - name: ASPNETCORE_URLS
-          value: http://0.0.0.0:51511
-        - name: ConnectionStrings__Default
-          value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
-        - name: RabbitMQ__Connections__Default__HostName
-          value: rabbitmq
-        - name: Redis__Configuration
-          value: redis
-        image: volosoft/microservice-demo-auth-server
-        name: auth-server
-        ports:
-        - containerPort: 51511
-        resources: {}
-      restartPolicy: Always
-status: {}
+        - name: auth-server
+          image: "volosoft/microservice-demo-auth-server"
+          env:
+          - name: ASPNETCORE_ENVIRONMENT
+            value: Development
+          - name: ASPNETCORE_URLS
+            value: http://0.0.0.0:51511
+          - name: ConnectionStrings__Default
+            value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
+          - name: RabbitMQ__Connections__Default__HostName
+            value: rabbitmq
+          - name: Redis__Configuration
+            value: redis
+          ports:
+            - name: http
+              containerPort: 51511
--- a/samples/MicroserviceDemo/k8s/auth-server-service.yaml
+++ b/samples/MicroserviceDemo/k8s/auth-server-service.yaml
@ -1,14 +1,11 @@
-apiVersion: v1
 kind: Service
+apiVersion: v1
 metadata:
-  labels:
-    io.kompose.service: auth-server
  name: auth-server
 spec:
-  ports:
-  - port: 51511
-    targetPort: 51511
  selector:
-    io.kompose.service: auth-server
-status:
-  loadBalancer: {}
+    app: auth-server
+  ports:
+  - protocol: TCP
+    port: 51511
+    targetPort: http
--- a/samples/MicroserviceDemo/k8s/backend-admin-app-deployment.yaml
+++ b/samples/MicroserviceDemo/k8s/backend-admin-app-deployment.yaml
@ -1,33 +1,31 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
-  labels:
-    io.kompose.service: backend-admin-app
  name: backend-admin-app
 spec:
+  selector:
+    matchLabels:
+      app: backend-admin-app
  replicas: 1
-  strategy: {}
  template:
    metadata:
      labels:
-        io.kompose.service: backend-admin-app
+        app: backend-admin-app
    spec:
      containers:
-      - env:
-        - name: ASPNETCORE_ENVIRONMENT
-          value: Development
-        - name: ASPNETCORE_URLS
-          value: http://0.0.0.0:80
-        - name: AuthServer__Authority
-          value: http://auth-server:51511
-        - name: Redis__Configuration
-          value: redis
-        - name: RemoteServices__Default__BaseUrl
-          value: http://backend-admin-app-gateway/
-        image: volosoft/microservice-demo-backend-admin-app
-        name: backend-admin-app
-        ports:
-        - containerPort: 80
-        resources: {}
-      restartPolicy: Always
-status: {}
+        - name: backend-admin-app
+          image: "volosoft/microservice-demo-backend-admin-app"
+          env:
+          - name: ASPNETCORE_ENVIRONMENT
+            value: Development
+          - name: ASPNETCORE_URLS
+            value: http://0.0.0.0:80
+          - name: AuthServer__Authority
+            value: http://auth-server:51511
+          - name: Redis__Configuration
+            value: redis
+          - name: RemoteServices__Default__BaseUrl
+            value: http://backend-admin-app-gateway/
+          ports:
+            - name: http
+              containerPort: 80
--- a/samples/MicroserviceDemo/k8s/backend-admin-app-gateway-deployment.yaml
+++ b/samples/MicroserviceDemo/k8s/backend-admin-app-gateway-deployment.yaml
@ -1,45 +1,43 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
-  labels:
-    io.kompose.service: backend-admin-app-gateway
  name: backend-admin-app-gateway
 spec:
+  selector:
+    matchLabels:
+      app: backend-admin-app-gateway
  replicas: 1
-  strategy: {}
  template:
    metadata:
      labels:
-        io.kompose.service: backend-admin-app-gateway
+        app: backend-admin-app-gateway
    spec:
      containers:
-      - env:
-        - name: ASPNETCORE_ENVIRONMENT
-          value: Development
-        - name: ASPNETCORE_URLS
-          value: http://0.0.0.0:80
-        - name: AuthServer__Authority
-          value: http://auth-server:51511
-        - name: ConnectionStrings__Default
-          value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
-        - name: GlobalConfiguration__BaseUrl
-          value: http://backend-admin-app-gateway
-        - name: ReRoutes__0__DownstreamHostAndPorts__0__Host
-          value: identity-service
-        - name: ReRoutes__0__DownstreamHostAndPorts__0__Port
-          value: "80"
-        - name: ReRoutes__1__DownstreamHostAndPorts__0__Host
-          value: product-service
-        - name: ReRoutes__1__DownstreamHostAndPorts__0__Port
-          value: "80"
-        - name: Redis__Configuration
-          value: redis
-        - name: RemoteServices__Default__BaseUrl
-          value: http://backend-admin-app-gateway/
-        image: volosoft/microservice-demo-backend-admin-app-gateway
-        name: backend-admin-app-gateway
-        ports:
-        - containerPort: 80
-        resources: {}
-      restartPolicy: Always
-status: {}
+        - name: backend-admin-app-gateway
+          image: "volosoft/microservice-demo-backend-admin-app-gateway"
+          env:
+          - name: ASPNETCORE_ENVIRONMENT
+            value: Development
+          - name: ASPNETCORE_URLS
+            value: http://0.0.0.0:80
+          - name: AuthServer__Authority
+            value: http://auth-server:51511
+          - name: ConnectionStrings__Default
+            value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
+          - name: GlobalConfiguration__BaseUrl
+            value: http://backend-admin-app-gateway
+          - name: ReRoutes__0__DownstreamHostAndPorts__0__Host
+            value: identity-service
+          - name: ReRoutes__0__DownstreamHostAndPorts__0__Port
+            value: "80"
+          - name: ReRoutes__1__DownstreamHostAndPorts__0__Host
+            value: product-service
+          - name: ReRoutes__1__DownstreamHostAndPorts__0__Port
+            value: "80"
+          - name: Redis__Configuration
+            value: redis
+          - name: RemoteServices__Default__BaseUrl
+            value: http://backend-admin-app-gateway/
+          ports:
+            - name: http
+              containerPort: 80
--- a/samples/MicroserviceDemo/k8s/backend-admin-app-gateway-service.yaml
+++ b/samples/MicroserviceDemo/k8s/backend-admin-app-gateway-service.yaml
@ -1,14 +1,11 @@
-apiVersion: v1
 kind: Service
+apiVersion: v1
 metadata:
-  labels:
-    io.kompose.service: backend-admin-app-gateway
  name: backend-admin-app-gateway
 spec:
-  ports:
-  - port: 80
-    targetPort: 80
  selector:
-    io.kompose.service: backend-admin-app-gateway
-status:
-  loadBalancer: {}
+    app: backend-admin-app-gateway
+  ports:
+  - protocol: TCP
+    port: 80
+    targetPort: http
--- a/samples/MicroserviceDemo/k8s/backend-admin-app-service.yaml
+++ b/samples/MicroserviceDemo/k8s/backend-admin-app-service.yaml
@ -1,14 +1,11 @@
-apiVersion: v1
 kind: Service
+apiVersion: v1
 metadata:
-  labels:
-    io.kompose.service: backend-admin-app
  name: backend-admin-app
 spec:
-  ports:
-  - port: 80
-    targetPort: 80
  selector:
-    io.kompose.service: backend-admin-app
-status:
-  loadBalancer: {}
+    app: backend-admin-app
+  ports:
+  - protocol: TCP
+    port: 80
+    targetPort: http
--- a/samples/MicroserviceDemo/k8s/blogging-service-deployment.yaml
+++ b/samples/MicroserviceDemo/k8s/blogging-service-deployment.yaml
@ -1,39 +1,37 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
-  labels:
-    io.kompose.service: blogging-service
  name: blogging-service
 spec:
+  selector:
+    matchLabels:
+      app: blogging-service
  replicas: 1
-  strategy: {}
  template:
    metadata:
      labels:
-        io.kompose.service: blogging-service
+        app: blogging-service
    spec:
      containers:
-      - env:
-        - name: ASPNETCORE_ENVIRONMENT
-          value: Development
-        - name: ASPNETCORE_URLS
-          value: http://0.0.0.0:80
-        - name: AuthServer__Authority
-          value: http://auth-server:51511
-        - name: ConnectionStrings__Blogging
-          value: mongodb://mongodb|MsDemo_Blogging
-        - name: ConnectionStrings__Default
-          value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
-        - name: RabbitMQ__Connections__Default__HostName
-          value: rabbitmq
-        - name: Redis__Configuration
-          value: redis
-        - name: RemoteServices__Default__BaseUrl
-          value: http://internal-gateway/
-        image: volosoft/microservice-demo-blogging-service
-        name: blogging-service
-        ports:
-        - containerPort: 80
-        resources: {}
-      restartPolicy: Always
-status: {}
+        - name: blogging-service
+          image: "volosoft/microservice-demo-blogging-service"
+          env:
+          - name: ASPNETCORE_ENVIRONMENT
+            value: Development
+          - name: ASPNETCORE_URLS
+            value: http://0.0.0.0:80
+          - name: AuthServer__Authority
+            value: http://auth-server:51511
+          - name: ConnectionStrings__Blogging
+            value: mongodb://mongodb|MsDemo_Blogging
+          - name: ConnectionStrings__Default
+            value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
+          - name: RabbitMQ__Connections__Default__HostName
+            value: rabbitmq
+          - name: Redis__Configuration
+            value: redis
+          - name: RemoteServices__Default__BaseUrl
+            value: http://internal-gateway/
+          ports:
+            - name: http
+              containerPort: 80
--- a/samples/MicroserviceDemo/k8s/blogging-service-service.yaml
+++ b/samples/MicroserviceDemo/k8s/blogging-service-service.yaml
@ -1,14 +1,11 @@
-apiVersion: v1
 kind: Service
+apiVersion: v1
 metadata:
-  labels:
-    io.kompose.service: blogging-service
  name: blogging-service
 spec:
-  ports:
-  - port: 80
-    targetPort: 80
  selector:
-    io.kompose.service: blogging-service
-status:
-  loadBalancer: {}
+    app: blogging-service
+  ports:
+  - protocol: TCP
+    port: 80
+    targetPort: http
--- a/samples/MicroserviceDemo/k8s/dbdata-persistentvolumeclaim.yaml
+++ b/samples/MicroserviceDemo/k8s/dbdata-persistentvolumeclaim.yaml
@ -1,8 +1,6 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  labels:
-    io.kompose.service: dbdata
  name: dbdata
 spec:
  accessModes:
@ -10,4 +8,3 @@ spec:
  resources:
    requests:
      storage: 500Mi
-status: {}
--- a/samples/MicroserviceDemo/k8s/expose-service.yaml
+++ b/samples/MicroserviceDemo/k8s/expose-service.yaml
@ -1,13 +1,11 @@
 apiVersion: v1
 kind: Service
 metadata:
-  labels:
-    io.kompose.service: auth-server
  name: auth-server-expose
 spec:
  type: LoadBalancer
  selector:
-    io.kompose.service: auth-server
+    app: auth-server
  ports:
    - protocol: TCP
      port: 51511
@ -17,13 +15,11 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  labels:
-    io.kompose.service: backend-admin-app
  name: backend-admin-app-expose
 spec:
  type: LoadBalancer
  selector:
-    io.kompose.service: backend-admin-app
+    app: backend-admin-app
  ports:
    - protocol: TCP
      port: 80
@ -33,13 +29,11 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  labels:
-    io.kompose.service: public-website
  name: public-website-expose
 spec:
  type: LoadBalancer
  selector:
-    io.kompose.service: public-website
+    app: public-website
  ports:
    - protocol: TCP
      port: 80
--- a/samples/MicroserviceDemo/k8s/identity-service-deployment.yaml
+++ b/samples/MicroserviceDemo/k8s/identity-service-deployment.yaml
@ -1,35 +1,33 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
-  labels:
-    io.kompose.service: identity-service
  name: identity-service
 spec:
+  selector:
+    matchLabels:
+      app: identity-service
  replicas: 1
-  strategy: {}
  template:
    metadata:
      labels:
-        io.kompose.service: identity-service
+        app: identity-service
    spec:
      containers:
-      - env:
-        - name: ASPNETCORE_ENVIRONMENT
-          value: Development
-        - name: ASPNETCORE_URLS
-          value: http://0.0.0.0:80
-        - name: AuthServer__Authority
-          value: http://auth-server:51511
-        - name: ConnectionStrings__Default
-          value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
-        - name: RabbitMQ__Connections__Default__HostName
-          value: rabbitmq
-        - name: Redis__Configuration
-          value: redis
-        image: volosoft/microservice-demo-identity-service
-        name: identity-service
-        ports:
-        - containerPort: 80
-        resources: {}
-      restartPolicy: Always
-status: {}
+        - name: identity-service
+          image: "volosoft/microservice-demo-identity-service"
+          env:
+          - name: ASPNETCORE_ENVIRONMENT
+            value: Development
+          - name: ASPNETCORE_URLS
+            value: http://0.0.0.0:80
+          - name: AuthServer__Authority
+            value: http://auth-server:51511
+          - name: ConnectionStrings__Default
+            value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
+          - name: RabbitMQ__Connections__Default__HostName
+            value: rabbitmq
+          - name: Redis__Configuration
+            value: redis
+          ports:
+            - name: http
+              containerPort: 80
--- a/samples/MicroserviceDemo/k8s/identity-service-service.yaml
+++ b/samples/MicroserviceDemo/k8s/identity-service-service.yaml
@ -1,14 +1,11 @@
-apiVersion: v1
 kind: Service
+apiVersion: v1
 metadata:
-  labels:
-    io.kompose.service: identity-service
  name: identity-service
 spec:
-  ports:
-  - port: 80
-    targetPort: 80
  selector:
-    io.kompose.service: identity-service
-status:
-  loadBalancer: {}
+    app: identity-service
+  ports:
+  - protocol: TCP
+    port: 80
+    targetPort: http
--- a/samples/MicroserviceDemo/k8s/internal-gateway-deployment.yaml
+++ b/samples/MicroserviceDemo/k8s/internal-gateway-deployment.yaml
@ -1,47 +1,45 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
-  labels:
-    io.kompose.service: internal-gateway
  name: internal-gateway
 spec:
+  selector:
+    matchLabels:
+      app: internal-gateway
  replicas: 1
-  strategy: {}
  template:
    metadata:
      labels:
-        io.kompose.service: internal-gateway
+        app: internal-gateway
    spec:
      containers:
-      - env:
-        - name: ASPNETCORE_ENVIRONMENT
-          value: Development
-        - name: ASPNETCORE_URLS
-          value: http://0.0.0.0:80
-        - name: AuthServer__Authority
-          value: http://auth-server:51511
-        - name: ConnectionStrings__Default
-          value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
-        - name: GlobalConfiguration__BaseUrl
-          value: http://internal-gateway
-        - name: ReRoutes__0__DownstreamHostAndPorts__0__Host
-          value: identity-service
-        - name: ReRoutes__0__DownstreamHostAndPorts__0__Port
-          value: "80"
-        - name: ReRoutes__1__DownstreamHostAndPorts__0__Host
-          value: product-service
-        - name: ReRoutes__1__DownstreamHostAndPorts__0__Port
-          value: "80"
-        - name: ReRoutes__2__DownstreamHostAndPorts__0__Host
-          value: blogging-service
-        - name: ReRoutes__2__DownstreamHostAndPorts__0__Port
-          value: "80"
-        - name: Redis__Configuration
-          value: redis
-        image: volosoft/microservice-demo-internal-gateway
-        name: internal-gateway
-        ports:
-        - containerPort: 80
-        resources: {}
-      restartPolicy: Always
-status: {}
+        - name: internal-gateway
+          image: "volosoft/microservice-demo-internal-gateway"
+          env:
+          - name: ASPNETCORE_ENVIRONMENT
+            value: Development
+          - name: ASPNETCORE_URLS
+            value: http://0.0.0.0:80
+          - name: AuthServer__Authority
+            value: http://auth-server:51511
+          - name: ConnectionStrings__Default
+            value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
+          - name: GlobalConfiguration__BaseUrl
+            value: http://internal-gateway
+          - name: ReRoutes__0__DownstreamHostAndPorts__0__Host
+            value: identity-service
+          - name: ReRoutes__0__DownstreamHostAndPorts__0__Port
+            value: "80"
+          - name: ReRoutes__1__DownstreamHostAndPorts__0__Host
+            value: product-service
+          - name: ReRoutes__1__DownstreamHostAndPorts__0__Port
+            value: "80"
+          - name: ReRoutes__2__DownstreamHostAndPorts__0__Host
+            value: blogging-service
+          - name: ReRoutes__2__DownstreamHostAndPorts__0__Port
+            value: "80"
+          - name: Redis__Configuration
+            value: redis
+          ports:
+            - name: http
+              containerPort: 80
--- a/samples/MicroserviceDemo/k8s/internal-gateway-service.yaml
+++ b/samples/MicroserviceDemo/k8s/internal-gateway-service.yaml
@ -1,14 +1,11 @@
-apiVersion: v1
 kind: Service
+apiVersion: v1
 metadata:
-  labels:
-    io.kompose.service: internal-gateway
  name: internal-gateway
 spec:
-  ports:
-  - port: 80
-    targetPort: 80
  selector:
-    io.kompose.service: internal-gateway
-status:
-  loadBalancer: {}
+    app: internal-gateway
+  ports:
+  - protocol: TCP
+    port: 80
+    targetPort: http
--- a/samples/MicroserviceDemo/k8s/mongodb-deployment.yaml
+++ b/samples/MicroserviceDemo/k8s/mongodb-deployment.yaml
@ -1,22 +1,19 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
-  labels:
-    io.kompose.service: mongodb
  name: mongodb
 spec:
+  selector:
+    matchLabels:
+      app: mongodb
  replicas: 1
-  strategy: {}
  template:
    metadata:
      labels:
-        io.kompose.service: mongodb
+        app: mongodb
    spec:
      containers:
-      - image: mongo
-        name: mongodb
-        ports:
-        - containerPort: 27017
-        resources: {}
-      restartPolicy: Always
-status: {}
+        - name: mongodb
+          image: "mongo"
+          ports:
+            - containerPort: 27017
--- a/samples/MicroserviceDemo/k8s/mongodb-service.yaml
+++ b/samples/MicroserviceDemo/k8s/mongodb-service.yaml
@ -1,14 +1,10 @@
-apiVersion: v1
 kind: Service
+apiVersion: v1
 metadata:
-  labels:
-    io.kompose.service: mongodb
  name: mongodb
 spec:
+  selector:
+    app: mongodb
  ports:
  - port: 27017
-    targetPort: 27017
-  selector:
-    io.kompose.service: mongodb
-status:
-  loadBalancer: {}
+    targetPort: 27017
--- a/samples/MicroserviceDemo/k8s/product-service-deployment.yaml
+++ b/samples/MicroserviceDemo/k8s/product-service-deployment.yaml
@ -1,38 +1,36 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
-  labels:
-    io.kompose.service: product-service
  name: product-service
 spec:
+  selector:
+    matchLabels:
+      app: product-service
  replicas: 1
-  strategy: {}
  template:
    metadata:
      labels:
-        io.kompose.service: product-service
+        app: product-service
    spec:
      containers:
-      - env:
-        - name: ASPNETCORE_ENVIRONMENT
-          value: Development
-        - name: ASPNETCORE_URLS
-          value: http://0.0.0.0:80
-        - name: AuthServer__Authority
-          value: http://auth-server:51511
-        - name: ConnectionStrings__Default
-          value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated
-            Security=false
-        - name: ConnectionStrings__ProductManagement
-          value: Server=sqlserver;Database=MsDemo_ProductManagement;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
-        - name: RabbitMQ__Connections__Default__HostName
-          value: rabbitmq
-        - name: Redis__Configuration
-          value: redis
-        image: volosoft/microservice-demo-product-service
-        name: product-service
-        ports:
-        - containerPort: 80
-        resources: {}
-      restartPolicy: Always
-status: {}
+        - name: product-service
+          image: "volosoft/microservice-demo-product-service"
+          env:
+          - name: ASPNETCORE_ENVIRONMENT
+            value: Development
+          - name: ASPNETCORE_URLS
+            value: http://0.0.0.0:80
+          - name: AuthServer__Authority
+            value: http://auth-server:51511
+          - name: ConnectionStrings__Default
+            value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated
+              Security=false
+          - name: ConnectionStrings__ProductManagement
+            value: Server=sqlserver;Database=MsDemo_ProductManagement;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
+          - name: RabbitMQ__Connections__Default__HostName
+            value: rabbitmq
+          - name: Redis__Configuration
+            value: redis
+          ports:
+            - name: http
+              containerPort: 80
--- a/samples/MicroserviceDemo/k8s/product-service-service.yaml
+++ b/samples/MicroserviceDemo/k8s/product-service-service.yaml
@ -1,14 +1,11 @@
-apiVersion: v1
 kind: Service
+apiVersion: v1
 metadata:
-  labels:
-    io.kompose.service: product-service
  name: product-service
 spec:
-  ports:
-  - port: 80
-    targetPort: 80
  selector:
-    io.kompose.service: product-service
-status:
-  loadBalancer: {}
+    app: product-service
+  ports:
+  - protocol: TCP
+    port: 80
+    targetPort: http
--- a/samples/MicroserviceDemo/k8s/public-website-deployment.yaml
+++ b/samples/MicroserviceDemo/k8s/public-website-deployment.yaml
@ -1,33 +1,31 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
-  labels:
-    io.kompose.service: public-website
  name: public-website
 spec:
+  selector:
+    matchLabels:
+      app: public-website
  replicas: 1
-  strategy: {}
  template:
    metadata:
      labels:
-        io.kompose.service: public-website
+        app: public-website
    spec:
      containers:
-      - env:
-        - name: ASPNETCORE_ENVIRONMENT
-          value: Development
-        - name: ASPNETCORE_URLS
-          value: http://0.0.0.0:80
-        - name: AuthServer__Authority
-          value: http://auth-server:51511
-        - name: Redis__Configuration
-          value: redis
-        - name: RemoteServices__Default__BaseUrl
-          value: http://public-website-gateway/
-        image: volosoft/microservice-demo-public-website
-        name: public-website
-        ports:
-        - containerPort: 80
-        resources: {}
-      restartPolicy: Always
-status: {}
+        - name: public-website
+          image: "volosoft/microservice-demo-public-website"
+          env:
+          - name: ASPNETCORE_ENVIRONMENT
+            value: Development
+          - name: ASPNETCORE_URLS
+            value: http://0.0.0.0:80
+          - name: AuthServer__Authority
+            value: http://auth-server:51511
+          - name: Redis__Configuration
+            value: redis
+          - name: RemoteServices__Default__BaseUrl
+            value: http://public-website-gateway/
+          ports:
+            - name: http
+              containerPort: 80
--- a/samples/MicroserviceDemo/k8s/public-website-gateway-deployment.yaml
+++ b/samples/MicroserviceDemo/k8s/public-website-gateway-deployment.yaml
@ -1,43 +1,41 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
-  labels:
-    io.kompose.service: public-website-gateway
  name: public-website-gateway
 spec:
+  selector:
+    matchLabels:
+      app: public-website-gateway
  replicas: 1
-  strategy: {}
  template:
    metadata:
      labels:
-        io.kompose.service: public-website-gateway
+        app: public-website-gateway
    spec:
      containers:
-      - env:
-        - name: ASPNETCORE_ENVIRONMENT
-          value: Development
-        - name: ASPNETCORE_URLS
-          value: http://0.0.0.0:80
-        - name: AuthServer__Authority
-          value: http://auth-server:51511
-        - name: ConnectionStrings__Default
-          value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
-        - name: GlobalConfiguration__BaseUrl
-          value: http://public-website-gateway
-        - name: ReRoutes__0__DownstreamHostAndPorts__0__Host
-          value: product-service
-        - name: ReRoutes__0__DownstreamHostAndPorts__0__Port
-          value: "80"
-        - name: ReRoutes__1__DownstreamHostAndPorts__0__Host
-          value: blogging-service
-        - name: ReRoutes__1__DownstreamHostAndPorts__0__Port
-          value: "80"
-        - name: Redis__Configuration
-          value: redis
-        image: volosoft/microservice-demo-public-website-gateway
-        name: public-website-gateway
-        ports:
-        - containerPort: 80
-        resources: {}
-      restartPolicy: Always
-status: {}
+        - name: public-website-gateway
+          image: "volosoft/microservice-demo-public-website-gateway"
+          env:
+          - name: ASPNETCORE_ENVIRONMENT
+            value: Development
+          - name: ASPNETCORE_URLS
+            value: http://0.0.0.0:80
+          - name: AuthServer__Authority
+            value: http://auth-server:51511
+          - name: ConnectionStrings__Default
+            value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
+          - name: GlobalConfiguration__BaseUrl
+            value: http://public-website-gateway
+          - name: ReRoutes__0__DownstreamHostAndPorts__0__Host
+            value: product-service
+          - name: ReRoutes__0__DownstreamHostAndPorts__0__Port
+            value: "80"
+          - name: ReRoutes__1__DownstreamHostAndPorts__0__Host
+            value: blogging-service
+          - name: ReRoutes__1__DownstreamHostAndPorts__0__Port
+            value: "80"
+          - name: Redis__Configuration
+            value: redis
+          ports:
+            - name: http
+              containerPort: 80
--- a/samples/MicroserviceDemo/k8s/public-website-gateway-service.yaml
+++ b/samples/MicroserviceDemo/k8s/public-website-gateway-service.yaml
@ -1,14 +1,11 @@
-apiVersion: v1
 kind: Service
+apiVersion: v1
 metadata:
-  labels:
-    io.kompose.service: public-website-gateway
  name: public-website-gateway
 spec:
-  ports:
-  - port: 80
-    targetPort: 80
  selector:
-    io.kompose.service: public-website-gateway
-status:
-  loadBalancer: {}
+    app: public-website-gateway
+  ports:
+  - protocol: TCP
+    port: 80
+    targetPort: http
--- a/samples/MicroserviceDemo/k8s/public-website-service.yaml
+++ b/samples/MicroserviceDemo/k8s/public-website-service.yaml
@ -1,14 +1,11 @@
-apiVersion: v1
 kind: Service
+apiVersion: v1
 metadata:
-  labels:
-    io.kompose.service: public-website
  name: public-website
 spec:
-  ports:
-  - port: 80
-    targetPort: 80
  selector:
-    io.kompose.service: public-website
-status:
-  loadBalancer: {}
+    app: public-website
+  ports:
+  - protocol: TCP
+    port: 80
+    targetPort: http
--- a/samples/MicroserviceDemo/k8s/rabbitmq-deployment.yaml
+++ b/samples/MicroserviceDemo/k8s/rabbitmq-deployment.yaml
@ -1,23 +1,20 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
-  labels:
-    io.kompose.service: rabbitmq
  name: rabbitmq
 spec:
+  selector:
+    matchLabels:
+      app: rabbitmq
  replicas: 1
-  strategy: {}
  template:
    metadata:
      labels:
-        io.kompose.service: rabbitmq
+        app: rabbitmq
    spec:
      containers:
-      - image: rabbitmq:3-management-alpine
-        name: rabbitmq
-        ports:
-        - containerPort: 5672
-        - containerPort: 15672
-        resources: {}
-      restartPolicy: Always
-status: {}
+        - name: rabbitmq
+          image: "rabbitmq:3-management-alpine"
+          ports:
+            - containerPort: 5672
+            - containerPort: 15672
--- a/samples/MicroserviceDemo/k8s/rabbitmq-service.yaml
+++ b/samples/MicroserviceDemo/k8s/rabbitmq-service.yaml
@ -1,18 +1,14 @@
-apiVersion: v1
 kind: Service
+apiVersion: v1
 metadata:
-  labels:
-    io.kompose.service: rabbitmq
  name: rabbitmq
 spec:
+  selector:
+    app: rabbitmq
  ports:
  - name: "5672"
    port: 5672
    targetPort: 5672
  - name: "15672"
    port: 15672
-    targetPort: 15672
-  selector:
-    io.kompose.service: rabbitmq
-status:
-  loadBalancer: {}
+    targetPort: 15672
--- a/samples/MicroserviceDemo/k8s/redis-deployment.yaml
+++ b/samples/MicroserviceDemo/k8s/redis-deployment.yaml
@ -1,22 +1,19 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
-  labels:
-    io.kompose.service: redis
  name: redis
 spec:
+  selector:
+    matchLabels:
+      app: redis
  replicas: 1
-  strategy: {}
  template:
    metadata:
      labels:
-        io.kompose.service: redis
+        app: redis
    spec:
      containers:
-      - image: redis
-        name: redis
-        ports:
-        - containerPort: 6379
-        resources: {}
-      restartPolicy: Always
-status: {}
+        - name: redis
+          image: "redis"
+          ports:
+            - containerPort: 6379
--- a/samples/MicroserviceDemo/k8s/redis-service.yaml
+++ b/samples/MicroserviceDemo/k8s/redis-service.yaml
@ -1,14 +1,10 @@
-apiVersion: v1
 kind: Service
+apiVersion: v1
 metadata:
-  labels:
-    io.kompose.service: redis
  name: redis
 spec:
-  ports:
-  - port: 6379
-    targetPort: 6379
  selector:
-    io.kompose.service: redis
-status:
-  loadBalancer: {}
+    app: redis
+  ports:
+    - port: 6379
+      targetPort: 6379
--- a/samples/MicroserviceDemo/k8s/restore-database-job.yaml
+++ b/samples/MicroserviceDemo/k8s/restore-database-job.yaml
@ -12,7 +12,7 @@ spec:
        - name: SA_PASSWORD
          value: yourStrong(!)Password
        name: restore-database
-        image: volosoft/microservice-demo-restore-database
+        image: "volosoft/microservice-demo-restore-database"
        volumeMounts:
        - mountPath: /var/opt/mssql
          name: dbdata
--- a/samples/MicroserviceDemo/k8s/sqlserver-deployment.yaml
+++ b/samples/MicroserviceDemo/k8s/sqlserver-deployment.yaml
@ -1,35 +1,35 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
-  labels:
-    io.kompose.service: sqlserver
  name: sqlserver
 spec:
+  selector:
+    matchLabels:
+      app: sqlserver
  replicas: 1
-  strategy:
-    type: Recreate
  template:
    metadata:
      labels:
-        io.kompose.service: sqlserver
+        app: sqlserver
    spec:
      containers:
-      - env:
+      - name: sqlserver
+        image: mcr.microsoft.com/mssql/server
+        ports:
+        - containerPort: 1433
+        env:
+        - name: MSSQL_PID
+          value: "Developer"
        - name: ACCEPT_EULA
          value: "Y"
        - name: SA_PASSWORD
          value: yourStrong(!)Password
-        image: mcr.microsoft.com/mssql/server
-        name: sqlserver
-        ports:
-        - containerPort: 1433
-        resources: {}
+        - name: MSSQL_SA_PASSWORD
+          value: yourStrong(!)Password
        volumeMounts:
-        - mountPath: /var/opt/mssql
-          name: dbdata
-      restartPolicy: Always
+        - name: dbdata
+          mountPath: /var/opt/mssql
      volumes:
      - name: dbdata
        persistentVolumeClaim:
-          claimName: dbdata
-status: {}
+          claimName: dbdata
--- a/samples/MicroserviceDemo/k8s/sqlserver-service.yaml
+++ b/samples/MicroserviceDemo/k8s/sqlserver-service.yaml
@ -1,14 +1,11 @@
-apiVersion: v1
 kind: Service
+apiVersion: v1
 metadata:
-  labels:
-    io.kompose.service: sqlserver
  name: sqlserver
 spec:
-  ports:
-  - port: 1433
-    targetPort: 1433
  selector:
-    io.kompose.service: sqlserver
-status:
-  loadBalancer: {}
+    app: sqlserver
+  ports:
+    - protocol: TCP
+      port: 1433
+      targetPort: 1433