.editorconfig

@@ -1,132 +0,0 @@
-###############################
-# Core EditorConfig Options   #
-###############################
-root = true
-# All files
-[*]
-indent_style = space
-
-# XML project files
-[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
-indent_size = 2
-
-# XML config files
-[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
-indent_size = 2
-
-# Code files
-[*.{cs,csx,vb,vbx}]
-indent_size = 4
-insert_final_newline = true
-charset = utf-8-bom
-###############################
-# .NET Coding Conventions     #
-###############################
-[*.{cs,vb}]
-# Organize usings
-dotnet_sort_system_directives_first = true
-# this. preferences
-dotnet_style_qualification_for_field = false:silent
-dotnet_style_qualification_for_property = false:silent
-dotnet_style_qualification_for_method = false:silent
-dotnet_style_qualification_for_event = false:silent
-# Language keywords vs BCL types preferences
-dotnet_style_predefined_type_for_locals_parameters_members = true:silent
-dotnet_style_predefined_type_for_member_access = true:silent
-# Parentheses preferences
-dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
-dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
-dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
-dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
-# Modifier preferences
-dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
-dotnet_style_readonly_field = true:suggestion
-# Expression-level preferences
-dotnet_style_object_initializer = true:suggestion
-dotnet_style_collection_initializer = true:suggestion
-dotnet_style_explicit_tuple_names = true:suggestion
-dotnet_style_null_propagation = true:suggestion
-dotnet_style_coalesce_expression = true:suggestion
-dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
-dotnet_style_prefer_inferred_tuple_names = true:suggestion
-dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
-dotnet_style_prefer_auto_properties = true:silent
-dotnet_style_prefer_conditional_expression_over_assignment = true:silent
-dotnet_style_prefer_conditional_expression_over_return = true:silent
-###############################
-# Naming Conventions          #
-###############################
-# Style Definitions
-dotnet_naming_style.pascal_case_style.capitalization             = pascal_case
-# Use PascalCase for constant fields
-dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
-dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols  = constant_fields
-dotnet_naming_rule.constant_fields_should_be_pascal_case.style    = pascal_case_style
-dotnet_naming_symbols.constant_fields.applicable_kinds            = field
-dotnet_naming_symbols.constant_fields.applicable_accessibilities  = *
-dotnet_naming_symbols.constant_fields.required_modifiers          = const
-###############################
-# C# Coding Conventions       #
-###############################
-[*.cs]
-# var preferences
-csharp_style_var_for_built_in_types = true:silent
-csharp_style_var_when_type_is_apparent = true:silent
-csharp_style_var_elsewhere = true:silent
-# Expression-bodied members
-csharp_style_expression_bodied_methods = false:silent
-csharp_style_expression_bodied_constructors = false:silent
-csharp_style_expression_bodied_operators = false:silent
-csharp_style_expression_bodied_properties = true:silent
-csharp_style_expression_bodied_indexers = true:silent
-csharp_style_expression_bodied_accessors = true:silent
-# Pattern matching preferences
-csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
-csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
-# Null-checking preferences
-csharp_style_throw_expression = true:suggestion
-csharp_style_conditional_delegate_call = true:suggestion
-# Modifier preferences
-csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
-# Expression-level preferences
-csharp_prefer_braces = true:silent
-csharp_style_deconstructed_variable_declaration = true:suggestion
-csharp_prefer_simple_default_expression = true:suggestion
-csharp_style_prefer_local_over_anonymous_function = true:suggestion
-csharp_style_inlined_variable_declaration = true:suggestion
-###############################
-# C# Formatting Rules         #
-###############################
-# New line preferences
-csharp_new_line_before_open_brace = all
-csharp_new_line_before_else = true
-csharp_new_line_before_catch = true
-csharp_new_line_before_finally = true
-csharp_new_line_before_members_in_object_initializers = true
-csharp_new_line_before_members_in_anonymous_types = true
-csharp_new_line_between_query_expression_clauses = true
-# Indentation preferences
-csharp_indent_case_contents = true
-csharp_indent_switch_labels = true
-csharp_indent_labels = flush_left
-# Space preferences
-csharp_space_after_cast = false
-csharp_space_after_keywords_in_control_flow_statements = true
-csharp_space_between_method_call_parameter_list_parentheses = false
-csharp_space_between_method_declaration_parameter_list_parentheses = false
-csharp_space_between_parentheses = false
-csharp_space_before_colon_in_inheritance_clause = true
-csharp_space_after_colon_in_inheritance_clause = true
-csharp_space_around_binary_operators = before_and_after
-csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
-csharp_space_between_method_call_name_and_opening_parenthesis = false
-csharp_space_between_method_call_empty_parameter_list_parentheses = false
-# Wrapping preferences
-csharp_preserve_single_line_statements = true
-csharp_preserve_single_line_blocks = true
-###############################
-# VB Coding Conventions       #
-###############################
-[*.vb]
-# Modifier preferences
-visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion

.github/workflows/basket-api-deploy.yml

@@ -1,35 +0,0 @@
-name: Deploy basket-api
-
-on:
-  workflow_dispatch:
-  repository_dispatch:
-    types:
-    - deploy
-  workflow_run:
-    workflows: ["basket-api"]
-    branches: [dev]
-    types: [completed]
-
-env:
-  CHART: basket-api
-  NAMESPACE: eshop
-  CHART_ROOT: deploy/k8s/helm
-
-jobs:
-  deploy-to-k8s:
-    #if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
-    if: false
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: ./.github/workflows/composite/deploy-helm
-        with:
-          azure_credentials: ${{ secrets.AZURE_CREDENTIALS }}
-          cluster_name: ${{ secrets.CLUSTER_NAME }}
-          resource_group: ${{ secrets.RESOURCE_GROUP }}
-          registry_host: ${{ secrets.REGISTRY_HOST }}
-          chart: ${{ env.CHART }}
-          chart_root: ${{ env.CHART_ROOT }}
-          namespace: ${{ env.NAMESPACE }}

.github/workflows/basket-api.yml

@@ -1,24 +1,18 @@
 name: basket-api
 
 on:
-  workflow_dispatch:
   push:
     branches:
     - dev
 
     paths:
-    - src/BuildingBlocks/**
+    - src/BuildingBlocks/*
-    - src/Services/Basket/**
+    - src/Services/Basket/*
     - .github/workflows/basket-api.yml
   
   pull_request:
     branches:
     - dev
-
-    paths:
-    - src/BuildingBlocks/**
-    - src/Services/Basket/**
-    - .github/workflows/basket-api.yml
 env:
   SERVICE: basket-api
   IMAGE: basket.api
@@ -29,24 +23,65 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'pull_request' }}
     steps:
-    - name: Checkout code
+    - name: 'Checkout Github Action'
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
-    - uses: ./.github/workflows/composite/build
+      
-      with:
+    - name: Compose build ${{ env.SERVICE }}
-        service: ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
-        registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
 
   BuildLinux:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'pull_request' }}
     steps:
-    - name: Checkout code
+    - name: 'Checkout Github Action'
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
-    - uses: ./.github/workflows/composite/build-push
+
+    - name: Enable experimental features for the Docker daemon and CLI
+      run: |
+          echo $'{\n  "experimental": true\n}' | sudo tee /etc/docker/daemon.json
+          mkdir -p ~/.docker
+          echo $'{\n  "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
+          sudo service docker restart
+          docker version -f '{{.Client.Experimental}}'
+          docker version -f '{{.Server.Experimental}}'
+
+    - name: Login to Container Registry
+      uses: docker/login-action@v1
       with:
-        service: ${{ env.SERVICE }}
+        registry: ${{ secrets.REGISTRY_HOST }}
-        registry_host: ${{ secrets.REGISTRY_HOST }}
+        username: ${{ secrets.USERNAME }}
-        registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
+        password: ${{ secrets.PASSWORD }}
-        image_name: ${{ env.IMAGE }}
+
-        registry_username: ${{ secrets.USERNAME }}
+    - name: Set branch name as env variable
-        registry_password: ${{ secrets.PASSWORD }}
+      run: |
+        currentbranch=$(echo ${GITHUB_REF##*/})
+        echo "running on $currentbranch"
+        echo "BRANCH=$currentbranch" >> $GITHUB_ENV
+      shell: bash
+
+    - name: Compose build ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
+
+    - name: Compose push ${{ env.SERVICE }}
+      run: sudo -E docker-compose push ${{ env.SERVICE }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
+
+    - name: Create multiarch manifest
+      run: |
+        docker --config ~/.docker manifest create ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }} ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:linux-${{ env.BRANCH  }}
+        docker --config ~/.docker manifest push ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }}
+      shell: bash

.github/workflows/catalog-api-deploy.yml

@@ -1,35 +0,0 @@
-name: Deploy catalog-api
-
-on:
-  workflow_dispatch:
-  repository_dispatch:
-    types:
-    - deploy
-  workflow_run:
-    workflows: ["catalog-api"]
-    branches: [dev]
-    types: [completed]
-
-env:
-  CHART: catalog-api
-  NAMESPACE: eshop
-  CHART_ROOT: deploy/k8s/helm
-
-jobs:
-  deploy-to-k8s:
-    #if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
-    if: false
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: ./.github/workflows/composite/deploy-helm
-        with:
-          azure_credentials: ${{ secrets.AZURE_CREDENTIALS }}
-          cluster_name: ${{ secrets.CLUSTER_NAME }}
-          resource_group: ${{ secrets.RESOURCE_GROUP }}
-          registry_host: ${{ secrets.REGISTRY_HOST }}
-          chart: ${{ env.CHART }}
-          chart_root: ${{ env.CHART_ROOT }}
-          namespace: ${{ env.NAMESPACE }}

.github/workflows/catalog-api.yml

@@ -1,30 +1,21 @@
 name: catalog-api
 
 on:
-  workflow_dispatch:
   push:
     branches:
     - dev
 
     paths:
-    - src/BuildingBlocks/**
+    - src/BuildingBlocks/*
-    - src/Services/Catalog/**
+    - src/Services/Catalog/*
     - .github/workflows/catalog-api.yml
   
   pull_request:
     branches:
     - dev
-    
-    paths:
-    - src/BuildingBlocks/**
-    - src/Services/Catalog/**
-    - .github/workflows/catalog-api.yml
 env:
   SERVICE: catalog-api
   IMAGE: catalog.api
-  DOTNET_VERSION: 7.0.x
-  PROJECT_PATH: Services/Catalog/Catalog.API
-  TESTS_PATH: Services/Catalog/Catalog.UnitTests
 
 jobs:
 
@@ -32,27 +23,65 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'pull_request' }}
     steps:
-    - name: Checkout code
+    - name: 'Checkout Github Action'
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
-    - uses: ./.github/workflows/composite/build-test
+      
-      with:
+    - name: Compose build ${{ env.SERVICE }}
-        service: ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
-        registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
+      working-directory: ./src
-        dotnet_version: ${{ env.DOTNET_VERSION }}
+      shell: bash
-        project_path: ${{ env.PROJECT_PATH }}
+      env:
-        tests_path: ${{ env.TESTS_PATH }}
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
 
   BuildLinux:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'pull_request' }}
     steps:
-    - name: Checkout code
+    - name: 'Checkout Github Action'
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
-    - uses: ./.github/workflows/composite/build-push
+
+    - name: Enable experimental features for the Docker daemon and CLI
+      run: |
+          echo $'{\n  "experimental": true\n}' | sudo tee /etc/docker/daemon.json
+          mkdir -p ~/.docker
+          echo $'{\n  "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
+          sudo service docker restart
+          docker version -f '{{.Client.Experimental}}'
+          docker version -f '{{.Server.Experimental}}'
+
+    - name: Login to Container Registry
+      uses: docker/login-action@v1
       with:
-        service: ${{ env.SERVICE }}
+        registry: ${{ secrets.REGISTRY_HOST }}
-        registry_host: ${{ secrets.REGISTRY_HOST }}
+        username: ${{ secrets.USERNAME }}
-        registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
+        password: ${{ secrets.PASSWORD }}
-        image_name: ${{ env.IMAGE }}
+
-        registry_username: ${{ secrets.USERNAME }}
+    - name: Set branch name as env variable
-        registry_password: ${{ secrets.PASSWORD }}
+      run: |
+        currentbranch=$(echo ${GITHUB_REF##*/})
+        echo "running on $currentbranch"
+        echo "BRANCH=$currentbranch" >> $GITHUB_ENV
+      shell: bash
+
+    - name: Compose build ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
+
+    - name: Compose push ${{ env.SERVICE }}
+      run: sudo -E docker-compose push ${{ env.SERVICE }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
+
+    - name: Create multiarch manifest
+      run: |
+        docker --config ~/.docker manifest create ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }} ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:linux-${{ env.BRANCH  }}
+        docker --config ~/.docker manifest push ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }}
+      shell: bash

.github/workflows/composite/build-push/action.yml

@@ -1,71 +0,0 @@
-name: "Build and push image"
-description: "Builds and pushes an image to a registry"
-
-inputs:
-  service:
-    description: "Service to build"
-    required: true
-  registry_host:
-    description: "Image registry host e.g. myacr.azureacr.io"
-    required: true
-  registry_endpoint:
-    description: "Image registry repo e.g. myacr.azureacr.io/eshop"
-    required: true
-  image_name:
-    description: "Name of image"
-    required: true
-  registry_username:
-    description: "Registry username"
-    required: true
-  registry_password:
-    description: "Registry password"
-    required: true
-  
-runs:
-  using: "composite"
-  steps:
-  - name: Enable experimental features for the Docker daemon and CLI
-    shell: bash
-    run: |
-        echo $'{\n  "experimental": true\n}' | sudo tee /etc/docker/daemon.json
-        mkdir -p ~/.docker
-        echo $'{\n  "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
-        sudo service docker restart
-        docker version -f '{{.Client.Experimental}}'
-        docker version -f '{{.Server.Experimental}}'
-
-  - name: Login to Container Registry
-    uses: docker/login-action@v1
-    with:
-      registry: ${{ inputs.registry_host }}
-      username: ${{ inputs.registry_username }}
-      password: ${{ inputs.registry_password }}
-
-  - name: Set branch name as env variable
-    run: |
-      currentbranch=$(echo ${GITHUB_REF##*/})
-      echo "running on $currentbranch"
-      echo "BRANCH=$currentbranch" >> $GITHUB_ENV
-    shell: bash
-
-  - name: Compose build ${{ inputs.service }}
-    shell: bash
-    run: sudo -E docker-compose build ${{ inputs.service }}
-    working-directory: ./src
-    env:
-      TAG: ${{ env.BRANCH }}
-      REGISTRY: ${{ inputs.registry_endpoint }}
-
-  - name: Compose push ${{ inputs.service }}
-    shell: bash
-    run: sudo -E docker-compose push ${{ inputs.service }}
-    working-directory: ./src
-    env:
-      TAG: ${{ env.BRANCH }}
-      REGISTRY: ${{ inputs.registry_endpoint }}
-
-  - name: Create multiarch manifest
-    shell: bash
-    run: |
-      docker --config ~/.docker manifest create ${{ inputs.registry_endpoint  }}/${{ inputs.image_name }}:${{ env.BRANCH  }} ${{ inputs.registry_endpoint  }}/${{ inputs.image_name  }}:linux-${{ env.BRANCH  }}
-      docker --config ~/.docker manifest push ${{ inputs.registry_endpoint  }}/${{ inputs.image_name }}:${{ env.BRANCH  }}

.github/workflows/composite/build-test/action.yml

@@ -1,47 +0,0 @@
-name: "Build for PRe"
-description: "Builds a docker image without pushing"
-
-inputs:
-  service:
-    description: "Service to build"
-    required: true
-  registry_endpoint:
-    description: "Image registry repo e.g. myacr.azureacr.io/eshop"
-    required: true
-  dotnet_version:
-    description: "Version of dotnet to use for testing"
-    required: true
-  project_path:
-    description: "Path to project to test e.g. Services/Catalog/Catalog.API"
-    required: true
-  tests_path:
-    description: "Path to test project e.g. Services/Catalog/Catalog.UnitTests"
-    required: true
-
-runs:
-  using: "composite"
-  steps:
-  - name: Setup dotnet
-    uses: actions/setup-dotnet@v1
-    with:
-      dotnet-version: ${{ inputs.dotnet_version }}
-
-  - name: Build and run unit tests
-    shell: bash
-    run: |
-      cd src
-      dotnet restore "eShopOnContainers-ServicesAndWebApps.sln"
-      cd ${{ inputs.project_path }}
-      dotnet build --no-restore
-      cd -
-      cd ${{ inputs.tests_path }}
-      dotnet build --no-restore
-      dotnet test --no-build -v=normal
-
-  - name: Compose build ${{ inputs.service }}
-    shell: bash
-    run: sudo -E docker-compose build ${{ inputs.service }}
-    working-directory: ./src
-    env:
-      TAG: ${{ env.BRANCH }}
-      REGISTRY: ${{ inputs.registry_endpoint }}

.github/workflows/composite/build/action.yml

@@ -1,21 +0,0 @@
-name: "Build for PRe"
-description: "Builds a docker image without pushing"
-
-inputs:
-  service:
-    description: "Service to build"
-    required: true
-  registry_endpoint:
-    description: "Image registry repo e.g. myacr.azureacr.io/eshop"
-    required: true
-
-runs:
-  using: "composite"
-  steps:
-  - name: Compose build ${{ inputs.service }}
-    shell: bash
-    run: sudo -E docker-compose build ${{ inputs.service }}
-    working-directory: ./src
-    env:
-      TAG: ${{ env.BRANCH }}
-      REGISTRY: ${{ inputs.registry_endpoint }}

.github/workflows/composite/deploy-helm/action.yml

@@ -1,54 +0,0 @@
-name: "Deploy Helm to AKS"
-description: "Deploys a helm chart to AKS"
-
-inputs:
-  azure_credentials:
-    description: "Credentials to connect to AKS"
-    required: true
-  cluster_name:
-    description: "Name of AKS cluster"
-    required: true
-  resource_group:
-    description: "Resource group of AKS cluster"
-    required: true
-  registry_host:
-    description: "Image registry host e.g. myacr.azureacr.io"
-    required: true
-  chart:
-    description: "Chart name"
-    required: true
-  chart_root:
-    description: "Root folder of chart"
-    required: true
-  namespace:
-    description: "Namespace to deploy to"
-    required: true
-
-runs:
-  using: "composite"
-  steps:
-  - uses: azure/login@v1
-    with:
-      creds: ${{ inputs.azure_credentials }}
-
-  - uses: azure/aks-set-context@v1
-    name: Set AKS context
-    with:
-      creds: '${{ inputs.azure_credentials }}'
-      cluster-name: ${{ inputs.cluster_name }}
-      resource-group: ${{ inputs.resource_group }}
-  
-  - name: Set branch name as env variable
-    shell: bash
-    run: |
-      currentbranch=$(echo ${GITHUB_REF##*/})
-      echo "running on $currentbranch"
-      echo "BRANCH=$currentbranch" >> $GITHUB_ENV
-  
-  - name: Deploy Chart
-    shell: bash
-    run: |
-      ./deploy-chart.sh -c ${{ inputs.chart }} --dns aks --aks-name ${{ inputs.clusteR_name }} --aks-rg ${{ inputs.resource_group }} -r ${{ inputs.registry_host }} -t $TAG --namespace ${{ inputs.namespace }} --acr-connected
-    env:
-      TAG: ${{ env.BRANCH }}
-    working-directory: ${{ inputs.chart_root }}

.github/workflows/identity-api-deploy.yml

@@ -1,35 +0,0 @@
-name: Deploy identity-api
-
-on:
-  workflow_dispatch:
-  repository_dispatch:
-    types:
-    - deploy
-  workflow_run:
-    workflows: ["identity-api"]
-    branches: [dev]
-    types: [completed]
-
-env:
-  CHART: identity-api
-  NAMESPACE: eshop
-  CHART_ROOT: deploy/k8s/helm
-
-jobs:
-  deploy-to-k8s:
-    #if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
-    if: false
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: ./.github/workflows/composite/deploy-helm
-        with:
-          azure_credentials: ${{ secrets.AZURE_CREDENTIALS }}
-          cluster_name: ${{ secrets.CLUSTER_NAME }}
-          resource_group: ${{ secrets.RESOURCE_GROUP }}
-          registry_host: ${{ secrets.REGISTRY_HOST }}
-          chart: ${{ env.CHART }}
-          chart_root: ${{ env.CHART_ROOT }}
-          namespace: ${{ env.NAMESPACE }}

.github/workflows/identity-api.yml

@@ -1,24 +1,18 @@
 name: identity-api
 
 on:
-  workflow_dispatch:
   push:
     branches:
     - dev
 
     paths:
-    - src/BuildingBlocks/**
+    - src/BuildingBlocks/*
-    - src/Services/Identity/**
+    - src/Services/Identity/*
     - .github/workflows/identity-api.yml
   
   pull_request:
     branches:
     - dev
-
-    paths:
-    - src/BuildingBlocks/**
-    - src/Services/Identity/**
-    - .github/workflows/identity-api.yml
 env:
   SERVICE: identity-api
   IMAGE: identity.api
@@ -29,24 +23,65 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'pull_request' }}
     steps:
-    - name: Checkout code
+    - name: 'Checkout Github Action'
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
-    - uses: ./.github/workflows/composite/build
+      
-      with:
+    - name: Compose build ${{ env.SERVICE }}
-        service: ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
-        registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
 
   BuildLinux:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'pull_request' }}
     steps:
-    - name: Checkout code
+    - name: 'Checkout Github Action'
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
-    - uses: ./.github/workflows/composite/build-push
+
+    - name: Enable experimental features for the Docker daemon and CLI
+      run: |
+          echo $'{\n  "experimental": true\n}' | sudo tee /etc/docker/daemon.json
+          mkdir -p ~/.docker
+          echo $'{\n  "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
+          sudo service docker restart
+          docker version -f '{{.Client.Experimental}}'
+          docker version -f '{{.Server.Experimental}}'
+
+    - name: Login to Container Registry
+      uses: docker/login-action@v1
       with:
-        service: ${{ env.SERVICE }}
+        registry: ${{ secrets.REGISTRY_HOST }}
-        registry_host: ${{ secrets.REGISTRY_HOST }}
+        username: ${{ secrets.USERNAME }}
-        registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
+        password: ${{ secrets.PASSWORD }}
-        image_name: ${{ env.IMAGE }}
+
-        registry_username: ${{ secrets.USERNAME }}
+    - name: Set branch name as env variable
-        registry_password: ${{ secrets.PASSWORD }}
+      run: |
+        currentbranch=$(echo ${GITHUB_REF##*/})
+        echo "running on $currentbranch"
+        echo "BRANCH=$currentbranch" >> $GITHUB_ENV
+      shell: bash
+
+    - name: Compose build ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
+
+    - name: Compose push ${{ env.SERVICE }}
+      run: sudo -E docker-compose push ${{ env.SERVICE }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
+
+    - name: Create multiarch manifest
+      run: |
+        docker --config ~/.docker manifest create ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }} ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:linux-${{ env.BRANCH  }}
+        docker --config ~/.docker manifest push ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }}
+      shell: bash

