Skip to content

Commit f6e76ac

Browse files
pauldotyupauldotyu
committed
chore: bump image versions in k8s manifests
and update helm chart to default to chart app version
1 parent a55c55f commit f6e76ac

32 files changed

+67
-77
lines changed

‎.github/workflows/release-container-images.yaml‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ jobs:
160160
echo "Updating sample manifests..."
161161
SAMPLE_MANIFESTS=(
162162
"sample-manifests/docs/app-routing/aks-store-deployments-and-services.yaml"
163+
"sample-manifests/argocd/pets.yaml"
163164
)
164165
165166
for APP in "${APPS[@]}"; do
@@ -191,17 +192,6 @@ jobs:
191192
# kaito overlay uses full ghcr.io path
192193
update_full_image_ref "kustomize/overlays/kaito/ai-service.yaml" "ai-service" "$VERSION"
193194
194-
# =============================================================================
195-
# Update Helm chart values
196-
# =============================================================================
197-
198-
echo "Updating Helm chart values.yaml..."
199-
# Helm values.yaml uses separate 'tag' field: tag: "X.X.X"
200-
if [ -f "charts/aks-store-demo/values.yaml" ]; then
201-
sed -i -E "s|(tag: \")[^\"]+(\")|\1${VERSION}\2|g" "charts/aks-store-demo/values.yaml"
202-
echo "Updated Helm values.yaml"
203-
fi
204-
205195
echo "Manifest updates complete!"
206196
207197
- name: Commit and push changes
@@ -214,5 +204,5 @@ jobs:
214204
echo "No changes to commit"
215205
else
216206
git commit -m "chore: update container image tags to ${{ steps.set-version.outputs.VERSION }}"
217-
git push
207+
git push origin HEAD:main
218208
fi

‎Makefile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,49 +66,49 @@ provision-azure: ## Provision Azure Resources
6666
@if [ "$(BUILD_ORDER_SERVICE)" = true ]; then \
6767
az acr build -r $(ACR_NAME) -t order-service:$(IMAGE_VERSION) ./src/order-service; \
6868
else \
69-
az acr import -n $(ACR_NAME) --source ghcr.io/azure-samples/aks-store-demo/order-service:2.0.0 --image order-service:$(IMAGE_VERSION); \
69+
az acr import -n $(ACR_NAME) --source ghcr.io/azure-samples/aks-store-demo/order-service:latest --image order-service:$(IMAGE_VERSION); \
7070
fi
7171

7272
@if [ "$(BUILD_MAKELINE_SERVICE)" = true ]; then \
7373
az acr build -r $(ACR_NAME) -t makeline-service:$(IMAGE_VERSION) ./src/makeline-service; \
7474
else \
75-
az acr import -n $(ACR_NAME) --source ghcr.io/azure-samples/aks-store-demo/makeline-service:2.0.0 --image makeline-service:$(IMAGE_VERSION); \
75+
az acr import -n $(ACR_NAME) --source ghcr.io/azure-samples/aks-store-demo/makeline-service:latest --image makeline-service:$(IMAGE_VERSION); \
7676
fi
7777

7878
@if [ "$(BUILD_PRODUCT_SERVICE)" = true ]; then \
7979
az acr build -r $(ACR_NAME) -t product-service:$(IMAGE_VERSION) ./src/product-service; \
8080
else \
81-
az acr import -n $(ACR_NAME) --source ghcr.io/azure-samples/aks-store-demo/product-service:2.0.0 --image product-service:$(IMAGE_VERSION); \
81+
az acr import -n $(ACR_NAME) --source ghcr.io/azure-samples/aks-store-demo/product-service:latest --image product-service:$(IMAGE_VERSION); \
8282
fi
8383

8484
@if [ "$(BUILD_STORE_FRONT)" = true ]; then \
8585
az acr build -r $(ACR_NAME) -t store-front:$(IMAGE_VERSION) ./src/store-front; \
8686
else \
87-
az acr import -n $(ACR_NAME) --source ghcr.io/azure-samples/aks-store-demo/store-front:2.0.0 --image store-front:$(IMAGE_VERSION); \
87+
az acr import -n $(ACR_NAME) --source ghcr.io/azure-samples/aks-store-demo/store-front:latest --image store-front:$(IMAGE_VERSION); \
8888
fi
8989

9090
@if [ "$(BUILD_STORE_ADMIN)" = true ]; then \
9191
az acr build -r $(ACR_NAME) -t store-admin:$(IMAGE_VERSION) ./src/store-admin; \
9292
else \
93-
az acr import -n $(ACR_NAME) --source ghcr.io/azure-samples/aks-store-demo/store-admin:2.0.0 --image store-admin:$(IMAGE_VERSION); \
93+
az acr import -n $(ACR_NAME) --source ghcr.io/azure-samples/aks-store-demo/store-admin:latest --image store-admin:$(IMAGE_VERSION); \
9494
fi
9595

