diff --git a/etc/k8s/azure/scripts/values.azure.st.yaml b/etc/k8s/azure/scripts/values.azure.st.yaml deleted file mode 100644 index 847c08c4..00000000 --- a/etc/k8s/azure/scripts/values.azure.st.yaml +++ /dev/null @@ -1,370 +0,0 @@ -# auth-server sub-chart override -authserver: - config: - selfUrl: https://demomicro-st-authserver.eshoponabp.com - corsOrigins: https://gateway.eshoponabp.com,https://gateway-public.eshoponabp.com,https://identity.eshoponabp.com,https://administration.eshoponabp.com,https://basket.eshoponabp.com,https://catalog.eshoponabp.com,https://order.eshoponabp.com,https://payment.eshoponabp.com,https://admin.eshoponabp.com,https://www.eshoponabp.com - allowedRedirectUrls: https://admin.eshoponabp.com - authServer: - authority: https://demomicro-st-authserver.eshoponabp.com - requireHttpsMetadata: "false" - connectionStrings: - administrationService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" - identityService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Identity;User ID=postgres;password=myPassw0rd;Pooling=false" - dotnetEnv: Production - redisHost: eshop-az-redis - rabbitmqHost: eshop-az-rabbitmq - elasticsearchHost: eshop-az-elasticsearch - ingress: - host: demomicro-st-authserver.eshoponabp.com - tlsSecret: eshop-wildcard-tls - image: - repository: "volocr.azurecr.io/demomicro/app-authserver" - tag: 1.0.0 - -# web sub-chart override -web: - config: - selfUrl: https://admin.eshoponabp.com - gatewayUrl: https://gateway.eshoponabp.com - authServer: - authority: https://auth.eshoponabp.com - requireHttpsMetadata: false - responseType: "code" - strictDiscoveryDocumentValidation: false - skipIssuerCheck: true - ingress: - host: admin.eshoponabp.com - image: - repository: "volocr.azurecr.io/eshoponabp/app-web" - tag: 1.0.5 - -# public-web sub-chart override -public-web: - config: - selfUrl: https://www.eshoponabp.com - gatewayUrl: https://gateway-public.eshoponabp.com/ - authServer: - authority: https://auth.eshoponabp.com - requireHttpsMetadata: "false" - isOnProd: "true" - metaAddress: http://eshop-az-authserver - dotnetEnv: Production - redisHost: eshop-az-redis - rabbitmqHost: eshop-az-rabbitmq - elasticsearchHost: eshop-az-elasticsearch - - ingress: - host: eshoponabp.com - image: - repository: "volocr.azurecr.io/eshoponabp/app-publicweb" - tag: 1.0.6 - -# identity-service sub-chart override -identity: - config: - selfUrl: https://identity.eshoponabp.com - corsOrigins: https://gateway.eshoponabp.com,https://gateway-public.eshoponabp.com - connectionStrings: - identityService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Identity;User ID=postgres;password=myPassw0rd;Pooling=false" - administrationService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" - authServer: - authority: http://eshop-az-authserver - requireHttpsMetadata: "false" - swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" - dotnetEnv: Production - redisHost: eshop-az-redis - rabbitmqHost: eshop-az-rabbitmq - elasticsearchHost: eshop-az-elasticsearch - identityServerClients: # Seeded Clients - webRootUrl: https://admin.eshoponabp.com/ - publicWebRootUrl: https://www.eshoponabp.com/ - webGatewayRootUrl: https://gateway.eshoponabp.com/ - publicWebGatewayRootUrl: https://gateway-public.eshoponabp.com/ - identityServiceRootUrl: https://identity.eshoponabp.com/ - administrationServiceRootUrl: https://administration.eshoponabp.com/ - accountServiceRootUrl: https://auth.eshoponabp.com - basketServiceRootUrl: https://basket.eshoponabp.com/ - catalogServiceRootUrl: https://catalog.eshoponabp.com - orderingServiceRootUrl: https://order.eshoponabp.com - paymentServiceRootUrl: https://payment.eshoponabp.com - ingress: - host: identity.eshoponabp.com - image: - repository: "volocr.azurecr.io/eshoponabp/service-identity" - tag: 1.0.5 - -# administration sub-chart override -administration: - config: - selfUrl: https://administration.eshoponabp.com - corsOrigins: https://gateway.eshoponabp.com,https://gateway-public.eshoponabp.com,https://eshop-az-gateway-internal - connectionStrings: - administrationService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" - authServer: - authority: http://eshop-az-authserver - requireHttpsMetadata: "false" - swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" - remoteServices: - abpIdentityBaseUrl: https://identity.eshoponabp.com - useCurrentToken: "false" - dotnetEnv: Production - redisHost: eshop-az-redis - rabbitmqHost: eshop-az-rabbitmq - elasticsearchHost: eshop-az-elasticsearch - synchedCommunication: # Used for server-to-server (client-credentials) communication with identityService for user permissions - authority: https://auth.eshoponabp.com - ingress: - host: administration.eshoponabp.com - image: - repository: "volocr.azurecr.io/eshoponabp/service-administration" - tag: 1.0.5 - -# gateway-web sub-chart override -gateway-web: - config: - selfUrl: https://gateway.eshoponabp.com - corsOrigins: https://admin.eshoponabp.com - globalConfigurationBaseUrl: http://eshop-az-gateway-public - authServer: - authority: http://eshop-az-authserver - requireHttpsMetadata: "false" - swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" - dotnetEnv: Production - redisHost: eshop-az-redis - rabbitmqHost: eshop-az-rabbitmq - elasticsearchHost: eshop-az-elasticsearch - ingress: - host: gateway.eshoponabp.com - image: - repository: "volocr.azurecr.io/eshoponabp/gateway-web" - tag: 1.0.5 - reRoutes: - accountService: - url: http://eshop-az-authserver - identityService: - url: http://eshop-az-identity - administrationService: - url: http://eshop-az-administration - catalogService: - url: http://eshop-az-catalog - orderingService: - url: http://eshop-az-ordering - -# gateway-web-public sub-chart override -gateway-web-public: - config: - selfUrl: https://gateway-public.eshoponabp.com - authServer: - authority: http://eshop-az-authserver - requireHttpsMetadata: "false" - swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" - dotnetEnv: Production - redisHost: eshop-az-redis - rabbitmqHost: eshop-az-rabbitmq - elasticsearchHost: eshop-az-elasticsearch - ingress: - host: gateway-public.eshoponabp.com - image: - repository: "volocr.azurecr.io/eshoponabp/gateway-web-public" - tag: 1.0.5 - reRoutes: - accountService: - url: http://eshop-az-authserver - identityService: - url: http://eshop-az-identity - administrationService: - url: http://eshop-az-administration - catalogService: - url: http://eshop-az-catalog - basketService: - url: http://eshop-az-basket - orderingService: - url: http://eshop-az-ordering - paymentService: - url: http://eshop-az-payment - -# basket-service sub-chart override -basket: - config: - selfUrl: https://basket.eshoponabp.com - corsOrigins: https://gateway.eshoponabp.com,https://gateway-public.eshoponabp.com,https://www.eshoponabp.com - connectionStrings: - administrationService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" - authServer: - authority: http://eshop-az-authserver - requireHttpsMetadata: "false" - swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" - dotnetEnv: Production - redisHost: eshop-az-redis - rabbitmqHost: eshop-az-rabbitmq - elasticsearchHost: eshop-az-elasticsearch - remoteServices: - catalogBaseUrl: http://eshop-az-catalog:80 - catalogGrpcUrl: http://eshop-az-catalog:81 - ingress: - host: basket.eshoponabp.com - image: - repository: "volocr.azurecr.io/eshoponabp/service-basket" - tag: 1.0.5 - -# catalog-service sub-chart override -catalog: - config: - selfUrl: https://catalog.eshoponabp.com - corsOrigins: https://gateway.eshoponabp.com,https://gateway-public.eshoponabp.com,https://www.eshoponabp.com,https://admin.eshoponabp.com - connectionStrings: - catalogService: "mongodb://eshop-az-mongodb/EShopOnAbp_Catalog" - administrationService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" - authServer: - authority: http://eshop-az-authserver - requireHttpsMetadata: "false" - swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" - dotnetEnv: Production - redisHost: eshop-az-redis - rabbitmqHost: eshop-az-rabbitmq - elasticsearchHost: eshop-az-elasticsearch - kestrel: - httpUrl: http://eshop-az-catalog:80 - httpProtocols: Http1AndHttp2 - grpcUrl: http://eshop-az-catalog:81 - grpcProtocols: Http2 - ingress: - host: catalog.eshoponabp.com - image: - repository: "volocr.azurecr.io/eshoponabp/service-catalog" - tag: 1.0.5 - -# ordering-service sub-chart override -ordering: - config: - selfUrl: https://order.eshoponabp.com - corsOrigins: https://gateway.eshoponabp.com,https://gateway-public.eshoponabp.com - connectionStrings: - orderingService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Ordering;User ID=postgres;password=myPassw0rd;Pooling=false" - administrationService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" - authServer: - authority: http://eshop-az-authserver - requireHttpsMetadata: "false" - swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" - dotnetEnv: Production - redisHost: eshop-az-redis - rabbitmqHost: eshop-az-rabbitmq - elasticsearchHost: eshop-az-elasticsearch - ingress: - host: order.eshoponabp.com - image: - repository: "volocr.azurecr.io/eshoponabp/service-ordering" - tag: 1.0.5 - -# payment-service sub-chart override -payment: - config: - selfUrl: https://payment.eshoponabp.com - corsOrigins: https://gateway.eshoponabp.com,https://gateway-public.eshoponabp.com - connectionStrings: - paymentService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Payment;User ID=postgres;password=myPassw0rd;Pooling=false" - administrationService: "Host=eshop-az-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" - authServer: - authority: http://eshop-az-authserver - requireHttpsMetadata: "false" - swaggerClientId: WebGateway_Swagger - swaggerClientSecret: "1q2w3e*" - dotnetEnv: Production - redisHost: eshop-az-redis - rabbitmqHost: eshop-az-rabbitmq - elasticsearchHost: eshop-az-elasticsearch - ingress: - host: payment.eshoponabp.com - image: - repository: "volocr.azurecr.io/eshoponabp/service-payment" - tag: 1.0.5 - -# Default values for eshoponabp. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -replicaCount: 1 - -image: - repository: nginx - pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. - tag: "" - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - -serviceAccount: - # Specifies whether a service account should be created - create: true - # Annotations to add to the service account - annotations: {} - # The name of the service account to use. - # If not set and create is true, a name is generated using the fullname template - name: "" - -podAnnotations: {} - -podSecurityContext: {} - # fsGroup: 2000 - -securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - -service: - type: ClusterIP - port: 80 - -ingress: - enabled: false - className: "" - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: chart-example.local - paths: - - path: / - pathType: ImplementationSpecific - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -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 - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - -nodeSelector: {} - -tolerations: [] - -affinity: {} \ No newline at end of file diff --git a/etc/k8s/eshoponabp/README.md b/etc/k8s/eshoponabp/README.md index be3a3d1a..64ebf43e 100644 --- a/etc/k8s/eshoponabp/README.md +++ b/etc/k8s/eshoponabp/README.md @@ -76,7 +76,7 @@ kubectl create secret tls -n eshop eshop-wildcard-tls --cert=./eshop-st-web+10.p 127.0.0.1 eshop-st-gateway-web-public ```` -* Run `helm upgrade --install eshop-st abp-charts/eshoponabp --namespace eshop --create-namespace` +* Run `helm upgrade --install eshop-st abp-charts/eshoponabp -f ./eshoponabp/values.artifacthub.yaml --namespace eshop --create-namespace` * *You may wait ~30 seconds on first run for preparing the database*. * Browse https://eshop-st-public-web for public and https://eshop-st-web for web application * Username: `admin`, password: `1q2w3E*`. diff --git a/etc/k8s/azure/scripts/values.azure.yaml b/etc/k8s/eshoponabp/values.azure.yaml similarity index 100% rename from etc/k8s/azure/scripts/values.azure.yaml rename to etc/k8s/eshoponabp/values.azure.yaml diff --git a/etc/k8s/eshoponabp/values.yaml b/etc/k8s/eshoponabp/values.yaml index dafd7bd6..cc837965 100644 --- a/etc/k8s/eshoponabp/values.yaml +++ b/etc/k8s/eshoponabp/values.yaml @@ -7,6 +7,8 @@ authserver: authServer: authority: http://eshop-st-authserver requireHttpsMetadata: "false" + swaggerClientId: WebGateway_Swagger + swaggerClientSecret: "1q2w3e*" connectionStrings: administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" identityService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Identity;User ID=postgres;password=myPassw0rd;Pooling=false" @@ -18,7 +20,7 @@ authserver: host: eshop-st-authserver tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/app-authserver" + repository: "eshoponabp/app-authserver" tag: 1.0.0 # web sub-chart override @@ -36,13 +38,13 @@ web: host: eshop-st-web tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/app-web" + repository: "eshoponabp/app-web" tag: 1.0.0 # public-web sub-chart override public-web: config: - selfUrl: c + selfUrl: https://eshop-st-public-web gatewayUrl: http://eshop-st-gateway-web-public/ authServer: authority: http://eshop-st-authserver @@ -57,7 +59,7 @@ public-web: host: eshop-st-public-web tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/app-publicweb" + repository: "eshoponabp/app-publicweb" tag: 1.0.0 # identity-service sub-chart override @@ -93,14 +95,14 @@ identity: host: eshop-st-identity tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/service-identity" + repository: "eshoponabp/service-identity" tag: 1.0.0 # administration sub-chart override administration: config: selfUrl: https://eshop-st-administration - corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public,https://eshop-st-gateway-internal + corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public connectionStrings: administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false" authServer: @@ -121,7 +123,7 @@ administration: host: eshop-st-administration tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/service-administration" + repository: "eshoponabp/service-administration" tag: 1.0.0 # gateway-web sub-chart override @@ -143,7 +145,7 @@ gateway-web: host: eshop-st-gateway-web tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/gateway-web" + repository: "eshoponabp/gateway-web" tag: 1.0.0 reRoutes: accountService: @@ -174,7 +176,7 @@ gateway-web-public: host: eshop-st-gateway-web-public tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/gateway-web-public" + repository: "eshoponabp/gateway-web-public" tag: 1.0.0 reRoutes: accountService: @@ -215,7 +217,7 @@ basket: host: eshop-st-basket tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/service-basket" + repository: "eshoponabp/service-basket" tag: 1.0.0 # catalog-service sub-chart override @@ -244,7 +246,7 @@ catalog: host: eshop-st-catalog tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/service-catalog" + repository: "eshoponabp/service-catalog" tag: 1.0.0 # ordering-service sub-chart override @@ -268,8 +270,8 @@ ordering: host: eshop-st-ordering tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/service-ordering" - tag: 1.0.1 + repository: "eshoponabp/service-ordering" + tag: 1.0.0 # payment-service sub-chart override payment: @@ -292,7 +294,7 @@ payment: host: eshop-st-payment tlsSecret: eshop-wildcard-tls image: - repository: "ghcr.io/volosoft/eshoponabp/service-payment" + repository: "eshoponabp/service-payment" tag: 1.0.0 # Default values for eshoponabp.