diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 22031ce..f189f99 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -3,7 +3,7 @@ # https://docs.microsoft.com/azure/devops/pipelines/languages/docker trigger: -- main +- dev variables: @@ -14,10 +14,6 @@ variables: containerRegistry: 'voloeventhub.azurecr.io' dockerfilePath: '**/Dockerfile' tag: '$(Build.BuildNumber)' -<<<<<<< HEAD -======= - ->>>>>>> main # Agent VM image name vmImageName: 'ubuntu-latest' @@ -51,7 +47,7 @@ stages: jobs: - deployment: Deploy - displayName: Deploy + displayName: Deploy-EventHub.Web pool: vmImage: $(vmImageName) environment: 'volosofteventhub-5982.default' diff --git a/manifests/deployment.yml b/manifests/deployment.yml index c00c736..8bb163d 100644 --- a/manifests/deployment.yml +++ b/manifests/deployment.yml @@ -1,19 +1,22 @@ -apiVersion : apps/v1 +apiVersion: apps/v1 kind: Deployment metadata: - name: voloeventhub + name: volosoft-eventhub-web-deployment spec: - replicas: 1 selector: matchLabels: - app: voloeventhub + app: volosoft-eventhub-web-pod template: metadata: labels: - app: voloeventhub + app: volosoft-eventhub-web-pod spec: containers: - - name: voloeventhub - image: voloeventhub.azurecr.io/voloeventhub - ports: - - containerPort: 80 \ No newline at end of file + - name: volosoft-eventhub-web-container + image: voloeventhub.azurecr.io/voloeventhub:v1 + resources: + limits: + memory: "128Mi" + cpu: "500m" + ports: + - containerPort: 80 diff --git a/manifests/service.yml b/manifests/service.yml index f94e534..4291539 100644 --- a/manifests/service.yml +++ b/manifests/service.yml @@ -1,10 +1,11 @@ apiVersion: v1 kind: Service metadata: - name: voloeventhub + name: volosoft-eventhub-web-service spec: - type: LoadBalancer - ports: - - port: 80 - selector: - app: voloeventhub \ No newline at end of file + selector: + app: volosoft-eventhub-web-pod + ports: + - port: 8080 + targetPort: 80 + type: ClusterIP \ No newline at end of file