9696
@if [ "$(BUILD_VIRTUAL_CUSTOMER)" = true ]; then \
9797
az acr build -r $(ACR_NAME) -t virtual-customer:$(IMAGE_VERSION) ./src/virtual-customer; \
9898
else \
99-
az acr import -n $(ACR_NAME) --source ghcr.io/azure-samples/aks-store-demo/virtual-customer:2.0.0 --image virtual-customer:$(IMAGE_VERSION); \
99+
az acr import -n $(ACR_NAME) --source ghcr.io/azure-samples/aks-store-demo/virtual-customer:latest --image virtual-customer:$(IMAGE_VERSION); \
100100
fi
101101

102102
@if [ "$(BUILD_VIRTUAL_WORKER)" = true ]; then \
103103
az acr build -r $(ACR_NAME) -t virtual-worker:$(IMAGE_VERSION) ./src/virtual-worker; \
104104
else \
105-
az acr import -n $(ACR_NAME) --source ghcr.io/azure-samples/aks-store-demo/virtual-worker:2.0.0 --image virtual-worker:$(IMAGE_VERSION); \
105+
az acr import -n $(ACR_NAME) --source ghcr.io/azure-samples/aks-store-demo/virtual-worker:latest --image virtual-worker:$(IMAGE_VERSION); \
106106
fi
107107

108108
@if [ "$(BUILD_AI_SERVICE)" = true ]; then \
109109
az acr build -r $(ACR_NAME) -t ai-service:$(IMAGE_VERSION) ./src/ai-service; \
110110
else \
111-
az acr import -n $(ACR_NAME) --source ghcr.io/azure-samples/aks-store-demo/ai-service:2.0.0 --image ai-service:$(IMAGE_VERSION); \
111+
az acr import -n $(ACR_NAME) --source ghcr.io/azure-samples/aks-store-demo/ai-service:latest --image ai-service:$(IMAGE_VERSION); \
112112
fi
113113

114114
.PHONY: deploy-azure

‎ai-service.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
"kubernetes.io/os": linux
1717
containers:
1818
- name: ai-service
19-
image: ghcr.io/azure-samples/aks-store-demo/ai-service:2.0.0
19+
image: ghcr.io/azure-samples/aks-store-demo/ai-service:2.1.0
2020
ports:
2121
- containerPort: 5001
2222
env:

‎aks-store-all-in-one.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ spec:
193193
"kubernetes.io/os": linux
194194
containers:
195195
- name: order-service
196-
image: ghcr.io/azure-samples/aks-store-demo/order-service:2.0.0
196+
image: ghcr.io/azure-samples/aks-store-demo/order-service:2.1.0
197197
ports:
198198
- containerPort: 3000
199199
envFrom:
@@ -273,7 +273,7 @@ spec:
273273
"kubernetes.io/os": linux
274274
containers:
275275
- name: makeline-service
276-
image: ghcr.io/azure-samples/aks-store-demo/makeline-service:2.0.0
276+
image: ghcr.io/azure-samples/aks-store-demo/makeline-service:2.1.0
277277
ports:
278278
- containerPort: 3001
279279
env:
@@ -350,7 +350,7 @@ spec:
350350
"kubernetes.io/os": linux
351351
containers:
352352
- name: product-service
353-
image: ghcr.io/azure-samples/aks-store-demo/product-service:2.0.0
353+
image: ghcr.io/azure-samples/aks-store-demo/product-service:2.1.0
354354
ports:
355355
- containerPort: 3002
356356
env:
@@ -409,7 +409,7 @@ spec:
409409
"kubernetes.io/os": linux
410410
containers:
411411
- name: store-front
412-
image: ghcr.io/azure-samples/aks-store-demo/store-front:2.0.0
412+
image: ghcr.io/azure-samples/aks-store-demo/store-front:2.1.0
413413
ports:
414414
- containerPort: 8080
415415
name: store-front
@@ -472,7 +472,7 @@ spec:
472472
"kubernetes.io/os": linux
473473
containers:
474474
- name: store-admin
475-
image: ghcr.io/azure-samples/aks-store-demo/store-admin:2.0.0
475+
image: ghcr.io/azure-samples/aks-store-demo/store-admin:2.1.0
476476
ports:
477477
- containerPort: 8081
478478
name: store-admin
@@ -535,7 +535,7 @@ spec:
535535
"kubernetes.io/os": linux
536536
containers:
537537
- name: virtual-customer
538-
image: ghcr.io/azure-samples/aks-store-demo/virtual-customer:2.0.0
538+
image: ghcr.io/azure-samples/aks-store-demo/virtual-customer:2.1.0
539539
env:
540540
- name: ORDER_SERVICE_URL
541541
value: http://order-service:3000/
@@ -583,7 +583,7 @@ spec:
583583
"kubernetes.io/os": linux
584584
containers:
585585
- name: virtual-worker
586-
image: ghcr.io/azure-samples/aks-store-demo/virtual-worker:2.0.0
586+
image: ghcr.io/azure-samples/aks-store-demo/virtual-worker:2.1.0
587587
env:
588588
- name: MAKELINE_SERVICE_URL
589589
value: http://makeline-service:3001

