From 0982a57d29968ddcdf4c47f3be55c4ff00d55f3d Mon Sep 17 00:00:00 2001 From: niallthomson Date: Wed, 3 May 2023 19:37:01 +0000 Subject: [PATCH] Release 0.4.0 --- deploy/kubernetes/charts/assets/values.yaml | 2 +- deploy/kubernetes/charts/carts/values.yaml | 2 +- deploy/kubernetes/charts/catalog/values.yaml | 2 +- deploy/kubernetes/charts/checkout/values.yaml | 2 +- deploy/kubernetes/charts/orders/values.yaml | 2 +- deploy/kubernetes/charts/ui/values.yaml | 2 +- deploy/terraform/lib/images/generated.tf.json | 2 +- dist/docker-compose/docker-compose.yml | 14 ++-- dist/kubernetes/deploy.yaml | 74 +++++++++++++++---- 9 files changed, 73 insertions(+), 29 deletions(-) diff --git a/deploy/kubernetes/charts/assets/values.yaml b/deploy/kubernetes/charts/assets/values.yaml index dc21c06f6..9027d8d78 100644 --- a/deploy/kubernetes/charts/assets/values.yaml +++ b/deploy/kubernetes/charts/assets/values.yaml @@ -7,7 +7,7 @@ replicaCount: 1 image: repository: public.ecr.aws/aws-containers/retail-store-sample-assets pullPolicy: IfNotPresent - tag: 0.3.0 + tag: 0.4.0 imagePullSecrets: [] nameOverride: "" diff --git a/deploy/kubernetes/charts/carts/values.yaml b/deploy/kubernetes/charts/carts/values.yaml index 3264eb7b2..6ea6174ce 100644 --- a/deploy/kubernetes/charts/carts/values.yaml +++ b/deploy/kubernetes/charts/carts/values.yaml @@ -7,7 +7,7 @@ replicaCount: 1 image: repository: public.ecr.aws/aws-containers/retail-store-sample-cart pullPolicy: IfNotPresent - tag: 0.3.0 + tag: 0.4.0 imagePullSecrets: [] nameOverride: "" diff --git a/deploy/kubernetes/charts/catalog/values.yaml b/deploy/kubernetes/charts/catalog/values.yaml index 6ea7a2596..a7ece7e6f 100644 --- a/deploy/kubernetes/charts/catalog/values.yaml +++ b/deploy/kubernetes/charts/catalog/values.yaml @@ -7,7 +7,7 @@ replicaCount: 1 image: repository: public.ecr.aws/aws-containers/retail-store-sample-catalog pullPolicy: IfNotPresent - tag: 0.3.0 + tag: 0.4.0 imagePullSecrets: [] nameOverride: "" diff --git a/deploy/kubernetes/charts/checkout/values.yaml b/deploy/kubernetes/charts/checkout/values.yaml index d38e8f058..9f7eb00e0 100644 --- a/deploy/kubernetes/charts/checkout/values.yaml +++ b/deploy/kubernetes/charts/checkout/values.yaml @@ -7,7 +7,7 @@ replicaCount: 1 image: repository: public.ecr.aws/aws-containers/retail-store-sample-checkout pullPolicy: IfNotPresent - tag: 0.3.0 + tag: 0.4.0 imagePullSecrets: [] nameOverride: "" diff --git a/deploy/kubernetes/charts/orders/values.yaml b/deploy/kubernetes/charts/orders/values.yaml index 9172ccc85..33909bcad 100644 --- a/deploy/kubernetes/charts/orders/values.yaml +++ b/deploy/kubernetes/charts/orders/values.yaml @@ -7,7 +7,7 @@ replicaCount: 1 image: repository: public.ecr.aws/aws-containers/retail-store-sample-orders pullPolicy: IfNotPresent - tag: 0.3.0 + tag: 0.4.0 imagePullSecrets: [] nameOverride: "" diff --git a/deploy/kubernetes/charts/ui/values.yaml b/deploy/kubernetes/charts/ui/values.yaml index 84817fd35..36755b8e9 100644 --- a/deploy/kubernetes/charts/ui/values.yaml +++ b/deploy/kubernetes/charts/ui/values.yaml @@ -7,7 +7,7 @@ replicaCount: 1 image: repository: public.ecr.aws/aws-containers/retail-store-sample-ui pullPolicy: IfNotPresent - tag: 0.3.0 + tag: 0.4.0 imagePullSecrets: [] nameOverride: "" diff --git a/deploy/terraform/lib/images/generated.tf.json b/deploy/terraform/lib/images/generated.tf.json index c2ba59f7a..b9fd758ad 100644 --- a/deploy/terraform/lib/images/generated.tf.json +++ b/deploy/terraform/lib/images/generated.tf.json @@ -1,6 +1,6 @@ { "locals": { - "published_tag": "0.3.0", + "published_tag": "0.4.0", "published_repository": "public.ecr.aws/aws-containers" } } diff --git a/dist/docker-compose/docker-compose.yml b/dist/docker-compose/docker-compose.yml index 996487370..19bbce7d5 100644 --- a/dist/docker-compose/docker-compose.yml +++ b/dist/docker-compose/docker-compose.yml @@ -28,14 +28,14 @@ services: - ENDPOINTS_CHECKOUT=http://checkout:8080 - ENDPOINTS_ASSETS=http://assets:8080 hostname: ui - image: public.ecr.aws/aws-containers/retail-store-sample-ui:0.3.0 + image: public.ecr.aws/aws-containers/retail-store-sample-ui:0.4.0 restart: always mem_limit: 256m cap_drop: - ALL catalog: hostname: catalog - image: public.ecr.aws/aws-containers/retail-store-sample-catalog:0.3.0 + image: public.ecr.aws/aws-containers/retail-store-sample-catalog:0.4.0 restart: always environment: - GIN_MODE=release @@ -56,7 +56,7 @@ services: mem_limit: 128m carts: hostname: carts - image: public.ecr.aws/aws-containers/retail-store-sample-cart:0.3.0 + image: public.ecr.aws/aws-containers/retail-store-sample-cart:0.4.0 restart: always environment: - JAVA_OPTS=-XX:MaxRAMPercentage=75.0 -Djava.security.egd=file:/dev/urandom @@ -76,7 +76,7 @@ services: mem_limit: 256m orders: hostname: orders - image: public.ecr.aws/aws-containers/retail-store-sample-orders:0.3.0 + image: public.ecr.aws/aws-containers/retail-store-sample-orders:0.4.0 restart: always environment: - JAVA_OPTS=-XX:MaxRAMPercentage=75.0 -Djava.security.egd=file:/dev/urandom @@ -89,7 +89,7 @@ services: - SPRING_DATASOURCE_READER_USERNAME=orders_user - SPRING_DATASOURCE_READER_PASSWORD=${MYSQL_PASSWORD} - SPRING_RABBITMQ_HOST=rabbitmq - mem_limit: 256m + mem_limit: 512m cap_drop: - ALL orders-db: @@ -104,7 +104,7 @@ services: - MYSQL_PASSWORD=${MYSQL_PASSWORD} mem_limit: 128m checkout: - image: public.ecr.aws/aws-containers/retail-store-sample-checkout:0.3.0 + image: public.ecr.aws/aws-containers/retail-store-sample-checkout:0.4.0 hostname: checkout restart: always read_only: true @@ -125,7 +125,7 @@ services: hostname: assets environment: - PORT=8080 - image: public.ecr.aws/aws-containers/retail-store-sample-assets:0.3.0 + image: public.ecr.aws/aws-containers/retail-store-sample-assets:0.4.0 restart: always mem_limit: 64m cap_drop: diff --git a/dist/kubernetes/deploy.yaml b/dist/kubernetes/deploy.yaml index 6041d1ae1..d28586582 100644 --- a/dist/kubernetes/deploy.yaml +++ b/dist/kubernetes/deploy.yaml @@ -9,6 +9,7 @@ metadata: app.kubernetes.io/name: catalog app.kubernetes.io/instance: catalog app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample app.kubernetes.io/managed-by: Helm --- # Source: catalog/templates/mysql-secret.yaml @@ -18,7 +19,7 @@ metadata: name: catalog-db data: username: "Y2F0YWxvZw==" - password: "QVVhenpJaThrOGl2UE52Sw==" + password: "b0R1STdETk9oTFR3aDJrWA==" --- # Source: catalog/templates/configmap.yml apiVersion: v1 @@ -63,6 +64,7 @@ metadata: app.kubernetes.io/name: catalog app.kubernetes.io/instance: catalog app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample app.kubernetes.io/managed-by: Helm spec: type: ClusterIP @@ -75,6 +77,7 @@ spec: app.kubernetes.io/name: catalog app.kubernetes.io/instance: catalog app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample --- # Source: catalog/templates/deployment.yaml apiVersion: apps/v1 @@ -86,6 +89,7 @@ metadata: app.kubernetes.io/name: catalog app.kubernetes.io/instance: catalog app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -98,6 +102,7 @@ spec: app.kubernetes.io/name: catalog app.kubernetes.io/instance: catalog app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample template: metadata: annotations: @@ -108,6 +113,7 @@ spec: app.kubernetes.io/name: catalog app.kubernetes.io/instance: catalog app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample spec: serviceAccountName: catalog securityContext: @@ -135,7 +141,7 @@ spec: readOnlyRootFilesystem: true runAsNonRoot: true runAsUser: 1000 - image: "public.ecr.aws/aws-containers/retail-store-sample-catalog:0.3.0" + image: "public.ecr.aws/aws-containers/retail-store-sample-catalog:0.4.0" imagePullPolicy: IfNotPresent ports: - name: http @@ -230,6 +236,7 @@ metadata: app.kubernetes.io/name: ui app.kubernetes.io/instance: ui app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample app.kubernetes.io/managed-by: Helm --- # Source: ui/templates/configmap.yml @@ -251,6 +258,7 @@ metadata: app.kubernetes.io/name: ui app.kubernetes.io/instance: ui app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample app.kubernetes.io/managed-by: Helm spec: type: LoadBalancer @@ -263,6 +271,7 @@ spec: app.kubernetes.io/name: ui app.kubernetes.io/instance: ui app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample --- # Source: ui/templates/deployment.yaml apiVersion: apps/v1 @@ -274,6 +283,7 @@ metadata: app.kubernetes.io/name: ui app.kubernetes.io/instance: ui app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -286,6 +296,7 @@ spec: app.kubernetes.io/name: ui app.kubernetes.io/instance: ui app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample template: metadata: annotations: @@ -296,6 +307,7 @@ spec: app.kubernetes.io/name: ui app.kubernetes.io/instance: ui app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample spec: serviceAccountName: ui securityContext: @@ -317,7 +329,7 @@ spec: readOnlyRootFilesystem: true runAsNonRoot: true runAsUser: 1000 - image: "public.ecr.aws/aws-containers/retail-store-sample-ui:0.3.0" + image: "public.ecr.aws/aws-containers/retail-store-sample-ui:0.4.0" imagePullPolicy: IfNotPresent ports: - name: http @@ -354,6 +366,7 @@ metadata: app.kubernetes.io/name: catalog app.kubernetes.io/instance: catalog app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample app.kubernetes.io/managed-by: Helm --- # Source: catalog/templates/mysql-secret.yaml @@ -363,7 +376,7 @@ metadata: name: catalog-db data: username: "Y2F0YWxvZw==" - password: "VnpUdEw1anVyTVo1amtSRA==" + password: "M1VNeVBhZFRVQWYzSVl5WQ==" --- # Source: catalog/templates/configmap.yml apiVersion: v1 @@ -408,6 +421,7 @@ metadata: app.kubernetes.io/name: catalog app.kubernetes.io/instance: catalog app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample app.kubernetes.io/managed-by: Helm spec: type: ClusterIP @@ -420,6 +434,7 @@ spec: app.kubernetes.io/name: catalog app.kubernetes.io/instance: catalog app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample --- # Source: catalog/templates/deployment.yaml apiVersion: apps/v1 @@ -431,6 +446,7 @@ metadata: app.kubernetes.io/name: catalog app.kubernetes.io/instance: catalog app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -443,6 +459,7 @@ spec: app.kubernetes.io/name: catalog app.kubernetes.io/instance: catalog app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample template: metadata: annotations: @@ -453,6 +470,7 @@ spec: app.kubernetes.io/name: catalog app.kubernetes.io/instance: catalog app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample spec: serviceAccountName: catalog securityContext: @@ -480,7 +498,7 @@ spec: readOnlyRootFilesystem: true runAsNonRoot: true runAsUser: 1000 - image: "public.ecr.aws/aws-containers/retail-store-sample-catalog:0.3.0" + image: "public.ecr.aws/aws-containers/retail-store-sample-catalog:0.4.0" imagePullPolicy: IfNotPresent ports: - name: http @@ -575,6 +593,7 @@ metadata: app.kubernetes.io/name: carts app.kubernetes.io/instance: carts app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample app.kubernetes.io/managed-by: Helm --- # Source: carts/templates/configmap.yml @@ -624,6 +643,7 @@ metadata: app.kubernetes.io/name: carts app.kubernetes.io/instance: carts app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample app.kubernetes.io/managed-by: Helm spec: type: ClusterIP @@ -636,6 +656,7 @@ spec: app.kubernetes.io/name: carts app.kubernetes.io/instance: carts app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample --- # Source: carts/templates/deployment.yaml apiVersion: apps/v1 @@ -647,6 +668,7 @@ metadata: app.kubernetes.io/name: carts app.kubernetes.io/instance: carts app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -659,6 +681,7 @@ spec: app.kubernetes.io/name: carts app.kubernetes.io/instance: carts app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample template: metadata: annotations: @@ -669,6 +692,7 @@ spec: app.kubernetes.io/name: carts app.kubernetes.io/instance: carts app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample spec: serviceAccountName: carts securityContext: @@ -688,7 +712,7 @@ spec: readOnlyRootFilesystem: true runAsNonRoot: true runAsUser: 1000 - image: "public.ecr.aws/aws-containers/retail-store-sample-cart:0.3.0" + image: "public.ecr.aws/aws-containers/retail-store-sample-cart:0.4.0" imagePullPolicy: IfNotPresent ports: - name: http @@ -759,6 +783,7 @@ metadata: app.kubernetes.io/name: orders app.kubernetes.io/instance: orders app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample app.kubernetes.io/managed-by: Helm --- # Source: orders/templates/mysql-secret.yaml @@ -768,7 +793,7 @@ metadata: name: orders-db data: username: "b3JkZXJz" - password: "YmZrRnJUVFBSZmhuS0lYbw==" + password: "dk1vZzM2UEV4djh6aDNSSQ==" --- # Source: orders/templates/rabbitmq-secret.yaml apiVersion: v1 @@ -848,6 +873,7 @@ metadata: app.kubernetes.io/name: orders app.kubernetes.io/instance: orders app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample app.kubernetes.io/managed-by: Helm spec: type: ClusterIP @@ -860,6 +886,7 @@ spec: app.kubernetes.io/name: orders app.kubernetes.io/instance: orders app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample --- # Source: orders/templates/deployment.yaml apiVersion: apps/v1 @@ -871,6 +898,7 @@ metadata: app.kubernetes.io/name: orders app.kubernetes.io/instance: orders app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -883,6 +911,7 @@ spec: app.kubernetes.io/name: orders app.kubernetes.io/instance: orders app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample template: metadata: annotations: @@ -893,6 +922,7 @@ spec: app.kubernetes.io/name: orders app.kubernetes.io/instance: orders app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample spec: serviceAccountName: orders securityContext: @@ -934,7 +964,7 @@ spec: readOnlyRootFilesystem: true runAsNonRoot: true runAsUser: 1000 - image: "public.ecr.aws/aws-containers/retail-store-sample-orders:0.3.0" + image: "public.ecr.aws/aws-containers/retail-store-sample-orders:0.4.0" imagePullPolicy: IfNotPresent ports: - name: http @@ -1073,6 +1103,7 @@ metadata: app.kubernetes.io/name: checkout app.kubernetes.io/instance: checkout app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample app.kubernetes.io/managed-by: Helm --- # Source: checkout/templates/configmap.yml @@ -1117,6 +1148,7 @@ metadata: app.kubernetes.io/name: checkout app.kubernetes.io/instance: checkout app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample app.kubernetes.io/managed-by: Helm spec: type: ClusterIP @@ -1129,6 +1161,7 @@ spec: app.kubernetes.io/name: checkout app.kubernetes.io/instance: checkout app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample --- # Source: checkout/templates/deployment.yaml apiVersion: apps/v1 @@ -1140,6 +1173,7 @@ metadata: app.kubernetes.io/name: checkout app.kubernetes.io/instance: checkout app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -1152,6 +1186,7 @@ spec: app.kubernetes.io/name: checkout app.kubernetes.io/instance: checkout app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample template: metadata: annotations: @@ -1162,6 +1197,7 @@ spec: app.kubernetes.io/name: checkout app.kubernetes.io/instance: checkout app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample spec: serviceAccountName: checkout securityContext: @@ -1178,7 +1214,7 @@ spec: readOnlyRootFilesystem: true runAsNonRoot: true runAsUser: 1000 - image: "public.ecr.aws/aws-containers/retail-store-sample-checkout:0.3.0" + image: "public.ecr.aws/aws-containers/retail-store-sample-checkout:0.4.0" imagePullPolicy: IfNotPresent ports: - name: http @@ -1249,6 +1285,7 @@ metadata: app.kubernetes.io/name: assets app.kubernetes.io/instance: assets app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample app.kubernetes.io/managed-by: Helm --- # Source: assets/templates/configmap.yml @@ -1269,6 +1306,7 @@ metadata: app.kubernetes.io/name: assets app.kubernetes.io/instance: assets app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample app.kubernetes.io/managed-by: Helm spec: type: ClusterIP @@ -1281,6 +1319,7 @@ spec: app.kubernetes.io/name: assets app.kubernetes.io/instance: assets app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample --- # Source: assets/templates/deployment.yaml apiVersion: apps/v1 @@ -1292,6 +1331,7 @@ metadata: app.kubernetes.io/name: assets app.kubernetes.io/instance: assets app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -1304,16 +1344,14 @@ spec: app.kubernetes.io/name: assets app.kubernetes.io/instance: assets app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample template: metadata: - annotations: - prometheus.io/path: /metrics - prometheus.io/port: "8080" - prometheus.io/scrape: "true" labels: app.kubernetes.io/name: assets app.kubernetes.io/instance: assets app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample spec: serviceAccountName: assets securityContext: @@ -1328,7 +1366,7 @@ spec: drop: - ALL readOnlyRootFilesystem: false - image: "public.ecr.aws/aws-containers/retail-store-sample-assets:0.3.0" + image: "public.ecr.aws/aws-containers/retail-store-sample-assets:0.4.0" imagePullPolicy: IfNotPresent ports: - name: http @@ -1365,6 +1403,7 @@ metadata: app.kubernetes.io/name: ui app.kubernetes.io/instance: ui app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample app.kubernetes.io/managed-by: Helm --- # Source: ui/templates/configmap.yml @@ -1390,6 +1429,7 @@ metadata: app.kubernetes.io/name: ui app.kubernetes.io/instance: ui app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample app.kubernetes.io/managed-by: Helm spec: type: LoadBalancer @@ -1402,6 +1442,7 @@ spec: app.kubernetes.io/name: ui app.kubernetes.io/instance: ui app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample --- # Source: ui/templates/deployment.yaml apiVersion: apps/v1 @@ -1413,6 +1454,7 @@ metadata: app.kubernetes.io/name: ui app.kubernetes.io/instance: ui app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -1425,6 +1467,7 @@ spec: app.kubernetes.io/name: ui app.kubernetes.io/instance: ui app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample template: metadata: annotations: @@ -1435,6 +1478,7 @@ spec: app.kubernetes.io/name: ui app.kubernetes.io/instance: ui app.kubernetes.io/component: service + app.kuberneres.io/owner: retail-store-sample spec: serviceAccountName: ui securityContext: @@ -1456,7 +1500,7 @@ spec: readOnlyRootFilesystem: true runAsNonRoot: true runAsUser: 1000 - image: "public.ecr.aws/aws-containers/retail-store-sample-ui:0.3.0" + image: "public.ecr.aws/aws-containers/retail-store-sample-ui:0.4.0" imagePullPolicy: IfNotPresent ports: - name: http