.github/workflows/mobileshoppingagg-deploy.yml

@@ -1,35 +0,0 @@
-name: Deploy mobileshoppingagg
-
-on:
-  workflow_dispatch:
-  repository_dispatch:
-    types:
-    - deploy
-  workflow_run:
-    workflows: ["mobileshoppingagg"]
-    branches: [dev]
-    types: [completed]
-
-env:
-  CHART: mobileshoppingagg
-  NAMESPACE: eshop
-  CHART_ROOT: deploy/k8s/helm
-
-jobs:
-  deploy-to-k8s:
-    #if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
-    if: false
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: ./.github/workflows/composite/deploy-helm
-        with:
-          azure_credentials: ${{ secrets.AZURE_CREDENTIALS }}
-          cluster_name: ${{ secrets.CLUSTER_NAME }}
-          resource_group: ${{ secrets.RESOURCE_GROUP }}
-          registry_host: ${{ secrets.REGISTRY_HOST }}
-          chart: ${{ env.CHART }}
-          chart_root: ${{ env.CHART_ROOT }}
-          namespace: ${{ env.NAMESPACE }}

.github/workflows/mobileshoppingagg.yml

@@ -1,22 +1,17 @@
 name: mobileshoppingagg
 
 on:
-  workflow_dispatch:
   push:
     branches:
     - dev
 
     paths:
-    - src/ApiGateways/Mobile.Bff.Shopping/aggregator/**
+    - src/ApiGateways/Mobile.Bff.Shopping/aggregator/*
     - .github/workflows/mobileshoppingagg.yml
   
   pull_request:
     branches:
     - dev
-
-    paths:
-    - src/ApiGateways/Mobile.Bff.Shopping/aggregator/**
-    - .github/workflows/mobileshoppingagg.yml
 env:
   SERVICE: mobileshoppingagg
   IMAGE: mobileshoppingagg
@@ -27,24 +22,65 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'pull_request' }}
     steps:
-    - name: Checkout code
+    - name: 'Checkout Github Action'
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
-    - uses: ./.github/workflows/composite/build
+      
-      with:
+    - name: Compose build ${{ env.SERVICE }}
-        service: ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
-        registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
 
   BuildLinux:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'pull_request' }}
     steps:
-    - name: Checkout code
+    - name: 'Checkout Github Action'
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
-    - uses: ./.github/workflows/composite/build-push
+
+    - name: Enable experimental features for the Docker daemon and CLI
+      run: |
+          echo $'{\n  "experimental": true\n}' | sudo tee /etc/docker/daemon.json
+          mkdir -p ~/.docker
+          echo $'{\n  "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
+          sudo service docker restart
+          docker version -f '{{.Client.Experimental}}'
+          docker version -f '{{.Server.Experimental}}'
+
+    - name: Login to Container Registry
+      uses: docker/login-action@v1
       with:
-        service: ${{ env.SERVICE }}
+        registry: ${{ secrets.REGISTRY_HOST }}
-        registry_host: ${{ secrets.REGISTRY_HOST }}
+        username: ${{ secrets.USERNAME }}
-        registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
+        password: ${{ secrets.PASSWORD }}
-        image_name: ${{ env.IMAGE }}
+
-        registry_username: ${{ secrets.USERNAME }}
+    - name: Set branch name as env variable
-        registry_password: ${{ secrets.PASSWORD }}
+      run: |
+        currentbranch=$(echo ${GITHUB_REF##*/})
+        echo "running on $currentbranch"
+        echo "BRANCH=$currentbranch" >> $GITHUB_ENV
+      shell: bash
+
+    - name: Compose build ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
+
+    - name: Compose push ${{ env.SERVICE }}
+      run: sudo -E docker-compose push ${{ env.SERVICE }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
+
+    - name: Create multiarch manifest
+      run: |
+        docker --config ~/.docker manifest create ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }} ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:linux-${{ env.BRANCH  }}
+        docker --config ~/.docker manifest push ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }}
+      shell: bash

.github/workflows/ordering-api-deploy.yml

@@ -1,35 +0,0 @@
-name: Deploy ordering-api
-
-on:
-  workflow_dispatch:
-  repository_dispatch:
-    types:
-    - deploy
-  workflow_run:
-    workflows: ["ordering-api"]
-    branches: [dev]
-    types: [completed]
-
-env:
-  CHART: ordering-api
-  NAMESPACE: eshop
-  CHART_ROOT: deploy/k8s/helm
-
-jobs:
-  deploy-to-k8s:
-    #if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
-    if: false
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: ./.github/workflows/composite/deploy-helm
-        with:
-          azure_credentials: ${{ secrets.AZURE_CREDENTIALS }}
-          cluster_name: ${{ secrets.CLUSTER_NAME }}
-          resource_group: ${{ secrets.RESOURCE_GROUP }}
-          registry_host: ${{ secrets.REGISTRY_HOST }}
-          chart: ${{ env.CHART }}
-          chart_root: ${{ env.CHART_ROOT }}
-          namespace: ${{ env.NAMESPACE }}

.github/workflows/ordering-api.yml

@@ -1,30 +1,21 @@
 name: ordering-api
 
 on:
-  workflow_dispatch:
   push:
     branches:
     - dev
 
     paths:
-    - src/BuildingBlocks/**
+    - src/BuildingBlocks/*
-    - src/Services/Ordering/**
+    - src/Services/Ordering/*
     - .github/workflows/ordering-api.yml
   
   pull_request:
     branches:
     - dev
-
-    paths:
-    - src/BuildingBlocks/**
-    - src/Services/Ordering/**
-    - .github/workflows/ordering-api.yml
 env:
   SERVICE: ordering-api
   IMAGE: ordering.api
-  DOTNET_VERSION: 7.0.x
-  PROJECT_PATH: Services/Ordering/Ordering.API
-  TESTS_PATH: Services/Ordering/Ordering.UnitTests
 
 jobs:
 
@@ -32,27 +23,65 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'pull_request' }}
     steps:
-    - name: Checkout code
+    - name: 'Checkout Github Action'
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
-    - uses: ./.github/workflows/composite/build-test
+      
-      with:
+    - name: Compose build ${{ env.SERVICE }}
-        service: ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
-        registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
+      working-directory: ./src
-        dotnet_version: ${{ env.DOTNET_VERSION }}
+      shell: bash
-        project_path: ${{ env.PROJECT_PATH }}
+      env:
-        tests_path: ${{ env.TESTS_PATH }}
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
 
   BuildLinux:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'pull_request' }}
     steps:
-    - name: Checkout code
+    - name: 'Checkout Github Action'
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
-    - uses: ./.github/workflows/composite/build-push
+
+    - name: Enable experimental features for the Docker daemon and CLI
+      run: |
+          echo $'{\n  "experimental": true\n}' | sudo tee /etc/docker/daemon.json
+          mkdir -p ~/.docker
+          echo $'{\n  "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
+          sudo service docker restart
+          docker version -f '{{.Client.Experimental}}'
+          docker version -f '{{.Server.Experimental}}'
+
+    - name: Login to Container Registry
+      uses: docker/login-action@v1
       with:
-        service: ${{ env.SERVICE }}
+        registry: ${{ secrets.REGISTRY_HOST }}
-        registry_host: ${{ secrets.REGISTRY_HOST }}
+        username: ${{ secrets.USERNAME }}
-        registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
+        password: ${{ secrets.PASSWORD }}
-        image_name: ${{ env.IMAGE }}
+
-        registry_username: ${{ secrets.USERNAME }}
+    - name: Set branch name as env variable
-        registry_password: ${{ secrets.PASSWORD }}
+      run: |
+        currentbranch=$(echo ${GITHUB_REF##*/})
+        echo "running on $currentbranch"
+        echo "BRANCH=$currentbranch" >> $GITHUB_ENV
+      shell: bash
+
+    - name: Compose build ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
+
+    - name: Compose push ${{ env.SERVICE }}
+      run: sudo -E docker-compose push ${{ env.SERVICE }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
+
+    - name: Create multiarch manifest
+      run: |
+        docker --config ~/.docker manifest create ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }} ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:linux-${{ env.BRANCH  }}
+        docker --config ~/.docker manifest push ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }}
+      shell: bash

.github/workflows/ordering-backgroundtasks-deploy.yml

@@ -1,35 +0,0 @@
-name: Deploy ordering-backgroundtasks
-
-on:
-  workflow_dispatch:
-  repository_dispatch:
-    types:
-    - deploy
-  workflow_run:
-    workflows: ["ordering-backgroundtasks"]
-    branches: [dev]
-    types: [completed]
-
-env:
-  CHART: ordering-backgroundtasks
-  NAMESPACE: eshop
-  CHART_ROOT: deploy/k8s/helm
-
-jobs:
-  deploy-to-k8s:
-    #if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
-    if: false
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: ./.github/workflows/composite/deploy-helm
-        with:
-          azure_credentials: ${{ secrets.AZURE_CREDENTIALS }}
-          cluster_name: ${{ secrets.CLUSTER_NAME }}
-          resource_group: ${{ secrets.RESOURCE_GROUP }}
-          registry_host: ${{ secrets.REGISTRY_HOST }}
-          chart: ${{ env.CHART }}
-          chart_root: ${{ env.CHART_ROOT }}
-          namespace: ${{ env.NAMESPACE }}

.github/workflows/ordering-backgroundtasks.yml

@@ -1,24 +1,18 @@
 name: ordering-backgroundtasks
 
 on:
-  workflow_dispatch:
   push:
     branches:
     - dev
 
     paths:
-    - src/BuildingBlocks/**
+    - src/BuildingBlocks/*
-    - src/Services/Ordering/**
+    - src/Services/Ordering/*
     - .github/workflows/ordering-backgroundtasks.yml
   
   pull_request:
     branches:
     - dev
-
-    paths:
-    - src/BuildingBlocks/**
-    - src/Services/Ordering/**
-    - .github/workflows/ordering-backgroundtasks.yml
 env:
   SERVICE: ordering-backgroundtasks
   IMAGE: ordering.backgroundtasks
@@ -29,24 +23,65 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'pull_request' }}
     steps:
-    - name: Checkout code
+    - name: 'Checkout Github Action'
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
-    - uses: ./.github/workflows/composite/build
+      
-      with:
+    - name: Compose build ${{ env.SERVICE }}
-        service: ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
-        registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
 
   BuildLinux:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'pull_request' }}
     steps:
-    - name: Checkout code
+    - name: 'Checkout Github Action'
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
-    - uses: ./.github/workflows/composite/build-push
+
+    - name: Enable experimental features for the Docker daemon and CLI
+      run: |
+          echo $'{\n  "experimental": true\n}' | sudo tee /etc/docker/daemon.json
+          mkdir -p ~/.docker
+          echo $'{\n  "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
+          sudo service docker restart
+          docker version -f '{{.Client.Experimental}}'
+          docker version -f '{{.Server.Experimental}}'
+
+    - name: Login to Container Registry
+      uses: docker/login-action@v1
       with:
-        service: ${{ env.SERVICE }}
+        registry: ${{ secrets.REGISTRY_HOST }}
-        registry_host: ${{ secrets.REGISTRY_HOST }}
+        username: ${{ secrets.USERNAME }}
-        registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
+        password: ${{ secrets.PASSWORD }}
-        image_name: ${{ env.IMAGE }}
+
-        registry_username: ${{ secrets.USERNAME }}
+    - name: Set branch name as env variable
-        registry_password: ${{ secrets.PASSWORD }}
+      run: |
+        currentbranch=$(echo ${GITHUB_REF##*/})
+        echo "running on $currentbranch"
+        echo "BRANCH=$currentbranch" >> $GITHUB_ENV
+      shell: bash
+
+    - name: Compose build ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
+
+    - name: Compose push ${{ env.SERVICE }}
+      run: sudo -E docker-compose push ${{ env.SERVICE }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
+
+    - name: Create multiarch manifest
+      run: |
+        docker --config ~/.docker manifest create ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }} ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:linux-${{ env.BRANCH  }}
+        docker --config ~/.docker manifest push ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }}
+      shell: bash

.github/workflows/ordering-signalrhub-deploy.yml

@@ -1,35 +0,0 @@
-name: Deploy ordering-signalrhub
-
-on:
-  workflow_dispatch:
-  repository_dispatch:
-    types:
-    - deploy
-  workflow_run:
-    workflows: ["ordering-signalrhub"]
-    branches: [dev]
-    types: [completed]
-
-env:
-  CHART: ordering-signalrhub
-  NAMESPACE: eshop
-  CHART_ROOT: deploy/k8s/helm
-
-jobs:
-  deploy-to-k8s:
-    #if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
-    if: false
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: ./.github/workflows/composite/deploy-helm
-        with:
-          azure_credentials: ${{ secrets.AZURE_CREDENTIALS }}
-          cluster_name: ${{ secrets.CLUSTER_NAME }}
-          resource_group: ${{ secrets.RESOURCE_GROUP }}
-          registry_host: ${{ secrets.REGISTRY_HOST }}
-          chart: ${{ env.CHART }}
-          chart_root: ${{ env.CHART_ROOT }}
-          namespace: ${{ env.NAMESPACE }}

.github/workflows/ordering-signalrhub.yml

@@ -1,24 +1,18 @@
 name: ordering-signalrhub
 
 on:
-  workflow_dispatch:
   push:
     branches:
     - dev
 
     paths:
