Upgrade to Kubernetes 1.16.x

README.md

@@ -545,10 +545,37 @@ There are some additional prerequisites for this automation:
 - [GitHub Account](https://github.com/)
 - [Azure DevOps Organization](https://docs.microsoft.com/en-us/azure/devops/pipelines/get-started/pipelines-sign-up?view=azure-devops)
 - [Environment with AKS resource](https://docs.microsoft.com/en-us/azure/devops/pipelines/process/environments-kubernetes?view=azure-devops#azure-kubernetes-service) which creates a service account in the chosen cluster and namespace, which will be used by Azure DevOps account to deploy to AKS
+
+![](./media/azure-resource-environment.jpg)
+
 - [Azure service connection using service principal](https://docs.microsoft.com/en-us/azure/devops/pipelines/library/connect-to-azure?view=azure-devops#create-an-azure-resource-manager-service-connection-with-an-existing-service-principal) to establish authentication between Azure & Azure DevOps services
+
+![](./media/kubernetes-service-connection.jpg)
+
 > [!Important]
    > To simplify the service connection, use the same email address for Azure DevOps as you use for Azure.
-- Create an Azure KeyVault and upload secrets. Ensure the service principal used in the service connection above has GET, LIST [permissions](https://docs.microsoft.com/en-us/cli/azure/keyvault?view=azure-cli-latest#az-keyvault-set-policy) on the vault. Use below command for that:
+- Create an Azure KeyVault and upload secrets. 
+
+![](./media/kv-java-demo.jpg)
+
+```
+AZURE-REGISTRY-USERNAME=00000000-0000-0000-0000-000000000000
+AZURE-REGISTRY-PASSWORD=<Token obtained according to instrucciones in it url: https://docs.microsoft.com/en-us/azure/container-registry/container-registry-authentication>
+``` 
+
+Ensure the service principal used in the service connection above has GET, LIST [permissions](https://docs.microsoft.com/en-us/cli/azure/keyvault?view=azure-cli-latest#az-keyvault-set-policy) on the vault. Use below command for that:
+
+```
+$KV_NAME = kv_java_demo
+<clientId from the Azure SPN JSON> is obtained from the Azure Resource Manager created earlier.
+```
+
+![](./media/azure-resource-manager-get-principal.jpg)
+
+Next, you must to copy the cliente Id.
+
+![](./media/client-id-service-principal.jpg)
+
 ```
 az keyvault set-policy -n $KV_NAME --secret-permissions get list --spn <clientId from the Azure SPN JSON>
 ```  

azure-pipelines.yml

@@ -9,7 +9,7 @@ resources:
 - repo: self
 
 variables:
-  CONTAINER_REGISTRY: 'javademosregistry'
+  CONTAINER_REGISTRY: 'acr061174'
   CONFIG_PORT: '8888'
   REGISTRY_PORT: '8761'
   GATEWAY_PORT: '4000'
@@ -33,8 +33,8 @@ stages:
     - task: AzureKeyVault@1
       displayName: Fetch secrets from Azure Key vault
       inputs:
-        azureSubscription: 'Java Demos 2'
-        KeyVaultName: 'piggymetrics'
+        azureSubscription: 'arm-workshop-demo'
+        KeyVaultName: 'kv-joedayz-demo'
         SecretsFilter: '*'
 
     - task: Bash@3
@@ -91,16 +91,16 @@ stages:
     displayName: Deploy to AKS
     pool:
       vmImage: $(vmImageName)
-    environment: 'Piggymetrics.piggymetrics-azp'
+    environment: 'Piggymetrics.default'
     strategy:
       runOnce:
         deploy:
           steps:
           - task: AzureKeyVault@1
             displayName: Fetch secrets from Azure Key vault
             inputs:
-              azureSubscription: 'Java Demos 2'
-              KeyVaultName: 'piggymetrics'
+              azureSubscription: 'arm-workshop-demo'
+              KeyVaultName: 'kv-joedayz-demo'
               SecretsFilter: '*'
 
           - task: replacetokens@3

docs/create-mongodb-and-rabbitmq.md

@@ -74,12 +74,13 @@ Cut and paste the primary connection string as `MONGODB_URI` in `setup-env-varia
 
 ## Create RabbitMQ
 
-Create an instance of Bitnami RabbitMQ Stack For Microsoft Azure, go to 
+Create an instance of RabbitMQ Certified by Bitnami For Microsoft Azure, go to 
 [https://portal.azure.com/#blade/Microsoft_Azure_Marketplace/MarketplaceOffersBlade/selectedMenuItemId/home/searchQuery/rabbitmq](https://portal.azure.com/#blade/Microsoft_Azure_Marketplace/MarketplaceOffersBlade/selectedMenuItemId/home/searchQuery/rabbitmq) 
 and start:
 
 ![](../media/create-rabbitmq-on-azure-0.jpg)
 
+
 Fill in the form, use the same value as `RABBITMQ_RESOURCE_GROUP`, 
 `RABBITMQ_VM_NAME` and `RABBITMQ_VM_ADMIN_USERNAME`, and choose SSH. Select 'Standard DS3 v2' as 
 the size:
@@ -91,7 +92,9 @@ Accept defaults:
 Accept defaults:
 ![](../media/create-rabbitmq-on-azure-2.jpg)
 
-Accept defaults in all subsequent screens, and proceed to create:
+Accept defaults in all subsequent screens (Don't forget to download the .pem file), and proceed to create:
+
+
 ![](../media/create-rabbitmq-on-azure-3.jpg)
 
 ![](../media/create-rabbitmq-on-azure-4.jpg)
@@ -113,7 +116,9 @@ and set the `RABBITMQ_HOST` environment variable in
 # First, export the environment variables
 source .scripts/setup-env-variables-azure.sh
 # Open an SSH connection
-ssh selvasingh@${RABBITMQ_HOST}
+chmod 400 rabbitmqxxxx.pem
+
+ssh -i rabbitmqxxxx.pem selvasingh@${RABBITMQ_HOST}   (selvassingh is your rabbitmq admin)
 ``` 
 
 You can adjust RabbitMQ to connect with clients from a different machine:
@@ -201,4 +206,4 @@ export RABBITMQ_PASSWORD=INSERT-your-rabbitmq-password
 
 ```
 
-Go back to [How to use AKS end-to-end for Java apps?](https://github.com/azure-samples/java-on-aks)
+Go back to [How to use AKS end-to-end for Java apps?](https://github.com/azure-samples/java-on-aks)

kubernetes/1-config.yaml

@@ -10,17 +10,17 @@ metadata:
 spec:
   type: LoadBalancer
   ports:
-  - name: http
-    port: 8888
-    targetPort: 8888
+    - name: http
+      port: 8888
+      targetPort: 8888
   selector:
     project: piggymetrics
     tier: middleware
     app: config
 status:
   loadBalancer: {}
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
@@ -32,6 +32,9 @@ spec:
   replicas: 1
   strategy:
     type: RollingUpdate
+  selector:
+    matchLabels:
+        app: config    
   template:
     metadata:
       labels:
@@ -40,16 +43,16 @@ spec:
         app: config
     spec:
       containers:
-      - env:
-        - name: CONFIG_SERVICE_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: piggymetrics
-              key: config_service_password
-        image: ${CONTAINER_REGISTRY}.azurecr.io/piggymetrics-config:${IMAGE_TAG}
-        name: config
-        ports:
-        - containerPort: 8888
-        resources: {}
+        - env:
+            - name: CONFIG_SERVICE_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: piggymetrics
+                  key: config_service_password
+          image: acr061174.azurecr.io/piggymetrics-config:dev
+          name: config
+          ports:
+            - containerPort: 8888
+          resources: {}
       restartPolicy: Always
-status: {}
+status: {}

kubernetes/2-registry.yaml

@@ -10,17 +10,17 @@ metadata:
 spec:
   type: LoadBalancer
   ports:
-  - name: http
-    port: 8761
-    targetPort: 8761
+    - name: http
+      port: 8761
+      targetPort: 8761
   selector:
     project: piggymetrics
     tier: middleware
     app: registry
 status:
   loadBalancer: {}
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
@@ -32,6 +32,9 @@ spec:
   replicas: 1
   strategy:
     type: RollingUpdate
+  selector:
+    matchLabels:
+        app: registry    
   template:
     metadata:
       labels:
@@ -40,16 +43,16 @@ spec:
         app: registry
     spec:
       containers:
-      - env:
-        - name: CONFIG_SERVICE_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: piggymetrics
-              key: config_service_password
-        image: ${CONTAINER_REGISTRY}.azurecr.io/piggymetrics-registry:${IMAGE_TAG}
-        name: registry
-        ports:
-        - containerPort: 8761
-        resources: {}
+        - env:
+            - name: CONFIG_SERVICE_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: piggymetrics
+                  key: config_service_password
+          image: ${CONTAINER_REGISTRY}.azurecr.io/piggymetrics-registry:${IMAGE_TAG}
+          name: registry
+          ports:
+            - containerPort: 8761
+          resources: {}
       restartPolicy: Always
-status: {}
+status: {}

kubernetes/3-gateway.yaml

@@ -10,15 +10,15 @@ metadata:
 spec:
   type: LoadBalancer
   ports:
-  - name: http
-    port: 80
-    targetPort: 4000
+    - name: http
+      port: 80
+      targetPort: 4000
   selector:
     project: piggymetrics
     tier: frontend
     app: gateway
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: gateway
@@ -30,6 +30,9 @@ spec:
   replicas: 1
   strategy:
     type: RollingUpdate
+  selector:
+    matchLabels:
+        app: gateway        
   template:
     metadata:
       creationTimestamp: null
@@ -39,14 +42,14 @@ spec:
         app: gateway
     spec:
       containers:
-      - name: gateway
-        env:
-        - name: CONFIG_SERVICE_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: piggymetrics
-              key: config_service_password
-        image: ${CONTAINER_REGISTRY}.azurecr.io/piggymetrics-gateway:${IMAGE_TAG}
-        ports:
-        - containerPort: 4000
-      restartPolicy: Always
+        - name: gateway
+          env:
+            - name: CONFIG_SERVICE_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: piggymetrics
+                  key: config_service_password
+          image: ${CONTAINER_REGISTRY}.azurecr.io/piggymetrics-gateway:${IMAGE_TAG}
+          ports:
+            - containerPort: 4000
+      restartPolicy: Always