‎aks-store-ingress-quickstart.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ spec:
131131
"kubernetes.io/os": linux
132132
containers:
133133
- name: order-service
134-
image: ghcr.io/azure-samples/aks-store-demo/order-service:2.0.0
134+
image: ghcr.io/azure-samples/aks-store-demo/order-service:2.1.0
135135
ports:
136136
- containerPort: 3000
137137
envFrom:
@@ -211,7 +211,7 @@ spec:
211211
"kubernetes.io/os": linux
212212
containers:
213213
- name: product-service
214-
image: ghcr.io/azure-samples/aks-store-demo/product-service:2.0.0
214+
image: ghcr.io/azure-samples/aks-store-demo/product-service:2.1.0
215215
ports:
216216
- containerPort: 3002
217217
env:
@@ -270,7 +270,7 @@ spec:
270270
"kubernetes.io/os": linux
271271
containers:
272272
- name: store-front
273-
image: ghcr.io/azure-samples/aks-store-demo/store-front:2.0.0
273+
image: ghcr.io/azure-samples/aks-store-demo/store-front:2.1.0
274274
ports:
275275
- containerPort: 8080
276276
name: store-front

‎aks-store-quickstart.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ spec:
107107
"kubernetes.io/os": linux
108108
containers:
109109
- name: order-service
110-
image: ghcr.io/azure-samples/aks-store-demo/order-service:2.0.0
110+
image: ghcr.io/azure-samples/aks-store-demo/order-service:2.1.0
111111
ports:
112112
- containerPort: 3000
113113
env:
@@ -195,7 +195,7 @@ spec:
195195
"kubernetes.io/os": linux
196196
containers:
197197
- name: product-service
198-
image: ghcr.io/azure-samples/aks-store-demo/product-service:2.0.0
198+
image: ghcr.io/azure-samples/aks-store-demo/product-service:2.1.0
199199
ports:
200200
- containerPort: 3002
201201
env:
@@ -254,7 +254,7 @@ spec:
254254
"kubernetes.io/os": linux
255255
containers:
256256
- name: store-front
257-
image: ghcr.io/azure-samples/aks-store-demo/store-front:2.0.0
257+
image: ghcr.io/azure-samples/aks-store-demo/store-front:2.1.0
258258
ports:
259259
- containerPort: 8080
260260
name: store-front

‎charts/aks-store-demo/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 1.4.0
18+
version: 1.5.0
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to
2222
# follow Semantic Versioning. They should reflect the version the application is using.
2323
# It is recommended to use it with quotes.
24-
appVersion: "2.0.0"
24+
appVersion: "2.1.0"

‎charts/aks-store-demo/templates/ai-service.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ spec:
7474
"kubernetes.io/os": linux
7575
containers:
7676
- name: ai-service
77-
image: {{ .Values.aiService.image.repository }}:{{ .Values.aiService.image.tag }}
77+
image: {{ .Values.aiService.image.repository }}:{{ .Values.aiService.image.tag | default .Chart.AppVersion }}
7878
ports:
7979
- containerPort: 5001
8080
envFrom:

‎charts/aks-store-demo/templates/makeline-service.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ spec:
5858
"kubernetes.io/os": linux
5959
containers:
6060
- name: makeline-service
61-
image: {{ .Values.makelineService.image.repository }}:{{ .Values.makelineService.image.tag }}
61+
image: {{ .Values.makelineService.image.repository }}:{{ .Values.makelineService.image.tag | default .Chart.AppVersion }}
6262
ports:
6363
- containerPort: 3001
6464
envFrom:

‎charts/aks-store-demo/templates/order-service.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ spec:
4949
"kubernetes.io/os": linux
5050
containers:
5151
- name: order-service
52-
image: {{ .Values.orderService.image.repository }}:{{ .Values.orderService.image.tag }}
52+
image: {{ .Values.orderService.image.repository }}:{{ .Values.orderService.image.tag | default .Chart.AppVersion }}
5353
ports:
5454
- containerPort: 3000
5555
envFrom:

0 commit comments

Comments
 (0)