-    - src/BuildingBlocks/**
+    - src/BuildingBlocks/*
-    - src/Services/Ordering/**
+    - src/Services/Ordering/*
     - .github/workflows/ordering-signalrhub.yml
   
   pull_request:
     branches:
     - dev
-
-    paths:
-    - src/BuildingBlocks/**
-    - src/Services/Ordering/**
-    - .github/workflows/ordering-signalrhub.yml
 env:
   SERVICE: ordering-signalrhub
   IMAGE: ordering.signalrhub
@@ -29,24 +23,65 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'pull_request' }}
     steps:
-    - name: Checkout code
+    - name: 'Checkout Github Action'
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
-    - uses: ./.github/workflows/composite/build
+      
-      with:
+    - name: Compose build ${{ env.SERVICE }}
-        service: ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
-        registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
 
   BuildLinux:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'pull_request' }}
     steps:
-    - name: Checkout code
+    - name: 'Checkout Github Action'
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
-    - uses: ./.github/workflows/composite/build-push
+
+    - name: Enable experimental features for the Docker daemon and CLI
+      run: |
+          echo $'{\n  "experimental": true\n}' | sudo tee /etc/docker/daemon.json
+          mkdir -p ~/.docker
+          echo $'{\n  "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
+          sudo service docker restart
+          docker version -f '{{.Client.Experimental}}'
+          docker version -f '{{.Server.Experimental}}'
+
+    - name: Login to Container Registry
+      uses: docker/login-action@v1
       with:
-        service: ${{ env.SERVICE }}
+        registry: ${{ secrets.REGISTRY_HOST }}
-        registry_host: ${{ secrets.REGISTRY_HOST }}
+        username: ${{ secrets.USERNAME }}
-        registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
+        password: ${{ secrets.PASSWORD }}
-        image_name: ${{ env.IMAGE }}
+
-        registry_username: ${{ secrets.USERNAME }}
+    - name: Set branch name as env variable
-        registry_password: ${{ secrets.PASSWORD }}
+      run: |
+        currentbranch=$(echo ${GITHUB_REF##*/})
+        echo "running on $currentbranch"
+        echo "BRANCH=$currentbranch" >> $GITHUB_ENV
+      shell: bash
+
+    - name: Compose build ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
+
+    - name: Compose push ${{ env.SERVICE }}
+      run: sudo -E docker-compose push ${{ env.SERVICE }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
+
+    - name: Create multiarch manifest
+      run: |
+        docker --config ~/.docker manifest create ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }} ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:linux-${{ env.BRANCH  }}
+        docker --config ~/.docker manifest push ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }}
+      shell: bash

.github/workflows/payment-api-deploy.yml

@@ -1,35 +0,0 @@
-name: Deploy payment-api
-
-on:
-  workflow_dispatch:
-  repository_dispatch:
-    types:
-    - deploy
-  workflow_run:
-    workflows: ["payment-api"]
-    branches: [dev]
-    types: [completed]
-
-env:
-  CHART: payment-api
-  NAMESPACE: eshop
-  CHART_ROOT: deploy/k8s/helm
-
-jobs:
-  deploy-to-k8s:
-    #if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
-    if: false
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: ./.github/workflows/composite/deploy-helm
-        with:
-          azure_credentials: ${{ secrets.AZURE_CREDENTIALS }}
-          cluster_name: ${{ secrets.CLUSTER_NAME }}
-          resource_group: ${{ secrets.RESOURCE_GROUP }}
-          registry_host: ${{ secrets.REGISTRY_HOST }}
-          chart: ${{ env.CHART }}
-          chart_root: ${{ env.CHART_ROOT }}
-          namespace: ${{ env.NAMESPACE }}

.github/workflows/payment-api.yml

@@ -1,24 +1,18 @@
 name: payment-api
 
 on:
-  workflow_dispatch:
   push:
     branches:
     - dev
 
     paths:
-    - src/BuildingBlocks/**
+    - src/BuildingBlocks/*
-    - src/Services/Payment/**
+    - src/Services/Payment/*
     - .github/workflows/payment-api.yml
   
   pull_request:
     branches:
     - dev
-
-    paths:
-    - src/BuildingBlocks/**
-    - src/Services/Payment/**
-    - .github/workflows/payment-api.yml
 env:
   SERVICE: payment-api
   IMAGE: payment.api
@@ -29,24 +23,65 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'pull_request' }}
     steps:
-    - name: Checkout code
+    - name: 'Checkout Github Action'
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
-    - uses: ./.github/workflows/composite/build
+      
-      with:
+    - name: Compose build ${{ env.SERVICE }}
-        service: ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
-        registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
 
   BuildLinux:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'pull_request' }}
     steps:
-    - name: Checkout code
+    - name: 'Checkout Github Action'
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
-    - uses: ./.github/workflows/composite/build-push
+
+    - name: Enable experimental features for the Docker daemon and CLI
+      run: |
+          echo $'{\n  "experimental": true\n}' | sudo tee /etc/docker/daemon.json
+          mkdir -p ~/.docker
+          echo $'{\n  "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
+          sudo service docker restart
+          docker version -f '{{.Client.Experimental}}'
+          docker version -f '{{.Server.Experimental}}'
+
+    - name: Login to Container Registry
+      uses: docker/login-action@v1
       with:
-        service: ${{ env.SERVICE }}
+        registry: ${{ secrets.REGISTRY_HOST }}
-        registry_host: ${{ secrets.REGISTRY_HOST }}
+        username: ${{ secrets.USERNAME }}
-        registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
+        password: ${{ secrets.PASSWORD }}
-        image_name: ${{ env.IMAGE }}
+
-        registry_username: ${{ secrets.USERNAME }}
+    - name: Set branch name as env variable
-        registry_password: ${{ secrets.PASSWORD }}
+      run: |
+        currentbranch=$(echo ${GITHUB_REF##*/})
+        echo "running on $currentbranch"
+        echo "BRANCH=$currentbranch" >> $GITHUB_ENV
+      shell: bash
+
+    - name: Compose build ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
+
+    - name: Compose push ${{ env.SERVICE }}
+      run: sudo -E docker-compose push ${{ env.SERVICE }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
+
+    - name: Create multiarch manifest
+      run: |
+        docker --config ~/.docker manifest create ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }} ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:linux-${{ env.BRANCH  }}
+        docker --config ~/.docker manifest push ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }}
+      shell: bash

.github/workflows/webhooks-api-deploy.yml

@@ -1,35 +0,0 @@
-name: Deploy webhooks-api
-
-on:
-  workflow_dispatch:
-  repository_dispatch:
-    types:
-    - deploy
-  workflow_run:
-    workflows: ["webhooks-api"]
-    branches: [dev]
-    types: [completed]
-
-env:
-  CHART: webhooks-api
-  NAMESPACE: eshop
-  CHART_ROOT: deploy/k8s/helm
-
-jobs:
-  deploy-to-k8s:
-    #if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
-    if: false
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: ./.github/workflows/composite/deploy-helm
-        with:
-          azure_credentials: ${{ secrets.AZURE_CREDENTIALS }}
-          cluster_name: ${{ secrets.CLUSTER_NAME }}
-          resource_group: ${{ secrets.RESOURCE_GROUP }}
-          registry_host: ${{ secrets.REGISTRY_HOST }}
-          chart: ${{ env.CHART }}
-          chart_root: ${{ env.CHART_ROOT }}
-          namespace: ${{ env.NAMESPACE }}

.github/workflows/webhooks-api.yml

@@ -1,24 +1,18 @@
 name: webhooks-api
 
 on:
-  workflow_dispatch:
   push:
     branches:
     - dev
 
     paths:
-    - src/BuildingBlocks/**
+    - src/BuildingBlocks/*
-    - src/Services/Webhooks/**
+    - src/Services/Webhooks/*
     - .github/workflows/webhooks-api.yml
   
   pull_request:
     branches:
     - dev
-    
-    paths:
-    - src/BuildingBlocks/**
-    - src/Services/Webhooks/**
-    - .github/workflows/webhooks-api.yml
 env:
   SERVICE: webhooks-api
   IMAGE: webhooks.api
@@ -29,24 +23,65 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'pull_request' }}
     steps:
-    - name: Checkout code
+    - name: 'Checkout Github Action'
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
-    - uses: ./.github/workflows/composite/build
+      
-      with:
+    - name: Compose build ${{ env.SERVICE }}
-        service: ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
-        registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
 
   BuildLinux:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'pull_request' }}
     steps:
-    - name: Checkout code
+    - name: 'Checkout Github Action'
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
-    - uses: ./.github/workflows/composite/build-push
+
+    - name: Enable experimental features for the Docker daemon and CLI
+      run: |
+          echo $'{\n  "experimental": true\n}' | sudo tee /etc/docker/daemon.json
+          mkdir -p ~/.docker
+          echo $'{\n  "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
+          sudo service docker restart
+          docker version -f '{{.Client.Experimental}}'
+          docker version -f '{{.Server.Experimental}}'
+
+    - name: Login to Container Registry
+      uses: docker/login-action@v1
       with:
-        service: ${{ env.SERVICE }}
+        registry: ${{ secrets.REGISTRY_HOST }}
-        registry_host: ${{ secrets.REGISTRY_HOST }}
+        username: ${{ secrets.USERNAME }}
-        registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
+        password: ${{ secrets.PASSWORD }}
-        image_name: ${{ env.IMAGE }}
+
-        registry_username: ${{ secrets.USERNAME }}
+    - name: Set branch name as env variable
-        registry_password: ${{ secrets.PASSWORD }}
+      run: |
+        currentbranch=$(echo ${GITHUB_REF##*/})
+        echo "running on $currentbranch"
+        echo "BRANCH=$currentbranch" >> $GITHUB_ENV
+      shell: bash
+
+    - name: Compose build ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
+
+    - name: Compose push ${{ env.SERVICE }}
+      run: sudo -E docker-compose push ${{ env.SERVICE }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
+
+    - name: Create multiarch manifest
+      run: |
+        docker --config ~/.docker manifest create ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }} ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:linux-${{ env.BRANCH  }}
+        docker --config ~/.docker manifest push ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }}
+      shell: bash

.github/workflows/webhooks-client.yml

@@ -1,24 +1,18 @@
 name: webhooks-client
 
 on:
-  workflow_dispatch:
   push:
     branches:
     - dev
 
     paths:
-    - src/BuildingBlocks/**
+    - src/BuildingBlocks/*
-    - src/Web/WebhookClient/**
+    - src/Web/WebhookClient/*
     - .github/workflows/webhooks-client.yml
   
   pull_request:
     branches:
     - dev
-
-    paths:
-    - src/BuildingBlocks/**
-    - src/Web/WebhookClient/**
-    - .github/workflows/webhooks-client.yml
 env:
   SERVICE: webhooks-client
   IMAGE: webhooks.client
@@ -29,24 +23,65 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'pull_request' }}
     steps:
-    - name: Checkout code
+    - name: 'Checkout Github Action'
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
-    - uses: ./.github/workflows/composite/build
+      
-      with:
+    - name: Compose build ${{ env.SERVICE }}
-        service: ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
-        registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
 
   BuildLinux:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'pull_request' }}
     steps:
-    - name: Checkout code
+    - name: 'Checkout Github Action'
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
-    - uses: ./.github/workflows/composite/build-push
+
+    - name: Enable experimental features for the Docker daemon and CLI
+      run: |
+          echo $'{\n  "experimental": true\n}' | sudo tee /etc/docker/daemon.json
+          mkdir -p ~/.docker
+          echo $'{\n  "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
+          sudo service docker restart
+          docker version -f '{{.Client.Experimental}}'
+          docker version -f '{{.Server.Experimental}}'
+
+    - name: Login to Container Registry
+      uses: docker/login-action@v1
       with:
-        service: ${{ env.SERVICE }}
+        registry: ${{ secrets.REGISTRY_HOST }}
-        registry_host: ${{ secrets.REGISTRY_HOST }}
+        username: ${{ secrets.USERNAME }}
-        registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
+        password: ${{ secrets.PASSWORD }}
-        image_name: ${{ env.IMAGE }}
+
-        registry_username: ${{ secrets.USERNAME }}
+    - name: Set branch name as env variable
-        registry_password: ${{ secrets.PASSWORD }}
+      run: |
+        currentbranch=$(echo ${GITHUB_REF##*/})
+        echo "running on $currentbranch"
+        echo "BRANCH=$currentbranch" >> $GITHUB_ENV
+      shell: bash
+
+    - name: Compose build ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
+
+    - name: Compose push ${{ env.SERVICE }}
+      run: sudo -E docker-compose push ${{ env.SERVICE }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
+
+    - name: Create multiarch manifest
+      run: |
+        docker --config ~/.docker manifest create ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }} ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:linux-${{ env.BRANCH  }}
+        docker --config ~/.docker manifest push ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }}
+      shell: bash

.github/workflows/webmvc-deploy.yml

@@ -1,39 +0,0 @@
-name: Deploy webmvc
-
-on:
-  workflow_dispatch:
-  repository_dispatch:
-    types:
-    - deploy
-  workflow_run:
-    workflows: ["webmvc"]
-    branches: [dev]
-    types: [completed]
-
-env:
-  CHART: webmvc
-  NAMESPACE: eshop
-  CHART_ROOT: deploy/k8s/helm
-
-jobs:
-  deploy-to-k8s:
-    #if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
-    if: false
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: azure/login@v1
-        with:
-          creds: ${{ secrets.AZURE_CREDENTIALS }}
-
-      - uses: ./.github/workflows/composite/deploy-helm
-        with:
-          azure_credentials: ${{ secrets.AZURE_CREDENTIALS }}
-          cluster_name: ${{ secrets.CLUSTER_NAME }}
-          resource_group: ${{ secrets.RESOURCE_GROUP }}
-          registry_host: ${{ secrets.REGISTRY_HOST }}
-          chart: ${{ env.CHART }}
-          chart_root: ${{ env.CHART_ROOT }}
-          namespace: ${{ env.NAMESPACE }}

.github/workflows/webmvc.yml

@@ -1,25 +1,18 @@
 name: webmvc
 
 on:
-  workflow_dispatch:
   push:
     branches:
     - dev
 
     paths:
-    - src/BuildingBlocks/**
+    - src/BuildingBlocks/*
-    - src/Web/WebMVC/**
+    - src/Web/WebMVC/*
     - .github/workflows/webmvc.yml
   
   pull_request:
     branches:
     - dev
-    paths:
-    
-    - src/BuildingBlocks/**
-    - src/Web/WebMVC/**
-    - .github/workflows/webmvc.yml
-
 env:
   SERVICE: webmvc
   IMAGE: webmvc
@@ -30,24 +23,65 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'pull_request' }}
     steps:
-    - name: Checkout code
+    - name: 'Checkout Github Action'
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
-    - uses: ./.github/workflows/composite/build
+      
-      with:
+    - name: Compose build ${{ env.SERVICE }}
-        service: ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
-        registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
 
   BuildLinux:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'pull_request' }}
     steps:
-    - name: Checkout code
+    - name: 'Checkout Github Action'
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
-    - uses: ./.github/workflows/composite/build-push
+
+    - name: Enable experimental features for the Docker daemon and CLI
+      run: |
+          echo $'{\n  "experimental": true\n}' | sudo tee /etc/docker/daemon.json
+          mkdir -p ~/.docker
+          echo $'{\n  "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
+          sudo service docker restart
+          docker version -f '{{.Client.Experimental}}'
+          docker version -f '{{.Server.Experimental}}'
+
+    - name: Login to Container Registry
+      uses: docker/login-action@v1
       with:
-        service: ${{ env.SERVICE }}
+        registry: ${{ secrets.REGISTRY_HOST }}
-        registry_host: ${{ secrets.REGISTRY_HOST }}
+        username: ${{ secrets.USERNAME }}
-        registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
+        password: ${{ secrets.PASSWORD }}
-        image_name: ${{ env.IMAGE }}
+
-        registry_username: ${{ secrets.USERNAME }}
+    - name: Set branch name as env variable
-        registry_password: ${{ secrets.PASSWORD }}
+      run: |
+        currentbranch=$(echo ${GITHUB_REF##*/})
+        echo "running on $currentbranch"
+        echo "BRANCH=$currentbranch" >> $GITHUB_ENV
+      shell: bash
+
+    - name: Compose build ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
+
+    - name: Compose push ${{ env.SERVICE }}
+      run: sudo -E docker-compose push ${{ env.SERVICE }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
+
+    - name: Create multiarch manifest
+      run: |
+        docker --config ~/.docker manifest create ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }} ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:linux-${{ env.BRANCH  }}
+        docker --config ~/.docker manifest push ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }}
+      shell: bash

.github/workflows/webshoppingagg-deploy.yml

@@ -1,35 +0,0 @@
-name: Deploy webshoppingagg
-
-on:
-  workflow_dispatch:
-  repository_dispatch:
-    types:
-    - deploy
-  workflow_run:
-    workflows: ["webshoppingagg"]
-    branches: [dev]
-    types: [completed]
-
-env:
-  CHART: webshoppingagg
-  NAMESPACE: eshop
-  CHART_ROOT: deploy/k8s/helm
-
-jobs:
-  deploy-to-k8s:
-    #if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
-    if: false
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: ./.github/workflows/composite/deploy-helm
-        with:
-          azure_credentials: ${{ secrets.AZURE_CREDENTIALS }}
-          cluster_name: ${{ secrets.CLUSTER_NAME }}
-          resource_group: ${{ secrets.RESOURCE_GROUP }}
-          registry_host: ${{ secrets.REGISTRY_HOST }}
-          chart: ${{ env.CHART }}
-          chart_root: ${{ env.CHART_ROOT }}
-          namespace: ${{ env.NAMESPACE }}

.github/workflows/webshoppingagg.yml

@@ -1,22 +1,17 @@
 name: webshoppingagg
 
 on:
-  workflow_dispatch:
   push:
     branches:
     - dev
 
     paths:
