Change Dockerfile ports + update helm chart

arnaud-tincelin · Nov 16, 2023 · 433290d · 433290d
1 parent 1a28018
commit 433290d
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -60,3 +60,5 @@ KUBECONFIG=kubeconfig kubectl -n howtoaks run -i --tty busybox --image=busybox:1
 wget myapp-howtoaks-front.howtoaks:8080/
 wget myapp-howtoaks-api.howtoaks:8081/weatherforecast
 ```
+
+## Use Kubernetes role-based access control with Microsoft Entra ID in Azure Kubernetes Service
diff --git a/charts/howtoaks/Chart.yaml b/charts/howtoaks/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.3
+version: 1.0.4
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/howtoaks/templates/api-service.yaml b/charts/howtoaks/templates/api-service.yaml
@@ -8,8 +8,7 @@ spec:
   type: {{ .Values.api.service.type }}
   ports:
     - port: {{ .Values.api.service.port }}
-      targetPort: http
+      targetPort: 80
       protocol: TCP
-      name: http
   selector:
     {{- include "howtoaks.selectorLabelsApi" . | nindent 4 }}
diff --git a/charts/howtoaks/templates/frontend-service.yaml b/charts/howtoaks/templates/frontend-service.yaml
@@ -8,8 +8,7 @@ spec:
   type: {{ .Values.frontend.service.type }}
   ports:
     - port: {{ .Values.frontend.service.port }}
-      targetPort: http
+      targetPort: 80
       protocol: TCP
-      name: http
   selector:
     {{- include "howtoaks.selectorLabelsFront" . | nindent 4 }}
diff --git a/charts/howtoaks/values.yaml b/charts/howtoaks/values.yaml
@@ -25,7 +25,7 @@ api:
     # runAsUser: 1000
   service:
     type: ClusterIP
-    port: 80
+    port: 8081
   resources: {}
     # We usually recommend not to specify default resources and to leave this as a conscious
     # choice for the user. This also increases chances charts run on environments with little
@@ -66,7 +66,7 @@ frontend:
     # runAsUser: 1000
   service:
     type: ClusterIP
-    port: 80
+    port: 8080
   resources: {}
     # We usually recommend not to specify default resources and to leave this as a conscious
     # choice for the user. This also increases chances charts run on environments with little

diff --git a/docs/howtoaks-1.0.3.tgz b/docs/howtoaks-1.0.3.tgz
diff --git a/docs/howtoaks-1.0.4.tgz b/docs/howtoaks-1.0.4.tgz
diff --git a/docs/index.yaml b/docs/index.yaml
@@ -3,17 +3,27 @@ entries:
   howtoaks:
   - apiVersion: v2
     appVersion: 1.0.0
-    created: "2023-11-15T21:15:04.284182239+01:00"
+    created: "2023-11-16T21:20:44.886870245+01:00"
     description: Deploy the HowToAks application
-    digest: 0013eff9d3d3978e87ae1d42a363450e4c85a001f9cc594ccc465bea09b76c46
+    digest: 4450eee26ca48ed56062c5f7da8910925a3d95990c74c3e995922e00dae2dd1f
+    name: howtoaks
+    type: application
+    urls:
+    - https://arnaud-tincelin.github.io/aks-demo/howtoaks-1.0.4.tgz
+    version: 1.0.4
+  - apiVersion: v2
+    appVersion: 1.0.0
+    created: "2023-11-16T21:20:44.880150143+01:00"
+    description: Deploy the HowToAks application
+    digest: ca0a10650b0fc6d5ed08cbb38ba5dca4c2270ee7675181c18f3166d272280cec
     name: howtoaks
     type: application
     urls:
     - https://arnaud-tincelin.github.io/aks-demo/howtoaks-1.0.3.tgz
     version: 1.0.3
   - apiVersion: v2
     appVersion: 1.0.0
-    created: "2023-11-15T21:15:04.27320778+01:00"
+    created: "2023-11-16T21:20:44.87388488+01:00"
     description: Deploy the HowToAks application
     digest: ee4f1ee59e58bf6306a54a6de0141066ba3a73d86cc1e56bd5d4759d3535d436
     name: howtoaks
@@ -23,7 +33,7 @@ entries:
     version: 1.0.2
   - apiVersion: v2
     appVersion: 1.0.0
-    created: "2023-11-15T21:15:04.257635726+01:00"
+    created: "2023-11-16T21:20:44.867757551+01:00"
     description: A Helm chart for Kubernetes
     digest: 5a54719351b9d0a6f27802bdbc2cbd8a14d035eac1e9edf91b9526aaff5e3212
     name: howtoaks
@@ -34,7 +44,7 @@ entries:
   weatherforecast:
   - apiVersion: v2
     appVersion: 1.17.0
-    created: "2023-11-15T21:15:04.30036604+01:00"
+    created: "2023-11-16T21:20:44.894004567+01:00"
     description: A Helm chart for Kubernetes
     digest: 47d350149d0abdf73d8810c47a9657e5f16635ddcca9cd9e8cd911c1c0797659
     home: https://github.com/arnaud-tincelin/aks-demo
@@ -50,4 +60,4 @@ entries:
     urls:
     - https://arnaud-tincelin.github.io/aks-demo/weatherforecast-0.1.0.tgz
     version: 0.1.0
-generated: "2023-11-15T21:15:04.24199298+01:00"
+generated: "2023-11-16T21:20:44.861025978+01:00"
diff --git a/howtoaks/HowToAKS.Web/Dockerfile b/howtoaks/HowToAKS.Web/Dockerfile
@@ -2,8 +2,7 @@
 
 FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
 WORKDIR /app
-EXPOSE 8082
-EXPOSE 8083
+EXPOSE 80
 
 FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
 WORKDIR /src

diff --git a/howtoaks/HowToAKS.WebApi/Dockerfile b/howtoaks/HowToAKS.WebApi/Dockerfile
@@ -2,11 +2,11 @@
 
 FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
 WORKDIR /app
-EXPOSE 8080
-EXPOSE 8081
+EXPOSE 80
 
 FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
 WORKDIR /src
+COPY ["./HowToAKS.WebApi.csproj", "./"]
 RUN dotnet restore "HowToAKS.WebApi.csproj"
 COPY . .
 WORKDIR "/src/."

diff --git a/terraform/providers.tf b/terraform/providers.tf
@@ -1,5 +1,9 @@
 provider "azurerm" {
-  features {}
+  features {
+    resource_group {
+      prevent_deletion_if_contains_resources = false
+    }
+  }
 }
 
 provider "helm" {