-    - src/ApiGateways/Web.Bff.Shopping/aggregator/**
+    - src/ApiGateways/Web.Bff.Shopping/aggregator/*
     - .github/workflows/webshoppingagg.yml
   
   pull_request:
     branches:
     - dev
-
-    paths:
-    - src/ApiGateways/Web.Bff.Shopping/aggregator/**
-    - .github/workflows/webshoppingagg.yml
 env:
   SERVICE: webshoppingagg
   IMAGE: webshoppingagg
@@ -27,24 +22,65 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'pull_request' }}
     steps:
-    - name: Checkout code
+    - name: 'Checkout Github Action'
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
-    - uses: ./.github/workflows/composite/build
+      
-      with:
+    - name: Compose build ${{ env.SERVICE }}
-        service: ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
-        registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
 
   BuildLinux:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'pull_request' }}
     steps:
-    - name: Checkout code
+    - name: 'Checkout Github Action'
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
-    - uses: ./.github/workflows/composite/build-push
+
+    - name: Enable experimental features for the Docker daemon and CLI
+      run: |
+          echo $'{\n  "experimental": true\n}' | sudo tee /etc/docker/daemon.json
+          mkdir -p ~/.docker
+          echo $'{\n  "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
+          sudo service docker restart
+          docker version -f '{{.Client.Experimental}}'
+          docker version -f '{{.Server.Experimental}}'
+
+    - name: Login to Container Registry
+      uses: docker/login-action@v1
       with:
-        service: ${{ env.SERVICE }}
+        registry: ${{ secrets.REGISTRY_HOST }}
-        registry_host: ${{ secrets.REGISTRY_HOST }}
+        username: ${{ secrets.USERNAME }}
-        registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
+        password: ${{ secrets.PASSWORD }}
-        image_name: ${{ env.IMAGE }}
+
-        registry_username: ${{ secrets.USERNAME }}
+    - name: Set branch name as env variable
-        registry_password: ${{ secrets.PASSWORD }}
+      run: |
+        currentbranch=$(echo ${GITHUB_REF##*/})
+        echo "running on $currentbranch"
+        echo "BRANCH=$currentbranch" >> $GITHUB_ENV
+      shell: bash
+
+    - name: Compose build ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
+
+    - name: Compose push ${{ env.SERVICE }}
+      run: sudo -E docker-compose push ${{ env.SERVICE }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
+
+    - name: Create multiarch manifest
+      run: |
+        docker --config ~/.docker manifest create ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }} ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:linux-${{ env.BRANCH  }}
+        docker --config ~/.docker manifest push ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }}
+      shell: bash

.github/workflows/webspa-deploy.yml

@@ -1,35 +0,0 @@
-name: Deploy webspa
-
-on:
-  workflow_dispatch:
-  repository_dispatch:
-    types:
-    - deploy
-  workflow_run:
-    workflows: ["webspa"]
-    branches: [dev]
-    types: [completed]
-
-env:
-  CHART: webspa
-  NAMESPACE: eshop
-  CHART_ROOT: deploy/k8s/helm
-
-jobs:
-  deploy-to-k8s:
-    #if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
-    if: false
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: ./.github/workflows/composite/deploy-helm
-        with:
-          azure_credentials: ${{ secrets.AZURE_CREDENTIALS }}
-          cluster_name: ${{ secrets.CLUSTER_NAME }}
-          resource_group: ${{ secrets.RESOURCE_GROUP }}
-          registry_host: ${{ secrets.REGISTRY_HOST }}
-          chart: ${{ env.CHART }}
-          chart_root: ${{ env.CHART_ROOT }}
-          namespace: ${{ env.NAMESPACE }}

.github/workflows/webspa.yml

@@ -1,24 +1,18 @@
 name: webspa
 
 on:
-  workflow_dispatch:
   push:
     branches:
     - dev
 
     paths:
-    - src/BuildingBlocks/**
+    - src/BuildingBlocks/*
-    - src/Web/WebSPA/**
+    - src/Web/WebSPA/*
     - .github/workflows/webspa.yml
   
   pull_request:
     branches:
     - dev
-    
-    paths:
-    - src/BuildingBlocks/**
-    - src/Web/WebSPA/**
-    - .github/workflows/webspa.yml
 env:
   SERVICE: webspa
   IMAGE: webspa
@@ -29,24 +23,65 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'pull_request' }}
     steps:
-    - name: Checkout code
+    - name: 'Checkout Github Action'
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
-    - uses: ./.github/workflows/composite/build
+      
-      with:
+    - name: Compose build ${{ env.SERVICE }}
-        service: ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
-        registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
 
   BuildLinux:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'pull_request' }}
     steps:
-    - name: Checkout code
+    - name: 'Checkout Github Action'
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
-    - uses: ./.github/workflows/composite/build-push
+
+    - name: Enable experimental features for the Docker daemon and CLI
+      run: |
+          echo $'{\n  "experimental": true\n}' | sudo tee /etc/docker/daemon.json
+          mkdir -p ~/.docker
+          echo $'{\n  "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
+          sudo service docker restart
+          docker version -f '{{.Client.Experimental}}'
+          docker version -f '{{.Server.Experimental}}'
+
+    - name: Login to Container Registry
+      uses: docker/login-action@v1
       with:
-        service: ${{ env.SERVICE }}
+        registry: ${{ secrets.REGISTRY_HOST }}
-        registry_host: ${{ secrets.REGISTRY_HOST }}
+        username: ${{ secrets.USERNAME }}
-        registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
+        password: ${{ secrets.PASSWORD }}
-        image_name: ${{ env.IMAGE }}
+
-        registry_username: ${{ secrets.USERNAME }}
+    - name: Set branch name as env variable
-        registry_password: ${{ secrets.PASSWORD }}
+      run: |
+        currentbranch=$(echo ${GITHUB_REF##*/})
+        echo "running on $currentbranch"
+        echo "BRANCH=$currentbranch" >> $GITHUB_ENV
+      shell: bash
+
+    - name: Compose build ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
+
+    - name: Compose push ${{ env.SERVICE }}
+      run: sudo -E docker-compose push ${{ env.SERVICE }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
+
+    - name: Create multiarch manifest
+      run: |
+        docker --config ~/.docker manifest create ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }} ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:linux-${{ env.BRANCH  }}
+        docker --config ~/.docker manifest push ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }}
+      shell: bash

.github/workflows/webstatus-deploy.yml

@@ -1,35 +0,0 @@
-name: Deploy webstatus
-
-on:
-  workflow_dispatch:
-  repository_dispatch:
-    types:
-    - deploy
-  workflow_run:
-    workflows: ["webstatus"]
-    branches: [dev]
-    types: [completed]
-
-env:
-  CHART: webstatus
-  NAMESPACE: eshop
-  CHART_ROOT: deploy/k8s/helm
-
-jobs:
-  deploy-to-k8s:
-    #if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
-    if: false
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: ./.github/workflows/composite/deploy-helm
-        with:
-          azure_credentials: ${{ secrets.AZURE_CREDENTIALS }}
-          cluster_name: ${{ secrets.CLUSTER_NAME }}
-          resource_group: ${{ secrets.RESOURCE_GROUP }}
-          registry_host: ${{ secrets.REGISTRY_HOST }}
-          chart: ${{ env.CHART }}
-          chart_root: ${{ env.CHART_ROOT }}
-          namespace: ${{ env.NAMESPACE }}

.github/workflows/webstatus.yml

@@ -1,25 +1,18 @@
 name: webstatus
 
 on:
-  workflow_dispatch:
   push:
     branches:
     - dev
 
     paths:
-    - src/BuildingBlocks/**
+    - src/BuildingBlocks/*
-    - src/Web/WebStatus/**
+    - src/Web/WebStatus/*
     - .github/workflows/webstatus.yml
   
   pull_request:
     branches:
     - dev
-
-    paths:
-    - src/BuildingBlocks/**
-    - src/Web/WebStatus/**
-    - .github/workflows/webstatus.yml
-
 env:
   SERVICE: webstatus
   IMAGE: webstatus
@@ -30,24 +23,65 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'pull_request' }}
     steps:
-    - name: Checkout code
+    - name: 'Checkout Github Action'
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
-    - uses: ./.github/workflows/composite/build
+      
-      with:
+    - name: Compose build ${{ env.SERVICE }}
-        service: ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
-        registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
 
   BuildLinux:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'pull_request' }}
     steps:
-    - name: Checkout code
+    - name: 'Checkout Github Action'
-      uses: actions/checkout@v2
+      uses: actions/checkout@master
-    - uses: ./.github/workflows/composite/build-push
+
+    - name: Enable experimental features for the Docker daemon and CLI
+      run: |
+          echo $'{\n  "experimental": true\n}' | sudo tee /etc/docker/daemon.json
+          mkdir -p ~/.docker
+          echo $'{\n  "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
+          sudo service docker restart
+          docker version -f '{{.Client.Experimental}}'
+          docker version -f '{{.Server.Experimental}}'
+
+    - name: Login to Container Registry
+      uses: docker/login-action@v1
       with:
-        service: ${{ env.SERVICE }}
+        registry: ${{ secrets.REGISTRY_HOST }}
-        registry_host: ${{ secrets.REGISTRY_HOST }}
+        username: ${{ secrets.USERNAME }}
-        registry_endpoint: ${{ secrets.REGISTRY_ENDPOINT }}
+        password: ${{ secrets.PASSWORD }}
-        image_name: ${{ env.IMAGE }}
+
-        registry_username: ${{ secrets.USERNAME }}
+    - name: Set branch name as env variable
-        registry_password: ${{ secrets.PASSWORD }}
+      run: |
+        currentbranch=$(echo ${GITHUB_REF##*/})
+        echo "running on $currentbranch"
+        echo "BRANCH=$currentbranch" >> $GITHUB_ENV
+      shell: bash
+
+    - name: Compose build ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
+
+    - name: Compose push ${{ env.SERVICE }}
+      run: sudo -E docker-compose push ${{ env.SERVICE }}
+      working-directory: ./src
+      shell: bash
+      env:
+        TAG: ${{ env.BRANCH }}
+        REGISTRY: ${{ secrets.REGISTRY_ENDPOINT }}
+
+    - name: Create multiarch manifest
+      run: |
+        docker --config ~/.docker manifest create ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }} ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:linux-${{ env.BRANCH  }}
+        docker --config ~/.docker manifest push ${{ secrets.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }}
+      shell: bash

.gitignore

@@ -281,5 +281,3 @@ pub/
 src/**/app.yaml
 src/**/inf.yaml
 
-.angular/
-/src/Services/Identity/Identity.API/keys/*.json

CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 This repo is a reference and learning resource and everyone is invited to contribute, however not all PRs will be accepted into the main branch (**`dev`**).
 
-There's a general development strategy that's driven by @CESARDELATORRE/@nishanil, who chooses, or defines criteria for choosing, the issues to include in the codebase, given a bunch of constraints and other guidelines.
+There's a general development strategy that's driven by @CESARDELATORRE, who chooses, or defines criteria for choosing, the issues to include in the codebase, given a bunch of constraints and other guidelines.
 
 However you can always get in touch with him, if you want to implement some general-interest feature in your repo and have it referenced from the [documentation](https://docs.microsoft.com/dotnet/standard/microservices-architecture/) or the [Microservices eBook](https://aka.ms/microservicesebook/).
 
@@ -47,14 +47,15 @@ All contributions must be submitted as a [Pull Request (PR)](https://help.github
 The main branches are **`dev`** and **`master`**:
 
 - **`dev`**: Contains the latest code **and it is the branch actively developed**.  
-**All PRs must be against `dev` branch to be considered**. This branch is developed using `.NET 7`
+**All PRs must be against `dev` branch to be considered**. This branch is developed using .NET Core 2.x
 
-- **`main`**: Synced from time to time from **`dev`**. It contains "stable" code.This branch contains changes specific to `.NET Core 3.1` (**Keep in mind "stable" does not mean PRODUCTION-READY!**)
+- **`master`**: Synced from time to time from **`dev`**. It contains "stable" code.  
+(**Keep in mind "stable" does not mean PRODUCTION-READY!**)
 
 - Any other branch is considered temporary and could be deleted at any time. Do not submit any PR to them!
 
 ## DISCLAIMER - This is not a PRODUCTION-READY TEMPLATE for microservices
-eShopOnContainers is a reference application to **showcase architectural patterns** for developing microservices applications on .NET 5. **IT IS NOT A PRODUCTION-READY TEMPLATE** to start real-world application. In fact, the application is in a **permanent beta state**, as it’s also used to test new potentially interesting technologies as they show up.
+eShopOnContainers is a reference application to **showcase architectural patterns** for developing microservices applications on .NET Core. **IT IS NOT A PRODUCTION-READY TEMPLATE** to start real-world application. In fact, the application is in a **permanent beta state**, as it’s also used to test new potentially interesting technologies as they show up.
 
 Since this is a learning resource, some design decisions have favored simplicity to convey a pattern, over production-grade robustness.
 

README.md

@@ -6,20 +6,18 @@
 
 Sample .NET Core reference application, powered by Microsoft, based on a simplified microservices architecture and Docker containers.
 
-## SPA Application (Angular)
+![](img/eshop-webmvc-app-screenshot.png)
 
-![](img/eshop-spa-app-home.png)
+## Azure DevOps - Build Status
-
-## Build Status (GitHub Actions)
 
 | Image | Status | Image | Status |
 | ------------- | ------------- | ------------- | ------------- |
-| Web Status |  [![Web Status](https://github.com/dotnet-architecture/eShopOnContainers/workflows/webstatus/badge.svg?branch=dev)](https://github.com/dotnet-architecture/eShopOnContainers/actions?query=workflow%3Awebstatus) | Shopping Aggregator (Web) | [![Web Shopping Aggregator](https://github.com/dotnet-architecture/eShopOnContainers/workflows/webshoppingagg/badge.svg)](https://github.com/dotnet-architecture/eShopOnContainers/actions?query=workflow%3Awebshoppingagg) |
+| Api Gateway (base) |  [![Api Gateways base image](https://msftdevtools.visualstudio.com/eShopOnContainers/_apis/build/status/microservices/apigws?branchName=dev)](https://msftdevtools.visualstudio.com/eShopOnContainers/_build/latest?definitionId=201&branchName=dev) | Shopping Aggregator (Web) | [![Web Shopping Aggregator](https://msftdevtools.visualstudio.com/eShopOnContainers/_apis/build/status/microservices/web-shopping-agg?branchName=dev)](https://msftdevtools.visualstudio.com/eShopOnContainers/_build/latest?definitionId=206&branchName=dev) |
-| Basket API | [![Basket API](https://github.com/dotnet-architecture/eShopOnContainers/workflows/basket-api/badge.svg?branch=dev)](https://github.com/dotnet-architecture/eShopOnContainers/actions?query=workflow%3Abasket-api) | Shopping Aggregator (Mobile) | [![Mobile Shopping Aggregator](https://github.com/dotnet-architecture/eShopOnContainers/workflows/mobileshoppingagg/badge.svg?branch=dev)](https://github.com/dotnet-architecture/eShopOnContainers/actions?query=workflow%3Amobileshoppingagg) |
+| Basket API | [![Basket API](https://msftdevtools.visualstudio.com/eShopOnContainers/_apis/build/status/microservices/basket?branchName=dev)](https://msftdevtools.visualstudio.com/eShopOnContainers/_build/latest?definitionId=199&branchName=dev) | Shopping Aggregator (Mobile) | [![Mobile Shopping Aggregator](https://msftdevtools.visualstudio.com/eShopOnContainers/_apis/build/status/microservices/mobile-shopping-agg?branchName=dev)](https://msftdevtools.visualstudio.com/eShopOnContainers/_build/latest?definitionId=204&branchName=dev) |
-| Catalog API | [![Catalog API](https://github.com/dotnet-architecture/eShopOnContainers/workflows/catalog-api/badge.svg)](https://github.com/dotnet-architecture/eShopOnContainers/actions?query=workflow%3Acatalog-api) | Web Client (MVC) | [![WebMVC Client](https://github.com/dotnet-architecture/eShopOnContainers/workflows/webmvc/badge.svg?branch=dev)](https://github.com/dotnet-architecture/eShopOnContainers/actions?query=workflow%3Awebmvc) |
+| Catalog API | [![Catalog API](https://msftdevtools.visualstudio.com/eShopOnContainers/_apis/build/status/microservices/catalog?branchName=dev)](https://msftdevtools.visualstudio.com/eShopOnContainers/_build/latest?definitionId=197&branchName=dev) | Web Client (MVC) | [![WebMVC Client](https://msftdevtools.visualstudio.com/eShopOnContainers/_apis/build/status/microservices/webmvc?branchName=dev)](https://msftdevtools.visualstudio.com/eShopOnContainers/_build/latest?definitionId=209&branchName=dev) |
-|Identity API | [![Identity API](https://github.com/dotnet-architecture/eShopOnContainers/workflows/identity-api/badge.svg?branch=dev)](https://github.com/dotnet-architecture/eShopOnContainers/actions?query=workflow%3Aidentity-api) | Web Client (SPA) | [![WebSPA Client](https://github.com/dotnet-architecture/eShopOnContainers/workflows/webspa/badge.svg?branch=dev)](https://github.com/dotnet-architecture/eShopOnContainers/actions?query=workflow%3Awebspa) |
+|Identity API | [![Identity API](https://msftdevtools.visualstudio.com/eShopOnContainers/_apis/build/status/microservices/identity?branchName=dev)](https://msftdevtools.visualstudio.com/eShopOnContainers/_build/latest?definitionId=200&branchName=dev) | Web Client (SPA) | [![WebSPA Client](https://msftdevtools.visualstudio.com/eShopOnContainers/_apis/build/status/microservices/webspa?branchName=dev)](https://msftdevtools.visualstudio.com/eShopOnContainers/_build/latest?definitionId=210&branchName=dev) |
-| Ordering API | [![Ordering API](https://github.com/dotnet-architecture/eShopOnContainers/workflows/ordering-api/badge.svg?branch=dev)](https://github.com/dotnet-architecture/eShopOnContainers/actions?query=workflow%3Aordering-api) | Webhooks Client | [![Webhooks demo client](https://github.com/dotnet-architecture/eShopOnContainers/workflows/webhooks-client/badge.svg)](https://github.com/dotnet-architecture/eShopOnContainers/actions?query=workflow%3Awebhooks-client) |
+| Ordering API | [![Ordering API](https://msftdevtools.visualstudio.com/eShopOnContainers/_apis/build/status/microservices/ordering?branchName=dev)](https://msftdevtools.visualstudio.com/eShopOnContainers/_build/latest?definitionId=198&branchName=dev) | Webhooks Client | [![Webhooks demo client](https://msftdevtools.visualstudio.com/eShopOnContainers/_apis/build/status/microservices/webhooks-client?branchName=dev)](https://msftdevtools.visualstudio.com/eShopOnContainers/_build/latest?definitionId=208&branchName=dev) |
-| Payment API | [![Payment API](https://github.com/dotnet-architecture/eShopOnContainers/workflows/payment-api/badge.svg?branch=dev)](https://github.com/dotnet-architecture/eShopOnContainers/actions?query=workflow%3Apayment-api) | Ordering SignalR | [![Ordering SignalR](https://github.com/dotnet-architecture/eShopOnContainers/workflows/ordering-signalrhub/badge.svg)](https://github.com/dotnet-architecture/eShopOnContainers/actions?query=workflow%3Aordering-signalrhub) | |
+| Payment API | [![Payment API](https://msftdevtools.visualstudio.com/eShopOnContainers/_apis/build/status/microservices/payment?branchName=dev)](https://msftdevtools.visualstudio.com/eShopOnContainers/_build/latest?definitionId=205&branchName=dev) | | |
 
 _**Dev** branch contains the latest **beta** code and their images are tagged with `:linux-dev` in our [Docker Hub](https://hub.docker.com/u/eshop)_
 
@@ -56,25 +54,25 @@ The basic scenario can be run locally using docker-compose, and also deployed to
 
 ### Advanced scenario
 
-The Advanced scenario can be run only in a Kubernetes cluster. Currently, this scenario is the same as a basic scenario with the following differences:
+The Advanced scenario can be run only in a Kubernetes cluster. Currently this scenario is the same as a basic scenario with the following differences:
 
 - [Deploy to AKS with a Service Mesh for resiliency](https://github.com/dotnet-architecture/eShopOnContainers/wiki/Deploy-to-Azure-Kubernetes-Service-(AKS))
 
-In the future, more features will be implemented in the advanced scenario.
+In the future more features will be implemented in the advanced scenario.
 
 
 ## IMPORTANT NOTES!
 
-**You can use either the latest version of Visual Studio or simply Docker CLI and .NET CLI for Windows, Mac, and Linux**.
+**You can use either the latest version of Visual Studio or simply Docker CLI and .NET CLI for Windows, Mac and Linux**.
 
-**Note for Pull Requests (PRs)**: We accept pull requests from the community. When doing it, please do it onto the **DEV branch** which is the consolidated work-in-progress branch. Do not request it onto **main** branch.
+**Note for Pull Requests (PRs)**: We accept pull request from the community. When doing it, please do it onto the **DEV branch** which is the consolidated work-in-progress branch. Do not request it onto **master** branch.
 
 **NEWS / ANNOUNCEMENTS**
 Do you want to be up-to-date on .NET Architecture guidance and reference apps like eShopOnContainers? --> Subscribe by "WATCHING" this new GitHub repo: https://github.com/dotnet-architecture/News
 
-## Updated for .NET 7
+## Updated for .NET Core 3.1 (LTS)
 
-eShopOnContainers is updated to .NET 7 "wave" of technologies. Not just compilation but also new recommended code in EF Core, ASP.NET Core, and other new related versions with several significant changes.
+eShopOnContainers is updated to .NET Core 3.1  "wave" of technologies. Not just compilation but also new recommended code in EF Core, ASP.NET Core, and other new related versions with several significant changes.
 
 **See more details in the [Release notes](https://github.com/dotnet-architecture/eShopOnContainers/wiki/Release-notes) wiki page**.
 
@@ -86,15 +84,15 @@ eShopOnContainers is updated to .NET 7 "wave" of technologies. Not just compilat
 
 ### Architecture overview
 
-This reference application is cross-platform at the server and client-side, thanks to .NET 7 services capable of running on Linux or Windows containers depending on your Docker host, and to Xamarin for mobile apps running on Android, iOS, or Windows/UWP plus any browser for the client web apps.
+This reference application is cross-platform at the server and client side, thanks to .NET Core services capable of running on Linux or Windows containers depending on your Docker host, and to Xamarin for mobile apps running on Android, iOS or Windows/UWP plus any browser for the client web apps.
-The architecture proposes a microservice oriented architecture implementation with multiple autonomous microservices (each one owning its own data/db) and implementing different approaches within each microservice (simple CRUD vs. DDD/CQRS patterns) using HTTP as the communication protocol between the client apps and the microservices and supports asynchronous communication for data updates propagation across multiple services based on Integration Events and an Event Bus (a light message broker, to choose between RabbitMQ or Azure Service Bus, underneath) plus other features defined at the [roadmap](https://github.com/dotnet-architecture/eShopOnContainers/wiki/Roadmap).
+The architecture proposes a microservice oriented architecture implementation with multiple autonomous microservices (each one owning its own data/db) and implementing different approaches within each microservice (simple CRUD vs. DDD/CQRS patterns) using Http as the communication protocol between the client apps and the microservices and supports asynchronous communication for data updates propagation across multiple services based on Integration Events and an Event Bus (a light message broker, to choose between RabbitMQ or Azure Service Bus, underneath) plus other features defined at the [roadmap](https://github.com/dotnet-architecture/eShopOnContainers/wiki/Roadmap).
 
 ![](img/eshop_logo.png)
 ![](img/eShopOnContainers-architecture.png)
 
 ## Related documentation and guidance
 
-You can find the related reference **Guide/eBook** focusing on **architecting and developing containerized and microservice-based .NET Applications** (download link available below) which explains in detail how to develop this kind of architectural style (microservices, Docker containers, Domain-Driven Design for certain microservices) plus other simpler architectural styles, like monolithic apps that can also live as Docker containers.
+You can find the related reference **Guide/eBook** focusing on **architecting and developing containerized and microservice based .NET Applications** (download link available below) which explains in detail how to develop this kind of architectural style (microservices, Docker containers, Domain-Driven Design for certain microservices) plus other simpler architectural styles, like monolithic apps that can also live as Docker containers.
 
 There are also additional eBooks focusing on Containers/Docker lifecycle (DevOps, CI/CD, etc.) with Microsoft Tools, already published plus an additional eBook focusing on Enterprise Apps Patterns with Xamarin.Forms.
 You can download them and start reviewing these Guides/eBooks here:
@@ -107,7 +105,7 @@ You can download them and start reviewing these Guides/eBooks here:
 For more free e-Books check out [.NET Architecture center](https://dot.net/architecture). If you have an e-book feedback, let us know by creating a new issue here: <https://github.com/dotnet-architecture/ebooks/issues>
 
 ## Are you new to **microservices** and **cloud-native development**? 
-Take a look at the free course [Create and deploy a cloud-native ASP.NET Core microservice](https://docs.microsoft.com/en-us/learn/modules/microservices-aspnet-core/) on MS Learn.  This module explains microservices concepts, cloud-native technologies, and reduces the friction in getting started with `eShopOnContainers`.
+Take a look at the free course [Create and deploy a cloud-native ASP.NET Core microservice](https://docs.microsoft.com/en-us/learn/modules/microservices-aspnet-core/) on MS Learn.  This module explains microservices concepts, cloud-native technologies, and reduce the friction in getting started with `eShopOnContainers`.
 
 ## Read further
 

branch-guide.md

@@ -2,13 +2,9 @@
 
 Following are the most important branches:
 
-- `dev`: Contains the latest code **and it is the branch actively developed**. Note that **all PRs must be against the `dev` branch to be considered**. This branch is developed using `.NET 7`
+- `dev`: Contains the latest code **and it is the branch actively developed**. Note that **all PRs must be against `dev` branch to be considered**. This branch is developed using .NET Core 2.0
-- `release/net-6`: Contains the code changes specific to the `.NET 6`
+- `master`: Synced time to time from dev. It contains "stable" code, although not the latest one. We plan to do periodic merges from `dev` to `master`, but we are not doing it right now.
-- `release/net-5`: Contains the code changes specific to the `.NET 5`
-- `release/net-3.1.1`: Contains the code changes specific to the `.NET 3.1`
 
-> [!DISCLAIMER]: The `main` branch contains the old code base and will get obsolete in the future. So it's recommended to refer to different [tags](https://github.com/dotnet-architecture/eShopOnContainers/tags) to avoid any confusion. 
+Any other branch is considered temporary and could be deleted at any time. Do not do any PR to them!
-
-Any other branch is considered temporary and could be deleted at any time. Do not submit any PR against them!
 
 Thanks!

build/acr-build/queue-all.ps1

@@ -31,3 +31,5 @@ $services |% {
     Write-Host "Setting ACR build $bname ($bimg)"    
     az acr build-task create --registry $acrName --name $bname --image ${bimg}:$gitBranch --context $gitContext --branch $gitBranch --git-access-token $patToken --file $bfile
 }
+
+# Basket.API

deploy/azure/az/servicebus/sbusdeploy.json

@@ -16,9 +16,6 @@
 		"OrderingSubscriptionName": "Ordering",
 		"GracePeriodSubscriptionName": "GracePeriod",
 		"PaymentSubscriptionName": "Payment",
-		"BackgroundTaskSubscriptionName": "backgroundtasks",
-		"OrderingSignalrHubSubscriptionName": "Ordering.signalrhub",
-		"WebhooksSubscriptionName": "Webhooks",
         "location": "[resourceGroup().location]",
         "sbVersion": "2015-08-01",
         "defaultSASKeyName": "Root",
@@ -175,66 +172,6 @@
 								"autoDeleteOnIdle": "10675199.02:48:05.4775807",
 								"entityAvailabilityStatus": "Available"
 							}
-                        },
-						{
-                            "apiVersion": "[variables('sbVersion')]",
-                            "name": "[variables('BackgroundTaskSubscriptionName')]",
-                            "type": "Subscriptions",
-                            "dependsOn": [
-                                "[variables('serviceBusTopicName')]"
-                            ],
-                            "properties": {
-								"lockDuration": "00:00:30",
-								"requiresSession": false,
-								"defaultMessageTimeToLive": "14.00:00:00",
-								"deadLetteringOnMessageExpiration": true,
-								"deadLetteringOnFilterEvaluationExceptions": true,
-								"maxDeliveryCount": 10,
-								"enableBatchedOperations": false,
-								"status": "Active",
-								"autoDeleteOnIdle": "10675199.02:48:05.4775807",
-								"entityAvailabilityStatus": "Available"
-							}
-                        },
-						{
-                            "apiVersion": "[variables('sbVersion')]",
-                            "name": "[variables('OrderingSignalrHubSubscriptionName')]",
-                            "type": "Subscriptions",
-                            "dependsOn": [
-                                "[variables('serviceBusTopicName')]"
-                            ],
-                            "properties": {
-								"lockDuration": "00:00:30",
-								"requiresSession": false,
-								"defaultMessageTimeToLive": "14.00:00:00",
-								"deadLetteringOnMessageExpiration": true,
-								"deadLetteringOnFilterEvaluationExceptions": true,
-								"maxDeliveryCount": 10,
-								"enableBatchedOperations": false,
-								"status": "Active",
-								"autoDeleteOnIdle": "10675199.02:48:05.4775807",
-								"entityAvailabilityStatus": "Available"
-							}
-                        },
-						{
-                            "apiVersion": "[variables('sbVersion')]",
-                            "name": "[variables('WebhooksSubscriptionName')]",
-                            "type": "Subscriptions",
-                            "dependsOn": [
-                                "[variables('serviceBusTopicName')]"
-                            ],
-                            "properties": {
-								"lockDuration": "00:00:30",
-								"requiresSession": false,
-								"defaultMessageTimeToLive": "14.00:00:00",
-								"deadLetteringOnMessageExpiration": true,
-								"deadLetteringOnFilterEvaluationExceptions": true,
-								"maxDeliveryCount": 10,
-								"enableBatchedOperations": false,
-								"status": "Active",
-								"autoDeleteOnIdle": "10675199.02:48:05.4775807",
-								"entityAvailabilityStatus": "Available"
-							}
                         }
                     ]
                 }

deploy/k8s/archived/README.md

@@ -0,0 +1,8 @@
+# Kubernetes deployment
+
+This folder contains the files required to deploy eShopOnContainers to a Kubernetes cluster.
+
+For more information see the following articles in the [wiki](https://github.com/dotnet-architecture/eShopOnContainers/wiki):
+
+- [Deploy to Local Kubernetes](https://github.com/dotnet-architecture/eShopOnContainers/wiki/Deploy-to-Local-Kubernetes)
+- [Deploy to Azure Kubernetes Service (AKS)](https://github.com/dotnet-architecture/eShopOnContainers/wiki/Deploy-to-Azure-Kubernetes-Service-(AKS))

deploy/k8s/archived/create-aks.ps1

@@ -0,0 +1,50 @@
+Param(
+    [parameter(Mandatory=$true)][string]$resourceGroupName,
+    [parameter(Mandatory=$true)][string]$location,
+    [parameter(Mandatory=$true)][string]$serviceName,
+    [parameter(Mandatory=$true)][string]$dnsNamePrefix,
+    [parameter(Mandatory=$false)][string]$registryName,
+    [parameter(Mandatory=$true)][bool]$createAcr=$true,
+    [parameter(Mandatory=$false)][int]$nodeCount=3,
+    [parameter(Mandatory=$false)][string]$nodeVMSize="Standard_D2_v2",
+    [parameter(Mandatory=$false)][bool]$enableHttpApplicationAddon=$true,
+    [parameter(Mandatory=$false)][bool]$enableAzureMonitoring=$false,
+    [parameter(Mandatory=$false)][ValidateSet("VirtualMachineScaleSets","AvailabilitySet",IgnoreCase=$true)]$vmSetType="VirtualMachineScaleSets"
+)
+
+# Create resource group
+Write-Host "Creating Azure Resource Group..." -ForegroundColor Yellow
+az group create --name=$resourceGroupName --location=$location
+
+if ($createAcr -eq $true) {
+    # Create Azure Container Registry
+    if ([string]::IsNullOrEmpty($registryName)) {
+        $registryName=$serviceName
+    }
+    Write-Host "Creating Azure Container Registry named $registryName" -ForegroundColor Yellow
+    az acr create -n $registryName -g $resourceGroupName -l $location  --admin-enabled true --sku Basic
+}
+
+# Create kubernetes cluster in AKS
+Write-Host "Creating AKS $resourceGroupName/$serviceName" -ForegroundColor Yellow
+az aks create --resource-group=$resourceGroupName --name=$serviceName --dns-name-prefix=$dnsNamePrefix --generate-ssh-keys --node-count=$nodeCount --node-vm-size=$nodeVMSize --vm-set-type $vmSetType
+
+if ($enableHttpApplicationAddon) {
+    Write-Host "Enabling Http Applciation Routing in AKS $serviceName" -ForegroundColor Yellow
+    az aks enable-addons --resource-group $resourceGroupName --name $serviceName --addons http_application_routing
+}
+
+if ($enableAzureMonitoring) {
+    Write-Host "Enabling Azure Monitoring in AKS $serviceName" -ForegroundColor Yellow
+    az aks enable-addons --resource-group $resourceGroupName --name $serviceName --addons monitoring
+}
+
+# Retrieve kubernetes cluster configuration and save it under ~/.kube/config
+Write-Host "Getting Kubernetes config..." -ForegroundColor Yellow
+az aks get-credentials --resource-group=$resourceGroupName --name=$serviceName
+
+if ($createAcr -eq $true) {
+    # Show ACR credentials
+    Write-Host "ACR $registryName credentials:" -ForegroundColor Yellow
+    az acr credential show -n $registryName
+}

deploy/k8s/archived/dashboard-adminuser.yaml

@@ -0,0 +1,18 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: admin-user
+  namespace: kubernetes-dashboard
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: admin-user
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cluster-admin
+subjects:
+- kind: ServiceAccount
+  name: admin-user
+  namespace: kubernetes-dashboard

deploy/k8s/archived/enable-tls.ps1

@@ -0,0 +1,20 @@
+Param (
+[parameter(Mandatory=$false)][string]$aksName="",
+[parameter(Mandatory=$false)][string]$aksRg=""
+)
+
+if ($aksName -and $aksRg) {
+
+    $aks=$(az aks show -n $aksName -g $aksRg -o json | ConvertFrom-Json)
+    if (-not $aks) {
+        Write-Host "AKS $aksName not found in RG $aksRg" -ForegroundColor Red
+        exit 1
+    }
+
+    Write-Host "Switching kubectl context to $aksRg/$aksName" -ForegroundColor Yellow
+    az aks get-credentials -g $aksRg -n $aksName
+}
+
+Write-Host "Installing cert-manager on current cluster"
+
+kubectl apply  --validate=false -f https://github.com/jetstack/cert-manager/releases/download/v0.11.0/cert-manager.yaml --validate=false

deploy/k8s/archived/helm-rbac.yaml

@@ -0,0 +1,18 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: tiller
+  namespace: kube-system
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: tiller
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cluster-admin
+subjects:
+  - kind: ServiceAccount
+    name: tiller
+    namespace: kube-system

deploy/k8s/archived/helm/aks-httpaddon-cfg.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+#    addonmanager.kubernetes.io/mode: Reconcile
+    app: addon-http-application-routing-ingress-nginx
+    kubernetes.io/cluster-service: "true"
+  name: addon-http-application-routing-nginx-configuration
+  namespace: kube-system
+data:
+  proxy-buffer-size: "128k"
+  proxy-buffers: "4 256k"

deploy/k8s/archived/helm/apigwms/.helmignore

@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj

deploy/k8s/archived/helm/apigwms/Chart.yaml

@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: apigwms
+version: 0.1.0

deploy/k8s/archived/helm/apigwms/envoy.yaml

@@ -0,0 +1,139 @@
+admin:
+  access_log_path: "/dev/null"
+  address:
+    socket_address:
+      address: 0.0.0.0
+      port_value: 8001
+static_resources:
+  listeners:
+  - address:
+      socket_address:
+        address: 0.0.0.0
+        port_value: 80
+    filter_chains:
+    - filters:
+      - name: envoy.http_connection_manager
+        config:
+          codec_type: auto
+          stat_prefix: ingress_http
+          route_config:
+            name: eshop_backend_route
+            virtual_hosts:
+            - name: eshop_backend
+              domains:
+              - "*"
+              routes:
+              - name: "c-short"
+                match:
+                  prefix: "/c/"
+                route:
+                  auto_host_rewrite: true
+                  prefix_rewrite: "/catalog-api/"
+                  cluster: catalog
+              - name: "c-long"
+                match:
+                  prefix: "/catalog-api/"
+                route:
+                  auto_host_rewrite: true
+                  cluster: catalog
+              - name: "o-short"
+                match:
+                  prefix: "/o/"
+                route:
+                  auto_host_rewrite: true
+                  prefix_rewrite: "/ordering-api/"
+                  cluster: ordering
+              - name: "o-long"
+                match:
+                  prefix: "/ordering-api/"
+                route:
+                  auto_host_rewrite: true
+                  cluster: ordering
+              - name: "h-long"
+                match:
+                  prefix: "/hub/notificationhub"
+                route:
+                  auto_host_rewrite: true
+                  cluster: signalr-hub
+                  timeout: 300s
+              - name: "b-short"
+                match:
+                  prefix: "/b/"
+                route:
+                  auto_host_rewrite: true
+                  prefix_rewrite: "/basket-api/"
+                  cluster: basket
+              - name: "b-long"
+                match:
+                  prefix: "/basket-api/"
+                route:
+                  auto_host_rewrite: true
+                  cluster: basket
+              - name: "agg"
+                match:
+                  prefix: "/"
+                route:
+                  auto_host_rewrite: true
+                  prefix_rewrite: "/"
+                  cluster: shoppingagg
+          http_filters:
+          - name: envoy.router
+          access_log:
+          - name: envoy.file_access_log
+            filter:
+              not_health_check_filter: {}
+            config:
+              json_format:
+                time: "%START_TIME%"
+                protocol: "%PROTOCOL%"
+                duration: "%DURATION%"
+                request_method: "%REQ(:METHOD)%"
+                request_host: "%REQ(HOST)%"
+                path: "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%"
+                response_flags: "%RESPONSE_FLAGS%"
+                route_name: "%ROUTE_NAME%"
+                upstream_host: "%UPSTREAM_HOST%"
+                upstream_cluster: "%UPSTREAM_CLUSTER%"
+                upstream_local_address: "%UPSTREAM_LOCAL_ADDRESS%"
+              path: "/tmp/access.log"
+  clusters:
+  - name: shoppingagg
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: webshoppingagg
+        port_value: 80
+  - name: catalog
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: catalog-api
+        port_value: 80
+  - name: basket
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: basket-api
+        port_value: 80
+  - name: ordering
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: ordering-api
+        port_value: 80
+  - name: signalr-hub
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: ordering-signalrhub
+        port_value: 80

deploy/k8s/archived/helm/apigwms/templates/NOTES.txt

@@ -0,0 +1,2 @@
+eShop API Gateway for Mobile Shopping services installed
+--------------------------------------------------------

deploy/k8s/archived/helm/apigwms/templates/_helpers.tpl

@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "apigwms.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "apigwms.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "apigwms.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}

deploy/k8s/archived/helm/apigwms/templates/_names.tpl

@@ -0,0 +1,52 @@
+{{- define "suffix-name" -}}
+{{- if .Values.app.name -}}
+{{- .Values.app.name -}}
+{{- else -}}
+{{- .Release.Name -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "sql-name" -}}
+{{- if .Values.inf.sql.host -}}
+{{- .Values.inf.sql.host -}}
+{{- else -}}
+{{- printf "%s" "sql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "url-of" -}}
+{{- $name := first .}}
+{{- $ctx := last .}}
+{{- if eq $name "" -}}
+{{- $ctx.Values.inf.k8s.dns -}}
+{{- else -}}
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- define "pathBase" -}}
+{{- if .Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" . -}}
+{{- printf "%s-%s"  .Values.pathBase $suffix -}}
+{{- else -}}
+{{- .Values.pathBase -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "fqdn-image" -}}
+{{- if .Values.inf.registry -}}
+{{- printf "%s/%s" .Values.inf.registry.server .Values.image.repository -}}
+{{- else -}}
+{{- .Values.image.repository -}}
+{{- end -}}
+{{- end -}}

deploy/k8s/archived/helm/apigwms/templates/deployment.yaml

@@ -0,0 +1,110 @@
+{{- $name := include "apigwms.fullname" . -}}
+{{- $cfgname := printf "%s-%s" "cfg" $name -}}
+{{- $envoycfgname := printf "%s-%s" "envoy" $name -}}
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "apigwms.fullname" . }}
+  labels:
+    ufo: {{ $cfgname}}
+    app: {{ template "apigwms.name" . }}
+    chart: {{ template "apigwms.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "apigwms.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "apigwms.name" . }}
+        release: {{ .Release.Name }}
+      {{ if .Values.inf.mesh.enabled -}}
+      annotations:
+        linkerd.io/inject: enabled
+      {{- end }}           
+    spec:
+      {{ if .Values.inf.registry -}}
+      imagePullSecrets:
+      - name: {{ .Values.inf.registry.secretName }}
+      {{- end }}
+      volumes:
+      - name: config
+        configMap:
+          name: {{ $envoycfgname }}
+          items:
+          - key: envoy.yaml
+            path: envoy.yaml
+      containers:
+        - name: {{ .Chart.Name }}
+          {{ if .Values.probes -}}
+          {{- if .Values.probes.liveness -}}
+          livenessProbe:
+            httpGet:
+              port: {{ .Values.probes.liveness.port }}
+              path: {{ .Values.probes.liveness.path }}
+            initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.probes -}}
+          {{- if .Values.probes.readiness }}
+          readinessProbe:
+            httpGet:
+              port: {{ .Values.probes.readiness.port }}
+              path: {{ .Values.probes.readiness.path }}
+            initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
+            timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
+          {{- end -}}
+          {{- end }}
+          image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
+          imagePullPolicy: IfNotPresent
+          volumeMounts:
+          - name: config
+            mountPath: {{ .Values.envoy.configPath }}         
+          env:
+            - name: PATH_BASE
+              value: {{ include "pathBase" . }}
+            - name: k8sname
+              value: {{ .Values.clusterName }}
+          {{- if .Values.env.values -}}
+          {{- range .Values.env.values }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.env.configmap -}}
+          {{- range .Values.env.configmap }}
+            - name: {{ .name }}
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ $cfgname }}
+                  key: {{ .key }}
+          {{- end -}}
+          {{- end }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+            - name: admin
+              containerPort: 8001
+              protocol: TCP              
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+

deploy/k8s/archived/helm/apigwms/templates/envoy-cm.yaml

@@ -0,0 +1,14 @@
+{{- $name := include "apigwms.fullname" . -}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "envoy-{{ $name }}"
+  labels:
+    app: {{ template "apigwms.name" . }}
+    chart: {{ template "apigwms.chart" .}}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+  {{ (.Files.Glob "envoy.yaml").AsConfig | indent 2 }}
+

deploy/k8s/archived/helm/apigwms/templates/ingress.yaml

@@ -0,0 +1,47 @@
+{{- if .Values.ingress.enabled -}}
+{{- $ingressPath := include "pathBase" . -}}
+{{- $serviceName := .Values.app.svc.mobileshoppingapigw -}}
+
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ template "apigwms.fullname" . }}
+  labels:
+    app: {{ template "apigwms.name" . }}
+    chart: {{ template "apigwms.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+{{- with .Values.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- if and .Values.inf.tls.enabled .Values.inf.tls.issuer }}
+    cert-manager.io/issuer: {{ .Values.inf.tls.issuer }} 
+{{- end }}
+{{- if .Values.inf.mesh.enabled }} 
+{{- with .Values.ingress.mesh.annotations }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- end }}
+spec:
+{{- if .Values.ingress.tls }}
+  tls:
+  {{- range .Values.ingress.tls }}
+    - hosts:
+      {{- range .hosts }}
+        - {{ . }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
+  rules:
+  {{- range .Values.ingress.hosts }}
+    - host: {{ . }}
+      http:
+        paths:
+          - path: {{ $ingressPath }}
+            backend:
+              serviceName: {{ $serviceName }}
+              servicePort: http
+  {{- end }}
+{{- end }}

deploy/k8s/archived/helm/apigwms/templates/service.yaml

@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.app.svc.mobileshoppingapigw }}
+  labels:
+    app: {{ template "apigwms.name" . }}
+    chart: {{ template "apigwms.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+    - port: {{ .Values.service.adminPort }}
+      targetPort: admin
+      protocol: TCP
+      name: admin     
+  selector:
+    app: {{ template "apigwms.name" . }}
+    release: {{ .Release.Name }}

deploy/k8s/archived/helm/apigwms/values.yaml

@@ -0,0 +1,45 @@
+replicaCount: 1
+clusterName: eshop-aks
+pathBase: /mobileshoppingapigw
+
+image:
+  repository: envoyproxy/envoy
+  tag: v1.11.1
+
+service:
+  type: ClusterIP
+  port: 80
+  adminPort: 8001  
+
+ingress:
+  enabled: true
+  annotations:
+    nginx.ingress.kubernetes.io/rewrite-target: "/"
+    ingress.kubernetes.io/rewrite-target: "/"
+  tls: []
+
+resources: {}
+
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+env: {}
+
+envoy:
+  configPath: /etc/envoy
+
+probes:
+  liveness:
+    path: /ready
+    initialDelaySeconds: 5
+    periodSeconds: 15
+    port: 8001
+  readiness:
+    path: /ready
+    initialDelaySeconds: 5
+    periodSeconds: 60
+    port: 8001

deploy/k8s/archived/helm/apigwws/.helmignore

@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj

deploy/k8s/archived/helm/apigwws/Chart.yaml

@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: apigwws
+version: 0.1.0

deploy/k8s/archived/helm/apigwws/envoy.yaml

@@ -0,0 +1,139 @@
+admin:
+  access_log_path: "/dev/null"
+  address:
+    socket_address:
+      address: 0.0.0.0
+      port_value: 8001
+static_resources:
+  listeners:
+  - address:
+      socket_address:
+        address: 0.0.0.0
+        port_value: 80
+    filter_chains:
+    - filters:
+      - name: envoy.http_connection_manager
+        config:
+          codec_type: auto
+          stat_prefix: ingress_http
+          route_config:
+            name: eshop_backend_route
+            virtual_hosts:
+            - name: eshop_backend
+              domains:
+              - "*"
+              routes:
+              - name: "c-short"
+                match:
+                  prefix: "/c/"
+                route:
+                  auto_host_rewrite: true
+                  prefix_rewrite: "/catalog-api/"
+                  cluster: catalog
+              - name: "c-long"
+                match:
+                  prefix: "/catalog-api/"
+                route:
+                  auto_host_rewrite: true
+                  cluster: catalog
+              - name: "o-short"
+                match:
+                  prefix: "/o/"
+                route:
+                  auto_host_rewrite: true
+                  prefix_rewrite: "/ordering-api/"
+                  cluster: ordering
+              - name: "o-long"
+                match:
+                  prefix: "/ordering-api/"
+                route:
+                  auto_host_rewrite: true
+                  cluster: ordering
+              - name: "h-long"
+                match:
+                  prefix: "/hub/notificationhub"
+                route:
+                  auto_host_rewrite: true
+                  cluster: signalr-hub
+                  timeout: 300s
+              - name: "b-short"
+                match:
+                  prefix: "/b/"
+                route:
+                  auto_host_rewrite: true
+                  prefix_rewrite: "/basket-api/"
+                  cluster: basket
+              - name: "b-long"
+                match:
+                  prefix: "/basket-api/"
+                route:
+                  auto_host_rewrite: true
+                  cluster: basket
+              - name: "agg"
+                match:
+                  prefix: "/"
+                route:
+                  auto_host_rewrite: true
+                  prefix_rewrite: "/"
+                  cluster: shoppingagg
+          http_filters:
+          - name: envoy.router
+          access_log:
+          - name: envoy.file_access_log
+            filter:
+              not_health_check_filter: {}
+            config:
+              json_format:
+                time: "%START_TIME%"
+                protocol: "%PROTOCOL%"
+                duration: "%DURATION%"
+                request_method: "%REQ(:METHOD)%"
+                request_host: "%REQ(HOST)%"
+                path: "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%"
+                response_flags: "%RESPONSE_FLAGS%"
+                route_name: "%ROUTE_NAME%"
+                upstream_host: "%UPSTREAM_HOST%"
+                upstream_cluster: "%UPSTREAM_CLUSTER%"
+                upstream_local_address: "%UPSTREAM_LOCAL_ADDRESS%"
+              path: "/tmp/access.log"
+  clusters:
+  - name: shoppingagg
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: webshoppingagg
+        port_value: 80
+  - name: catalog
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: catalog-api
+        port_value: 80
+  - name: basket
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: basket-api
+        port_value: 80
+  - name: ordering
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: ordering-api
+        port_value: 80
+  - name: signalr-hub
+    connect_timeout: 0.25s
+    type: strict_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: ordering-signalrhub
+        port_value: 80

deploy/k8s/archived/helm/apigwws/templates/NOTES.txt

@@ -0,0 +1,2 @@
+eShop API Gateway for Web Shopping services installed
+-----------------------------------------------------

deploy/k8s/archived/helm/apigwws/templates/_helpers.tpl

@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "apigwws.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "apigwws.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "apigwws.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}

deploy/k8s/archived/helm/apigwws/templates/_names.tpl

@@ -0,0 +1,52 @@
+{{- define "suffix-name" -}}
+{{- if .Values.app.name -}}
+{{- .Values.app.name -}}
+{{- else -}}
+{{- .Release.Name -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "sql-name" -}}
+{{- if .Values.inf.sql.host -}}
+{{- .Values.inf.sql.host -}}
+{{- else -}}
+{{- printf "%s" "sql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "url-of" -}}
+{{- $name := first .}}
+{{- $ctx := last .}}
+{{- if eq $name "" -}}
+{{- $ctx.Values.inf.k8s.dns -}}
+{{- else -}}
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- define "pathBase" -}}
+{{- if .Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" . -}}
+{{- printf "%s-%s"  .Values.pathBase $suffix -}}
+{{- else -}}
+{{- .Values.pathBase -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "fqdn-image" -}}
+{{- if .Values.inf.registry -}}
+{{- printf "%s/%s" .Values.inf.registry.server .Values.image.repository -}}
+{{- else -}}
+{{- .Values.image.repository -}}
+{{- end -}}
+{{- end -}}

deploy/k8s/archived/helm/apigwws/templates/deployment.yaml

@@ -0,0 +1,109 @@
+{{- $name := include "apigwws.fullname" . -}}
+{{- $cfgname := printf "%s-%s" "cfg" $name -}}
+{{- $envoycfgname := printf "%s-%s" "envoy" $name -}}
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "apigwws.fullname" . }}
+  labels:
+    app: {{ template "apigwws.name" . }}
+    chart: {{ template "apigwws.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "apigwws.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "apigwws.name" . }}
+        release: {{ .Release.Name }}
+      {{ if .Values.inf.mesh.enabled -}}
+      annotations:
+        linkerd.io/inject: enabled
+      {{- end }}           
+    spec:
+      {{ if .Values.inf.registry -}}
+      imagePullSecrets:
+      - name: {{ .Values.inf.registry.secretName }}
+      {{- end }}
+      volumes:
+      - name: config
+        configMap:
+          name: {{ $envoycfgname }}
+          items:
+          - key: envoy.yaml
+            path: envoy.yaml
+      containers:
+        - name: {{ .Chart.Name }}
+          {{ if .Values.probes -}}
+          {{- if .Values.probes.liveness -}}
+          livenessProbe:
+            httpGet:
+              port: {{ .Values.probes.liveness.port }}
+              path: {{ .Values.probes.liveness.path }}
+            initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.probes -}}
+          {{- if .Values.probes.readiness }}
+          readinessProbe:
+            httpGet:
+              port: {{ .Values.probes.readiness.port }}
+              path: {{ .Values.probes.readiness.path }}
+            initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
+            timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
+          {{- end -}}
+          {{- end }}        
+          image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          volumeMounts:
+          - name: config
+            mountPath: {{ .Values.envoy.configPath }}      
+          env:
+            - name: PATH_BASE
+              value: {{ include "pathBase" . }}
+            - name: k8sname
+              value: {{ .Values.clusterName }}
+          {{- if .Values.env.values -}}
+          {{- range .Values.env.values }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.env.configmap -}}
+          {{- range .Values.env.configmap }}
+            - name: {{ .name }}
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ $cfgname }}
+                  key: {{ .key }}
+          {{- end -}}
+          {{- end }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+            - name: admin
+              containerPort: 8001
+              protocol: TCP
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+

deploy/k8s/archived/helm/apigwws/templates/envoy-cm.yaml

@@ -0,0 +1,14 @@
+{{- $name := include "apigwws.fullname" . -}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "envoy-{{ $name }}"
+  labels:
+    app: {{ template "apigwws.name" . }}
+    chart: {{ template "apigwws.chart" .}}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+  {{ (.Files.Glob "envoy.yaml").AsConfig | indent 2 }}
+

deploy/k8s/archived/helm/apigwws/templates/ingress.yaml

@@ -0,0 +1,46 @@
+{{- if .Values.ingress.enabled -}}
+{{- $ingressPath := include "pathBase" . -}}
+{{- $serviceName := .Values.app.svc.webshoppingapigw -}}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ template "apigwws.fullname" . }}
+  labels:
+    app: {{ template "apigwws.name" . }}
+    chart: {{ template "apigwws.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+{{- with .Values.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- if and .Values.inf.tls.enabled .Values.inf.tls.issuer }}
+    cert-manager.io/issuer: {{ .Values.inf.tls.issuer }} 
+{{- end }}
+{{- if .Values.inf.mesh.enabled }} 
+{{- with .Values.ingress.mesh.annotations }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- end }}
+spec:
+{{- if .Values.ingress.tls }}
+  tls:
+  {{- range .Values.ingress.tls }}
+    - hosts:
+      {{- range .hosts }}
+        - {{ . }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
+  rules:
+    {{- range .Values.ingress.hosts }}
+    - host: {{ . }}
+      http:
+        paths:
+          - path: {{ $ingressPath }}
+            backend:
+              serviceName: {{ $serviceName }}
+              servicePort: http
+  {{- end }}
+{{- end }}

deploy/k8s/archived/helm/apigwws/templates/service.yaml

@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.app.svc.webshoppingapigw }}
+  labels:
+    app: {{ template "apigwws.name" . }}
+    chart: {{ template "apigwws.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+    - port: {{ .Values.service.adminPort }}
+      targetPort: admin
+      protocol: TCP
+      name: admin
+  selector:
+    app: {{ template "apigwws.name" . }}
+    release: {{ .Release.Name }}

deploy/k8s/archived/helm/apigwws/values.yaml

@@ -0,0 +1,46 @@
+replicaCount: 1
+clusterName: eshop-aks
+pathBase: /webshoppingapigw
+
+image:
+  repository: envoyproxy/envoy
+  tag: v1.11.1
+
+service:
+  type: ClusterIP
+  port: 80
+  adminPort: 8001
+
+ingress:
+  enabled: true
+  annotations:
+    nginx.ingress.kubernetes.io/rewrite-target: "/"
+    ingress.kubernetes.io/rewrite-target: "/"
+  tls: []
+
+resources: {}
+
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+# env defines the environment variables that will be declared in the pod
+env: {}
+
+envoy:
+  configPath: /etc/envoy
+
+probes:
+  liveness:
+    path: /ready
+    initialDelaySeconds: 5
+    periodSeconds: 15
+    port: 8001
+  readiness:
+    path: /ready
+    initialDelaySeconds: 5
+    periodSeconds: 60
+    port: 8001

deploy/k8s/archived/helm/app.yaml

@@ -0,0 +1,38 @@
+# This helm values file defines app-based settings
+# Charts use those values, so this file **MUST** be included in all chart releases
+
+app:                                                    # app global settings
+  name: "my-eshop"                                      # Override for custom app name
+  ingress:                                              # ingress related settings
+    entries:
+      basket: basket-api                                # ingress entry for basket api
+      catalog: catalog-api                              # ingress entry for catalog api
+      ordering: ordering-api                            # ingress entry for ordering api
+      identity: identity                                # ingress entry for identity api
+      mvc: webmvc                                       # ingress entry for web mvc
+      spa: ""                                           # ingress entry for web spa
+      status: webstatus                                 # ingress entry for web status
+      webshoppingapigw: webshoppingapigw                # ingress entry for web shopping Agw
+      mobileshoppingapigw: mobileshoppingapigw          # ingress entry for mobile shopping Agw
+      webshoppingagg: webshoppingagg                    # ingress entry for web shopping aggregator
+      mobileshoppingagg: mobileshoppingagg              # ingress entry for mobile shopping aggregator
+      payment: payment-api                              # ingress entry for payment api
+      webhooks: webhooks-api                            # ingress entry for webhooks api
+      webhooksweb: webhooks-web                         # ingress entry for webhooks web demo client
+  svc:
+      basket: basket-api                                # service name for basket api
+      catalog: catalog-api                              # service name for catalog api
+      ordering: ordering-api                            # service name for ordering api
+      orderingbackgroundtasks: ordering-backgroundtasks # service name for orderingbackgroundtasks
+      orderingsignalrhub: ordering-signalrhub           # service name for orderingsignalrhub
+      identity: identity-api                            # service name for identity api
+      mvc: webmvc                                       # service name for web mvc
+      spa: webspa                                       # service name for web spa
+      status: webstatus                                 # service name for web status
+      webshoppingapigw: webshoppingapigw                # service name for web shopping Agw
+      mobileshoppingapigw: mobileshoppingapigw          # service name for mobile shopping Agw
+      webshoppingagg: webshoppingagg                    # service name for web shopping aggregator
+      mobileshoppingagg: mobileshoppingagg              # service name for mobile shopping aggregator
+      payment: payment-api                              # service name for payment api
+      webhooks: webhooks-api                            # service name for webhooks api
+      webhooksweb: webhooks-client                      # service name for webhooks web

deploy/k8s/archived/helm/basket-api/.helmignore

@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj

deploy/k8s/archived/helm/basket-api/Chart.yaml

@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: basket-api
+version: 0.1.0

deploy/k8s/archived/helm/basket-api/templates/NOTES.txt

@@ -0,0 +1,8 @@
+eShop Basket API installed.
+--------------------------
+
+This API is not directly exposed outside cluster. If need to access it use:
+
+export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "basket-api.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+echo "Visit http://127.0.0.1:8080 to use your application"
+kubectl port-forward $POD_NAME 8080:80

deploy/k8s/archived/helm/basket-api/templates/_helpers.tpl

@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "basket-api.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "basket-api.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "basket-api.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}

deploy/k8s/archived/helm/basket-api/templates/_names.tpl

@@ -0,0 +1,52 @@
+{{- define "suffix-name" -}}
+{{- if .Values.app.name -}}
+{{- .Values.app.name -}}
+{{- else -}}
+{{- .Release.Name -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "sql-name" -}}
+{{- if .Values.inf.sql.host -}}
+{{- .Values.inf.sql.host -}}
+{{- else -}}
+{{- printf "%s" "sql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "url-of" -}}
+{{- $name := first .}}
+{{- $ctx := last .}}
+{{- if eq $name "" -}}
+{{- $ctx.Values.inf.k8s.dns -}}
+{{- else -}}
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- define "pathBase" -}}
+{{- if .Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" . -}}
+{{- printf "%s-%s"  .Values.pathBase $suffix -}}
+{{- else -}}
+{{- .Values.pathBase -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "fqdn-image" -}}
+{{- if .Values.inf.registry -}}
+{{- printf "%s/%s" .Values.inf.registry.server .Values.image.repository -}}
+{{- else -}}
+{{- .Values.image.repository -}}
+{{- end -}}
+{{- end -}}

deploy/k8s/archived/helm/basket-api/templates/configmap.yaml

@@ -0,0 +1,17 @@
+{{- $name := include "basket-api.fullname" . -}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "cfg-{{ $name }}"
+  labels:
+    app: {{ template "basket-api.name" . }}
+    chart: {{ template "basket-api.chart" .}}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+  basket__ConnectionString: {{ .Values.inf.redis.basket.constr }}
+  urls__IdentityUrl: http://{{ .Values.app.svc.identity }}
+  all__EventBusConnection: {{ .Values.inf.eventbus.constr }}
+  all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}"
+  all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}"

deploy/k8s/archived/helm/basket-api/templates/deployment.yaml

@@ -0,0 +1,99 @@
+{{- $name := include "basket-api.fullname" . -}}
+{{- $cfgname := printf "%s-%s" "cfg" $name -}}
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "basket-api.fullname" . }}
+  labels:
+    ufo: {{ $cfgname}}
+    app: {{ template "basket-api.name" . }}
+    chart: {{ template "basket-api.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "basket-api.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "basket-api.name" . }}
+        release: {{ .Release.Name }}
+      {{ if .Values.inf.mesh.enabled -}}
+      annotations:
+        linkerd.io/inject: enabled
+      {{- end }}        
+    spec:
+      {{ if .Values.inf.registry -}}
+      imagePullSecrets:
+      - name: {{ .Values.inf.registry.secretName }}
+      {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}
+          {{ if .Values.probes -}}
+          {{- if .Values.probes.liveness -}}
+          livenessProbe:
+            httpGet: 
+              port: {{ .Values.probes.liveness.port }}
+              path: {{ .Values.probes.liveness.path }}
+            initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.probes -}}
+          {{- if .Values.probes.readiness }}
+          readinessProbe:
+            httpGet:
+              port: {{ .Values.probes.readiness.port }}
+              path: {{ .Values.probes.readiness.path }}
+            initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
+            timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
+          {{- end -}}
+          {{- end }}        
+          image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: PATH_BASE
+              value: {{ include "pathBase" . }}
+            - name: k8sname
+              value: {{ .Values.clusterName }}
+          {{- if .Values.env.values -}}
+          {{- range .Values.env.values }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.env.configmap -}}
+          {{- range .Values.env.configmap }}
+            - name: {{ .name }}
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ $cfgname }}
+                  key: {{ .key }}
+          {{- end -}}
+          {{- end }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+            - name: grpc
+              containerPort: 81
+              protocol: TCP                
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+

deploy/k8s/archived/helm/basket-api/templates/service.yaml

@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.app.svc.basket }}
+  labels:
+    app: {{ template "basket-api.name" . }}
+    chart: {{ template "basket-api.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+    - port: {{ .Values.service.grpcPort }}
+      targetPort: grpc
+      protocol: TCP
+      name: grpc
+  selector:
+    app: {{ template "basket-api.name" . }}
+    release: {{ .Release.Name }}

deploy/k8s/archived/helm/basket-api/values.yaml

@@ -0,0 +1,61 @@
+replicaCount: 1
+clusterName: eshop-aks
+pathBase: /basket-api
+
+image:
+  repository: eshop/basket.api
+  tag: latest
+  pullPolicy: IfNotPresent
+
+service:
+  type: ClusterIP
+  port: 80
+  grpcPort: 81  
+
+resources: {}
+
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+# env defines the environment variables that will be declared in the pod
+env:
+  urls:
+  # configmap declares variables which value is taken from the config map defined in template configmap.yaml (name is name of var and key the key in configmap).
+  configmap:
+    - name: ConnectionString
+      key: basket__ConnectionString
+    - name: EventBusConnection
+      key: all__EventBusConnection
+    - name: ApplicationInsights__InstrumentationKey
+      key: all__InstrumentationKey
+    - name: AzureServiceBusEnabled
+      key: all__UseAzureServiceBus
+    - name: IdentityUrl
+      key: urls__IdentityUrl
+  # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
+  values:
+    - name: OrchestratorType
+      value: 'K8S'
+    - name: PORT
+      value: "80"
+    - name: GRPC_PORT
+      value: "81"      
+probes:
+  liveness:
+    path: /liveness
+    initialDelaySeconds: 10
+    periodSeconds: 15
+    port: 80
+  readiness:
+    path: /hc
+    timeoutSeconds: 5
+    initialDelaySeconds: 90
+    periodSeconds: 60
+    port: 80
+
+ingress:
+  enabled: false

deploy/k8s/archived/helm/basket-data/.helmignore

@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj

deploy/k8s/archived/helm/basket-data/Chart.yaml

@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: basket-data
+version: 0.1.0

deploy/k8s/archived/helm/basket-data/templates/NOTES.txt

@@ -0,0 +1,8 @@
+eShop Redis for keystore data installed
+----------------------------------------
+
+Redis is not directly exposed outside cluster. If need to access it from outside use:
+
+export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "basket-data.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+echo "Visit http://127.0.0.1:8080 to use your application"
+kubectl port-forward $POD_NAME 8080:80

deploy/k8s/archived/helm/basket-data/templates/_helpers.tpl

@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "basket-data.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "basket-data.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "basket-data.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}

deploy/k8s/archived/helm/basket-data/templates/deployment.yaml

@@ -0,0 +1,43 @@
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "basket-data.fullname" . }}
+  labels:
+    app: {{ template "basket-data.name" . }}
+    chart: {{ template "basket-data.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "basket-data.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "basket-data.name" . }}
+        release: {{ .Release.Name }}
+    spec:
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - name: http
+              containerPort: 6379
+              protocol: TCP
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}

deploy/k8s/archived/helm/basket-data/templates/service.yaml

@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.inf.redis.basket.svc }}
+  labels:
+    app: {{ template "basket-data.name" . }}
+    chart: {{ template "basket-data.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app: {{ template "basket-data.name" . }}
+    release: {{ .Release.Name }}

deploy/k8s/archived/helm/basket-data/values.yaml

@@ -0,0 +1,19 @@
+replicaCount: 1
+
+image:
+  repository: redis
+  tag: 4.0.10
+  pullPolicy: IfNotPresent
+
+service:
+  type: ClusterIP
+  port: 6379
+
+
+resources: {}
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}

deploy/k8s/archived/helm/catalog-api/.helmignore

@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj

deploy/k8s/archived/helm/catalog-api/Chart.yaml

@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: catalog-api
+version: 0.1.0

deploy/k8s/archived/helm/catalog-api/templates/NOTES.txt

@@ -0,0 +1,9 @@
+eShop Catalog API installed.
+----------------------------
+
+This API is not directly exposed outside cluster. If need to access it use:
+
+export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "catalog-api.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+echo "Visit http://127.0.0.1:8080 to use your application"
+kubectl port-forward $POD_NAME 8080:80
+

deploy/k8s/archived/helm/catalog-api/templates/_helpers.tpl

@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "catalog-api.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "catalog-api.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "catalog-api.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}

deploy/k8s/archived/helm/catalog-api/templates/_names.tpl

@@ -0,0 +1,60 @@
+{{- define "suffix-name" -}}
+{{- if .Values.app.name -}}
+{{- .Values.app.name -}}
+{{- else -}}
+{{- .Release.Name -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "sql-name" -}}
+{{- if .Values.inf.sql.host -}}
+{{- .Values.inf.sql.host -}}
+{{- else -}}
+{{- printf "%s" "sql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "url-of" -}}
+{{- $name := first .}}
+{{- $ctx := last .}}
+{{- if eq $name "" -}}
+{{- $ctx.Values.inf.k8s.dns -}}
+{{- else -}}
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- define "pathBase" -}}
+{{- if .Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" . -}}
+{{- printf "%s-%s"  .Values.pathBase $suffix -}}
+{{- else -}}
+{{- .Values.pathBase -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "fqdn-image" -}}
+{{- if .Values.inf.registry -}}
+{{- printf "%s/%s" .Values.inf.registry.server .Values.image.repository -}}
+{{- else -}}
+{{- .Values.image.repository -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "protocol" -}}
+{{- if .Values.inf.tls.enabled -}}
+{{- printf "%s" "https" -}}
+{{- else -}}
+{{- printf "%s" "http" -}}
+{{- end -}}
+{{- end -}}

deploy/k8s/archived/helm/catalog-api/templates/configmap.yaml

@@ -0,0 +1,21 @@
+{{- $name := include "catalog-api.fullname" . -}}
+{{- $sqlsrv := include "sql-name" . -}}
+{{- $webshoppingapigw := include "url-of" (list .Values.app.ingress.entries.webshoppingapigw .) -}}
+{{- $protocol := include "protocol" . -}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "cfg-{{ $name }}"
+  labels:
+    app: {{ template "catalog-api.name" . }}
+    chart: {{ template "catalog-api.chart" .}}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+  catalog__ConnectionString: Server={{ $sqlsrv }};Initial Catalog={{ .Values.inf.sql.catalog.db }};User Id={{ .Values.inf.sql.common.user }};Password={{ .Values.inf.sql.common.pwd }};
+  catalog__PicBaseUrl: {{ $protocol }}://{{ $webshoppingapigw }}/c/api/v1/catalog/items/[0]/pic/
+  catalog__AzureStorageEnabled: "{{ .Values.inf.misc.useAzureStorage }}"
+  all__EventBusConnection: {{ .Values.inf.eventbus.constr }}
+  all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}"
+  all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}"

deploy/k8s/archived/helm/catalog-api/templates/deployment.yaml

@@ -0,0 +1,99 @@
+{{- $name := include "catalog-api.fullname" . -}}
+{{- $cfgname := printf "%s-%s" "cfg" $name -}}
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "catalog-api.fullname" . }}
+  labels:
+    ufo: {{ $cfgname}}
+    app: {{ template "catalog-api.name" . }}
+    chart: {{ template "catalog-api.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "catalog-api.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "catalog-api.name" . }}
+        release: {{ .Release.Name }}
+      {{ if .Values.inf.mesh.enabled -}}
+      annotations:
+        linkerd.io/inject: enabled
+      {{- end }}             
+    spec:
+      {{ if .Values.inf.registry -}}
+      imagePullSecrets:
+      - name: {{ .Values.inf.registry.secretName }}
+      {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}
+          {{ if .Values.probes -}}
+          {{- if .Values.probes.liveness -}}
+          livenessProbe:
+            httpGet:
+              port: {{ .Values.probes.liveness.port }}
+              path: {{ .Values.probes.liveness.path }}
+            initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.probes -}}
+          {{- if .Values.probes.readiness }}
+          readinessProbe:
+            httpGet:
+              port: {{ .Values.probes.readiness.port }}
+              path: {{ .Values.probes.readiness.path }}
+            initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
+            timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
+          {{- end -}}
+          {{- end }}               
+          image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: PATH_BASE
+              value: {{ include "pathBase" . }}
+            - name: k8sname
+              value: {{ .Values.clusterName }}
+          {{- if .Values.env.values -}}
+          {{- range .Values.env.values }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+          {{- end -}}
+          {{- end -}}
+          {{- if .Values.env.configmap -}}
+          {{- range .Values.env.configmap }}
+            - name: {{ .name }}
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ $cfgname }}
+                  key: {{ .key }}
+          {{- end -}}
+          {{- end }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+            - name: grpc
+              containerPort: 81
+              protocol: TCP              
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+

deploy/k8s/archived/helm/catalog-api/templates/service.yaml

@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.app.svc.catalog }}
+  labels:
+    app: {{ template "catalog-api.name" . }}
+    chart: {{ template "catalog-api.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+    - port: {{ .Values.service.grpcPort }}
+      targetPort: grpc
+      protocol: TCP
+      name: grpc     
+  selector:
+    app: {{ template "catalog-api.name" . }}
+    release: {{ .Release.Name }}

deploy/k8s/archived/helm/catalog-api/values.yaml

@@ -0,0 +1,63 @@
+replicaCount: 1
+clusterName: eshop-aks
+pathBase: /catalog-api
+
+image:
+  repository: eshop/catalog.api
+  tag: latest
+  pullPolicy: IfNotPresent
+
+service:
+  type: ClusterIP
+  port: 80
+  grpcPort: 81
+
+resources: {}
+
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+# env defines the environment variables that will be declared in the pod
+env:
+  urls:
+  # configmap declares variables which value is taken from the config map defined in template configmap.yaml (name is name of var and key the key in configmap).
+  configmap:
+    - name: ConnectionString
+      key: catalog__ConnectionString
+    - name: PicBaseUrl
+      key: catalog__PicBaseUrl
+    - name: AzureStorageEnabled
+      key: catalog__AzureStorageEnabled
+    - name: ApplicationInsights__InstrumentationKey
+      key: all__InstrumentationKey
+    - name: EventBusConnection
+      key: all__EventBusConnection
+    - name: AzureServiceBusEnabled
+      key: all__UseAzureServiceBus
+      # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
+  values:
+    - name: ASPNETCORE_ENVIRONMENT
+      value: Development
+    - name: OrchestratorType
+      value: 'K8S'
+    - name: PORT
+      value: "80"
+    - name: GRPC_PORT
+      value: "81"
+probes:
+  liveness:
+    path: /liveness
+    initialDelaySeconds: 10
+    periodSeconds: 15
+    port: 80
+  readiness:
+    path: /hc
+    timeoutSeconds: 5
+    initialDelaySeconds: 90
+    periodSeconds: 60
+    port: 80
+

deploy/k8s/archived/helm/deploy-all.ps1

@@ -0,0 +1,149 @@
+Param(
+    [parameter(Mandatory=$false)][string]$registry,
+    [parameter(Mandatory=$false)][string]$dockerUser,
+    [parameter(Mandatory=$false)][string]$dockerPassword,
+    [parameter(Mandatory=$false)][string]$externalDns,
+    [parameter(Mandatory=$false)][string]$appName="eshop",
+    [parameter(Mandatory=$false)][bool]$deployInfrastructure=$true,
+    [parameter(Mandatory=$false)][bool]$deployCharts=$true,
+    [parameter(Mandatory=$false)][bool]$clean=$true,
+    [parameter(Mandatory=$false)][string]$aksName="",
+    [parameter(Mandatory=$false)][string]$aksRg="",
+    [parameter(Mandatory=$false)][string]$imageTag="latest",
+    [parameter(Mandatory=$false)][bool]$useLocalk8s=$false,
+    [parameter(Mandatory=$false)][bool]$useMesh=$false,
+    [parameter(Mandatory=$false)][string][ValidateSet('Always','IfNotPresent','Never', IgnoreCase=$false)]$imagePullPolicy="Always",
+    [parameter(Mandatory=$false)][string][ValidateSet('prod','staging','none','custom', IgnoreCase=$false)]$sslSupport = "none",
+    [parameter(Mandatory=$false)][string]$tlsSecretName = "eshop-tls-custom",
+    [parameter(Mandatory=$false)][string]$chartsToDeploy="*",
+    [parameter(Mandatory=$false)][string]$ingressMeshAnnotationsFile="ingress_values_linkerd.yaml"
+    )
+
+function Install-Chart  {
+    Param([string]$chart,[string]$initialOptions, [bool]$customRegistry)
+    $options=$initialOptions
+    if ($sslEnabled) {
+        $options = "$options --set ingress.tls[0].secretName=$tlsSecretName --set ingress.tls[0].hosts={$dns}" 
+        if ($sslSupport -ne "custom") {
+            $options = "$options --set inf.tls.issuer=$sslIssuer"
+        }
+    }
+    if ($customRegistry) {
+        $options = "$options --set inf.registry.server=$registry --set inf.registry.login=$dockerUser --set inf.registry.pwd=$dockerPassword --set inf.registry.secretName=eshop-docker-scret"
+    }
+    
+    if ($chart -ne "eshop-common" -or $customRegistry)  {       # eshop-common is ignored when no secret must be deployed        
+        $command = "install $options --name=$appName-$chart $chart"
+        Write-Host "Helm Command: helm $command" -ForegroundColor Gray
+        Invoke-Expression 'cmd /c "helm $command"'
+    }
+}
+
+$dns = $externalDns
+$sslEnabled=$false
+$sslIssuer=""
+
+if ($sslSupport -eq "staging") {
+    $sslEnabled=$true
+    $tlsSecretName="eshop-letsencrypt-staging"
+    $sslIssuer="letsencrypt-staging"
+}
+elseif ($sslSupport -eq "prod") {
+    $sslEnabled=$true
+    $tlsSecretName="eshop-letsencrypt-prod"
+    $sslIssuer="letsencrypt-prod"
+}
+elseif ($sslSupport -eq "custom") {
+    $sslEnabled=$true
+}
+
+$ingressValuesFile="ingress_values.yaml"
+
+if ($useLocalk8s -eq $true) {
+    $ingressValuesFile="ingress_values_dockerk8s.yaml"
+    $dns="localhost"
+}
+
+if ($externalDns -eq "aks") {
+    if  ([string]::IsNullOrEmpty($aksName) -or [string]::IsNullOrEmpty($aksRg)) {
+        Write-Host "Error: When using -dns aks, MUST set -aksName and -aksRg too." -ForegroundColor Red
+        exit 1
+    }
+    Write-Host "Getting DNS of AKS of AKS $aksName (in resource group $aksRg)..." -ForegroundColor Green
+    $dns = $(az aks show -n $aksName  -g $aksRg --query addonProfiles.httpApplicationRouting.config.HTTPApplicationRoutingZoneName)
+    if ([string]::IsNullOrEmpty($dns)) {
+        Write-Host "Error getting DNS of AKS $aksName (in resource group $aksRg). Please ensure AKS has httpRouting enabled AND Azure CLI is logged & in version 2.0.37 or higher" -ForegroundColor Red
+        exit 1
+    }
+    $dns = $dns -replace '[\"]'
+    Write-Host "DNS base found is $dns. Will use $appName.$dns for the app!" -ForegroundColor Green
+    $dns = "$appName.$dns"
+}
+
+# Initialization & check commands
+if ([string]::IsNullOrEmpty($dns)) {
+    Write-Host "No DNS specified. Ingress resources will be bound to public ip" -ForegroundColor Yellow
+    if ($sslEnabled) {
+        Write-Host "Can't bound SSL to public IP. DNS is mandatory when using TLS" -ForegroundColor Red
+        exit 1
+    }
+}
+
+if ($useLocalk8s -and $sslEnabled) {
+    Write-Host "SSL can'be enabled on local K8s." -ForegroundColor Red
+    exit 1
+}
+
+if ($clean) {
+    Write-Host "Cleaning previous helm releases..." -ForegroundColor Green
+    helm delete --purge $(helm ls -q eshop) 
+    Write-Host "Previous releases deleted" -ForegroundColor Green
+}
+
+$useCustomRegistry=$false
+
+if (-not [string]::IsNullOrEmpty($registry)) {
+    $useCustomRegistry=$true
+    if ([string]::IsNullOrEmpty($dockerUser) -or [string]::IsNullOrEmpty($dockerPassword)) {
+        Write-Host "Error: Must use -dockerUser AND -dockerPassword if specifying custom registry" -ForegroundColor Red
+        exit 1
+    }
+}
+
+Write-Host "Begin eShopOnContainers installation using Helm" -ForegroundColor Green
+
+$infras = ("sql-data", "nosql-data", "rabbitmq", "keystore-data", "basket-data")
+$charts = ("eshop-common", "basket-api","catalog-api", "identity-api", "mobileshoppingagg","ordering-api","ordering-backgroundtasks","ordering-signalrhub", "payment-api", "webmvc", "webshoppingagg", "webspa", "webstatus", "webhooks-api", "webhooks-web")
+$gateways = ("apigwmm", "apigwms", "apigwwm", "apigwws")
+
+if ($deployInfrastructure) {
+    foreach ($infra in $infras) {
+        Write-Host "Installing infrastructure: $infra" -ForegroundColor Green
+        helm install --values app.yaml --values inf.yaml --values $ingressValuesFile --set app.name=$appName --set inf.k8s.dns=$dns --set "ingress.hosts={$dns}" --name="$appName-$infra" $infra     
+    }
+}
+else {
+    Write-Host "eShopOnContainers infrastructure (bbdd, redis, ...) charts aren't installed (-deployCharts is false)" -ForegroundColor Yellow
+}
+
+if ($deployCharts) {
+    foreach ($chart in $charts) {
+        if ($chartsToDeploy -eq "*" -or $chartsToDeploy.Contains($chart)) {
+            Write-Host "Installing: $chart" -ForegroundColor Green
+            Install-Chart $chart "-f app.yaml --values inf.yaml -f $ingressValuesFile -f $ingressMeshAnnotationsFile --set app.name=$appName --set inf.k8s.dns=$dns --set ingress.hosts={$dns} --set image.tag=$imageTag --set image.pullPolicy=$imagePullPolicy --set inf.tls.enabled=$sslEnabled --set inf.mesh.enabled=$useMesh --set inf.k8s.local=$useLocalk8s" $useCustomRegistry
+        }
+    }
+
+    foreach ($chart in $gateways) {
+        if ($chartsToDeploy -eq "*" -or $chartsToDeploy.Contains($chart)) {
+            Write-Host "Installing Api Gateway Chart: $chart" -ForegroundColor Green
+            Install-Chart $chart "-f app.yaml -f inf.yaml -f $ingressValuesFile  --set app.name=$appName --set inf.k8s.dns=$dns  --set image.pullPolicy=$imagePullPolicy --set inf.mesh.enabled=$useMesh --set ingress.hosts={$dns} --set inf.tls.enabled=$sslEnabled" $false
+            
+        }
+    }
+}
+else {
+    Write-Host "eShopOnContainers non-infrastructure charts aren't installed (-deployCharts is false)" -ForegroundColor Yellow
+}
+
+Write-Host "helm charts installed." -ForegroundColor Green

deploy/k8s/archived/helm/deploy-all.sh

@@ -12,14 +12,18 @@ Parameters:
     The name of the AKS cluster. Required when the registry (using the -r parameter) is set to "aks".
   --aks-rg <AKS resource group>
     The resource group for the AKS cluster. Required when the registry (using the -r parameter) is set to "aks".
-  -c | --chart <name of chart>
+  -b | --build-solution
-    The name of the chart to upgrade (or install)
+    Force a solution build before deployment (default: false).
   -d | --dns <dns or ip address> | --dns aks
     Specifies the external DNS/ IP address of the Kubernetes cluster.
     If 'aks' is set as value, the DNS value is retrieved from the AKS. --aks-name and --aks-rg are needed.
     When --use-local-k8s is specified the external DNS is automatically set to localhost.
   -h | --help
     Displays this help text and exits the script.
+  --image-build
+    Build images (default is to not build all images).
+  --image-push
+    Upload images to the container registry (default is not pushing to the custom registry)
   -n | --app-name <the name of the app>
     Specifies the name of the application (default: eshop).
   --namespace <namespace name>
@@ -29,7 +33,10 @@ Parameters:
   -r | --registry <container registry>
     Specifies the container registry to use (required), e.g. myregistry.azurecr.io.
   --skip-clean
-    Do not clean the Kubernetes helm chart. Default is to clean the chart.
+    Do not clean the Kubernetes cluster (default is to clean the cluster).
+  --skip-infrastructure
+    Do not deploy infrastructure resources (like sql-data, no-sql or redis).
+    This is useful for production environments where infrastructure is hosted outside the Kubernetes cluster.
   -t | --tag <docker image tag>
     The tag used for the newly created docker images. Default: latest.
   -u | --docker-username <docker username>
@@ -50,31 +57,30 @@ For more information see https://kubernetes.io/docs/tasks/administer-cluster/nam
 END
 }
 
-acr_connected=''
 app_name='eshop'
 aks_name=''
 aks_rg=''
-chart=''
+build_images=''
 clean='yes'
+build_solution=''
 container_registry=''
 docker_password=''
 docker_username=''
 dns=''
 image_tag='latest'
+push_images=''
 skip_infrastructure=''
 use_local_k8s=''
 namespace='eshop'
 
 while [[ $# -gt 0 ]]; do
   case "$1" in
-    --acr-connected )
-      acr_connected='yes'; shift ;;
     --aks-name )
       aks_name="$2"; shift 2;;
     --aks-rg )
       aks_rg="$2"; shift 2;;
-    -c | --chart )
+    -b | --build-solution )
-      chart="$2"; shift 2;;
+      build_solution='yes'; shift ;;
     -d | --dns )
       dns="$2"; shift 2;;
     -h | --help )
@@ -107,11 +113,24 @@ while [[ $# -gt 0 ]]; do
   esac
 done
 
+if [[ $build_solution ]]; then
+  echo "#################### Building $app_name solution ####################"
+  dotnet publish -o obj/Docker/publish ../../eShopOnContainers-ServicesAndWebApps.sln
+fi
+
 export TAG=$image_tag
 
+if [[ $build_images ]]; then
+  echo "#################### Building the $app_name Docker images ####################"
+  docker-compose -p ../.. -f ../../docker-compose.yml build
+
+  # Remove temporary images
+  docker rmi $(docker images -qf "dangling=true") 
+fi
+
 use_custom_registry=''
 
-if [[ -n $container_registry ]] && [[ -z $acr_connected ]]; then 
+if [[ -n $container_registry ]]; then 
   echo "################ Log into custom registry $container_registry ##################"
   use_custom_registry='yes'
   if [[ -z $docker_username ]] || [[ -z $docker_password ]]; then
@@ -121,6 +140,22 @@ if [[ -n $container_registry ]] && [[ -z $acr_connected ]]; then
   docker login -u $docker_username -p $docker_password $container_registry
 fi
 
+if [[ $push_images ]]; then
+  echo "#################### Pushing images to the container registry ####################"
+  services=(basket.api catalog.api identity.api ordering.api payment.api webmvc webspa webstatus)
+
+  if [[ -z "$(docker image ls -q --filter=reference=eshop/$service:$image_tag)" ]]; then
+    image_tag=linux-$image_tag
+  fi
+
+  for service in "${services[@]}"
+  do
+    echo "Pushing image for service $service..."
+    docker tag "eshop/$service:$image_tag" "$container_registry/$service:$image_tag"
+    docker push "$container_registry/$service:$image_tag"
+  done
+fi
+
 ingress_values_file="ingress_values.yaml"
 
 if [[ $use_local_k8s ]]; then
@@ -161,39 +196,37 @@ if [[ -z $dns ]]; then
   echo "No DNS specified. Ingress resources will be bound to public IP."
 fi
 
-previous_install=''
+if [[ $clean ]]; then
-if [[ -z $(helm ls -q --namespace $namespace | grep "$app_name-$chart") ]]; then
-  echo "No previous release found"
-else
-  previous_install='yes'
-fi
-  
-if [[ $clean ]] && [[ $previous_install ]]; then
   echo "Cleaning previous helm releases..."
-  helm uninstall "$app_name-$chart" --namespace $namespace
+  if [[ -z $(helm ls -q --namespace $namespace) ]]; then
-  echo "Previous release deleted"
+    echo "No previous releases found"
-  waitsecs=5; while [ $waitsecs -gt 0 ]; do echo -ne "$waitsecs\033[0K\r"; sleep 1; : $((waitsecs--)); done
+  else
-  previous_install=''
+    helm delete --purge $(helm ls -q --namespace $namespace)
+    echo "Previous releases deleted"
+    waitsecs=10; while [ $waitsecs -gt 0 ]; do echo -ne "$waitsecs\033[0K\r"; sleep 1; : $((waitsecs--)); done
+  fi
 fi
 
-echo "#################### Begin $app_name $chart installation using Helm ####################"
+echo "#################### Begin $app_name installation using Helm ####################"
-if [[ $use_custom_registry ]] || [[ $acr_connected ]]; then
+infras=(sql-data nosql-data rabbitmq keystore-data basket-data)
-  if [[ -z $acr_connected ]]; then
+charts=(eshop-common apigwms apigwws basket-api catalog-api identity-api mobileshoppingagg ordering-api ordering-backgroundtasks ordering-signalrhub payment-api webmvc webshoppingagg webspa webstatus webhooks-api webhooks-web)
-    if [[ -z $previous_install ]]; then
+
-      helm upgrade --install "$app_name-$chart" --namespace $namespace --set "ingress.hosts={$dns}" --set inf.registry.server=$container_registry --set inf.registry.login=$docker_username --set inf.registry.pwd=$docker_password --set inf.registry.secretName=eshop-docker-scret --values app.yaml --values inf.yaml --values $ingress_values_file --set app.name=$app_name --set inf.k8s.dns=$dns --set image.tag=$image_tag --set image.pullPolicy=Always $chart 
+if [[ !$skip_infrastructure ]]; then
-    else
+  for infra in "${infras[@]}"
-      helm upgrade --install "$app_name-$chart" --namespace $namespace --set "ingress.hosts={$dns}" --values app.yaml --values inf.yaml --values $ingress_values_file --set app.name=$app_name --set inf.k8s.dns=$dns --set image.tag=$image_tag --set image.pullPolicy=Always $chart 
+  do
-    fi
+    echo "Installing infrastructure: $infra"
-  elif [[ $chart != "eshop-common" ]]; then
+    helm install --namespace $namespace --set "ingress.hosts={$dns}" --values app.yaml --values inf.yaml --values $ingress_values_file --set app.name=$app_name --set inf.k8s.dns=$dns --name="$app_name-$infra" $infra     
-    # ACR is already connected, so we don't need username/password
+  done  
-    if [[ -z $previous_install ]]; then
-      helm install "$app_name-$chart" --namespace $namespace --set "ingress.hosts={$dns}" --set inf.registry.server=$container_registry --values app.yaml --values inf.yaml --values $ingress_values_file --set app.name=$app_name --set inf.k8s.dns=$dns --set image.tag=$image_tag --set image.pullPolicy=Always $chart 
-    else
-      # don't set the image repo since it's already set
-      helm upgrade "$app_name-$chart" --namespace $namespace --set "ingress.hosts={$dns}" --values app.yaml --values inf.yaml --values $ingress_values_file --set app.name=$app_name --set inf.k8s.dns=$dns --set image.tag=$image_tag --set image.pullPolicy=Always $chart 
-    fi
-  fi
-elif [[ $chart != "eshop-common" ]]; then  # eshop-common is ignored when no secret must be deployed
-  helm upgrade --install "$app_name-$chart" --namespace $namespace --set "ingress.hosts={$dns}" --values app.yaml --values inf.yaml --values $ingress_values_file --set app.name=$app_name --set inf.k8s.dns=$dns --set image.tag=$image_tag --set image.pullPolicy=Always $chart 
 fi
-echo "FINISHED: Helm chart installed."
+
+for chart in "${charts[@]}"
+do
+    echo "Installing: $chart"
+    if [[ $use_custom_registry ]]; then 
+      helm install --namespace $namespace --set "ingress.hosts={$dns}" --set inf.registry.server=$container_registry --set inf.registry.login=$docker_username --set inf.registry.pwd=$docker_password --set inf.registry.secretName=eshop-docker-scret --values app.yaml --values inf.yaml --values $ingress_values_file --set app.name=$app_name --set inf.k8s.dns=$dns --set image.tag=$image_tag --set image.pullPolicy=Always --name="$app_name-$chart" $chart 
+    elif [[ $chart != "eshop-common" ]]; then  # eshop-common is ignored when no secret must be deployed
+      helm install --namespace $namespace --set "ingress.hosts={$dns}" --values app.yaml --values inf.yaml --values $ingress_values_file --set app.name=$app_name --set inf.k8s.dns=$dns --set image.tag=$image_tag --set image.pullPolicy=Always --name="$app_name-$chart" $chart 
+    fi
+done
+
+echo "FINISHED: Helm charts installed."

deploy/k8s/archived/helm/eshop-common/.helmignore

@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj

deploy/k8s/archived/helm/eshop-common/Chart.yaml

@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: eshop-common
+version: 0.1.0

deploy/k8s/archived/helm/eshop-common/templates/NOTES.txt

@@ -0,0 +1,7 @@
+Common eShop resources installed:
+
+{{- if .Values.inf.registry -}}
+* Docker registry secret ({{ .Values.inf.registry.secretName }})
+{{- end -}}
+
++++ Done +++

deploy/k8s/archived/helm/eshop-common/templates/_helpers.tpl

@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "eshop-common.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "eshop-common.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "eshop-common.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}

deploy/k8s/archived/helm/eshop-common/templates/_names.tpl

@@ -0,0 +1,3 @@
+{{- define "imagePullSecret" }}
+{{- printf "{\"auths\": {\"%s\": {\"auth\": \"%s\"}}}" .Values.inf.registry.server (printf "%s:%s" .Values.inf.registry.login .Values.inf.registry.pwd | b64enc) | b64enc }}
+{{- end }}

deploy/k8s/archived/helm/eshop-common/templates/secret.yaml

@@ -0,0 +1,9 @@
+{{- if .Values.inf.registry -}}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .Values.inf.registry.secretName }}
+type: kubernetes.io/dockerconfigjson
+data:
+  .dockerconfigjson: {{ template "imagePullSecret" . }}
+{{- end -}}