Compare commits

...

12 Commits

Author SHA1 Message Date
Ron
0fc1d6068d Merge pull request #210 from fleetbase/dev-v0.4.2
v0.4.2
2024-02-13 14:41:56 +08:00
Ronald A. Richardson
6993510d08 upgraded core-api for api credential key generation patch 2024-02-13 14:36:37 +08:00
Ron
4fcf09c1b8 Merge pull request #209 from fleetbase/dev-v0.4.1-version-patch
upgrade packages
2024-02-13 13:41:22 +08:00
Ronald A. Richardson
f89596a74b upgrade packages 2024-02-13 13:40:24 +08:00
Ron
d89e93f248 Merge pull request #208 from fleetbase/dev-v0.4.1-version-patch
v0.4.1 patch
2024-02-13 13:39:26 +08:00
Ronald A. Richardson
2f0c15bc93 bump version for v0.4.1 release 2024-02-13 13:37:34 +08:00
Ron
ae6c07006b Merge pull request #207 from fleetbase/dev-v0.4.1
v0.4.1
2024-02-13 13:26:53 +08:00
Ronald A. Richardson
d754641493 Upgraded to Fleet-Ops v0.4.8, Core API to v1.4.1 and added support for sendgrid officially. 2024-02-13 13:22:20 +08:00
Ron
bb0d706006 Merge pull request #205 from ekini/fix/crond 2024-02-10 15:02:38 +08:00
Eugene Dementyev
652bc363e1 Fix crond 2024-02-10 20:00:50 +13:00
Ron
363309af61 Merge pull request #204 from ekini/fix/helm_replicas 2024-02-10 15:00:30 +08:00
Eugene Dementyev
83791ea91c Scale deployment of the app to 2 by default 2024-02-10 19:57:37 +13:00
9 changed files with 150 additions and 69 deletions

View File

@@ -9,8 +9,8 @@
"license": "MIT",
"require": {
"php": "^7.3|^8.0",
"fleetbase/core-api": "^1.4.0",
"fleetbase/fleetops-api": "^0.4.7",
"fleetbase/core-api": "^1.4.2",
"fleetbase/fleetops-api": "^0.4.8",
"fleetbase/storefront-api": "^0.2.11",
"guzzlehttp/guzzle": "^7.0.1",
"laravel/framework": "^10.0",
@@ -20,7 +20,8 @@
"maatwebsite/excel": "^3.1",
"phpoffice/phpspreadsheet": "^1.28",
"predis/predis": "^2.1",
"psr/http-factory-implementation": "*"
"psr/http-factory-implementation": "*",
"s-ichikawa/laravel-sendgrid-driver": "^4.0"
},
"require-dev": {
"spatie/laravel-ignition": "^2.0",

177
api/composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "116ed9ec72f3248eee37c846f025f612",
"content-hash": "8dcb4c1bbe554a3f7ce6e249128e24e9",
"packages": [
{
"name": "aloha/twilio",
@@ -136,16 +136,16 @@
},
{
"name": "aws/aws-sdk-php",
"version": "3.298.5",
"version": "3.298.8",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "b9bc34a8702a37a6151d843af966bf3b36aaaae3"
"reference": "9d123669b14ccd0f87f7f7de77ace7e5d8fe9d13"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/b9bc34a8702a37a6151d843af966bf3b36aaaae3",
"reference": "b9bc34a8702a37a6151d843af966bf3b36aaaae3",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/9d123669b14ccd0f87f7f7de77ace7e5d8fe9d13",
"reference": "9d123669b14ccd0f87f7f7de77ace7e5d8fe9d13",
"shasum": ""
},
"require": {
@@ -225,9 +225,9 @@
"support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues",
"source": "https://github.com/aws/aws-sdk-php/tree/3.298.5"
"source": "https://github.com/aws/aws-sdk-php/tree/3.298.8"
},
"time": "2024-02-07T19:05:01+00:00"
"time": "2024-02-12T19:07:29+00:00"
},
{
"name": "aws/aws-sdk-php-laravel",
@@ -1943,16 +1943,16 @@
},
{
"name": "fleetbase/core-api",
"version": "1.4.0",
"version": "1.4.2",
"source": {
"type": "git",
"url": "https://github.com/fleetbase/core-api.git",
"reference": "c98e08a257d8dc480abfc5c2f48e62a7539c0dff"
"reference": "df54d53e420080353602b0ab8b05ded584cd72d3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fleetbase/core-api/zipball/c98e08a257d8dc480abfc5c2f48e62a7539c0dff",
"reference": "c98e08a257d8dc480abfc5c2f48e62a7539c0dff",
"url": "https://api.github.com/repos/fleetbase/core-api/zipball/df54d53e420080353602b0ab8b05ded584cd72d3",
"reference": "df54d53e420080353602b0ab8b05ded584cd72d3",
"shasum": ""
},
"require": {
@@ -2028,29 +2028,29 @@
],
"support": {
"issues": "https://github.com/fleetbase/core-api/issues",
"source": "https://github.com/fleetbase/core-api/tree/v1.4.0"
"source": "https://github.com/fleetbase/core-api/tree/v1.4.2"
},
"time": "2024-02-07T05:49:54+00:00"
"time": "2024-02-13T06:26:58+00:00"
},
{
"name": "fleetbase/fleetops-api",
"version": "0.4.7",
"version": "0.4.8",
"source": {
"type": "git",
"url": "https://github.com/fleetbase/fleetops.git",
"reference": "9ce45d040249ae7f0477a4c6f1fbb455f9579aee"
"reference": "899e67d9a87b29e8df3b5680d07ec8b78b12a3d9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fleetbase/fleetops/zipball/9ce45d040249ae7f0477a4c6f1fbb455f9579aee",
"reference": "9ce45d040249ae7f0477a4c6f1fbb455f9579aee",
"url": "https://api.github.com/repos/fleetbase/fleetops/zipball/899e67d9a87b29e8df3b5680d07ec8b78b12a3d9",
"reference": "899e67d9a87b29e8df3b5680d07ec8b78b12a3d9",
"shasum": ""
},
"require": {
"barryvdh/laravel-dompdf": "^2.0",
"brick/geo": "0.7.2",
"cknow/laravel-money": "^7.1",
"fleetbase/core-api": "^1.4.0",
"fleetbase/core-api": "^1.4.1",
"geocoder-php/google-maps-places-provider": "^1.4",
"giggsey/libphonenumber-for-php": "^8.13",
"league/geotools": "^1.1.0",
@@ -2116,9 +2116,9 @@
],
"support": {
"issues": "https://github.com/fleetbase/fleetops/issues",
"source": "https://github.com/fleetbase/fleetops/tree/v0.4.7"
"source": "https://github.com/fleetbase/fleetops/tree/v0.4.8"
},
"time": "2024-02-08T05:52:43+00:00"
"time": "2024-02-09T10:59:58+00:00"
},
{
"name": "fleetbase/laravel-mysql-spatial",
@@ -2732,16 +2732,16 @@
},
{
"name": "giggsey/libphonenumber-for-php",
"version": "8.13.29",
"version": "8.13.30",
"source": {
"type": "git",
"url": "https://github.com/giggsey/libphonenumber-for-php.git",
"reference": "b8fa0daf0c27bb6fdb5940e0288f203be7e5cfd4"
"reference": "e09260a4a470b3737877c0f04f964e8a4938ebbd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/b8fa0daf0c27bb6fdb5940e0288f203be7e5cfd4",
"reference": "b8fa0daf0c27bb6fdb5940e0288f203be7e5cfd4",
"url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/e09260a4a470b3737877c0f04f964e8a4938ebbd",
"reference": "e09260a4a470b3737877c0f04f964e8a4938ebbd",
"shasum": ""
},
"require": {
@@ -2800,7 +2800,7 @@
"issues": "https://github.com/giggsey/libphonenumber-for-php/issues",
"source": "https://github.com/giggsey/libphonenumber-for-php"
},
"time": "2024-01-26T08:49:18+00:00"
"time": "2024-02-09T12:16:23+00:00"
},
{
"name": "giggsey/locale",
@@ -2916,21 +2916,21 @@
},
{
"name": "google/cloud-core",
"version": "v1.54.0",
"version": "v1.55.0",
"source": {
"type": "git",
"url": "https://github.com/googleapis/google-cloud-php-core.git",
"reference": "cd3f670dbb7f6a5b9b550b0d1b8e5b6ed148fb58"
"reference": "45c8e6e0511944b410bb788a940b2a1ab75975ff"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/cd3f670dbb7f6a5b9b550b0d1b8e5b6ed148fb58",
"reference": "cd3f670dbb7f6a5b9b550b0d1b8e5b6ed148fb58",
"url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/45c8e6e0511944b410bb788a940b2a1ab75975ff",
"reference": "45c8e6e0511944b410bb788a940b2a1ab75975ff",
"shasum": ""
},
"require": {
"google/auth": "^1.34",
"google/gax": "^1.26.3",
"google/gax": "^1.27.0",
"guzzlehttp/guzzle": "^6.5.8|^7.4.4",
"guzzlehttp/promises": "^1.4||^2.0",
"guzzlehttp/psr7": "^2.6",
@@ -2976,9 +2976,9 @@
],
"description": "Google Cloud PHP shared dependency, providing functionality useful to all components.",
"support": {
"source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.54.0"
"source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.55.0"
},
"time": "2024-01-26T20:27:24+00:00"
"time": "2024-02-09T19:51:53+00:00"
},
{
"name": "google/cloud-storage",
@@ -9459,6 +9459,83 @@
],
"time": "2022-10-12T17:22:51+00:00"
},
{
"name": "s-ichikawa/laravel-sendgrid-driver",
"version": "4.0.4",
"source": {
"type": "git",
"url": "https://github.com/s-ichikawa/laravel-sendgrid-driver.git",
"reference": "f83f6ba04a5ba16bc3293b302e26b01233b7bc88"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/s-ichikawa/laravel-sendgrid-driver/zipball/f83f6ba04a5ba16bc3293b302e26b01233b7bc88",
"reference": "f83f6ba04a5ba16bc3293b302e26b01233b7bc88",
"shasum": ""
},
"require": {
"guzzlehttp/guzzle": "^7.2",
"illuminate/mail": "^9.0||^10.0",
"illuminate/support": "^9.0||^10.0"
},
"require-dev": {
"illuminate/container": "^9.0||^10.0",
"illuminate/filesystem": "^9.0||^10.0",
"laravel/helpers": "^1.2",
"phpunit/phpunit": "^9.5.8||^10.0",
"vlucas/phpdotenv": "^5.4.1"
},
"suggest": {
"s-ichikawa/sendgrid-api-builder": "support to build json for sendgrid api"
},
"type": "library",
"extra": {
"laravel": {
"providers": [
"Sichikawa\\LaravelSendgridDriver\\SendgridTransportServiceProvider"
]
}
},
"autoload": {
"psr-4": {
"Sichikawa\\LaravelSendgridDriver\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "shingo.ichikawa",
"email": "ichikawa.shingo.0829@gmail.com"
}
],
"description": "This library adds a 'sendgrid' mail driver to Laravel.",
"keywords": [
"laravel",
"sendgrid"
],
"support": {
"issues": "https://github.com/s-ichikawa/laravel-sendgrid-driver/issues",
"source": "https://github.com/s-ichikawa/laravel-sendgrid-driver/tree/4.0.4"
},
"funding": [
{
"url": "https://github.com/[user1",
"type": "github"
},
{
"url": "https://github.com/s-ichikawa]# Replace with up to 4 GitHub Sponsors-enabled usernames e.g.",
"type": "github"
},
{
"url": "https://github.com/user2",
"type": "github"
}
],
"time": "2023-03-02T13:21:47+00:00"
},
{
"name": "sabberworm/php-css-parser",
"version": "8.5.0",
@@ -13469,7 +13546,7 @@
},
{
"name": "web-token/jwt-core",
"version": "3.2.9",
"version": "3.2.10",
"source": {
"type": "git",
"url": "https://github.com/web-token/jwt-core.git",
@@ -13533,7 +13610,7 @@
"symfony"
],
"support": {
"source": "https://github.com/web-token/jwt-core/tree/3.2.9"
"source": "https://github.com/web-token/jwt-core/tree/3.2.10"
},
"funding": [
{
@@ -13545,16 +13622,16 @@
},
{
"name": "web-token/jwt-key-mgmt",
"version": "3.2.9",
"version": "3.2.10",
"source": {
"type": "git",
"url": "https://github.com/web-token/jwt-key-mgmt.git",
"reference": "2a034fdbf5142e39152b62cde066d2e707cfacb9"
"reference": "7ccd50f9ebf089cb864e3d3c62017192ac7cb450"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/web-token/jwt-key-mgmt/zipball/2a034fdbf5142e39152b62cde066d2e707cfacb9",
"reference": "2a034fdbf5142e39152b62cde066d2e707cfacb9",
"url": "https://api.github.com/repos/web-token/jwt-key-mgmt/zipball/7ccd50f9ebf089cb864e3d3c62017192ac7cb450",
"reference": "7ccd50f9ebf089cb864e3d3c62017192ac7cb450",
"shasum": ""
},
"require": {
@@ -13611,7 +13688,7 @@
"symfony"
],
"support": {
"source": "https://github.com/web-token/jwt-key-mgmt/tree/3.2.9"
"source": "https://github.com/web-token/jwt-key-mgmt/tree/3.2.10"
},
"funding": [
{
@@ -13619,11 +13696,11 @@
"type": "patreon"
}
],
"time": "2024-01-04T15:42:08+00:00"
"time": "2024-02-12T21:58:26+00:00"
},
{
"name": "web-token/jwt-signature",
"version": "3.2.9",
"version": "3.2.10",
"source": {
"type": "git",
"url": "https://github.com/web-token/jwt-signature.git",
@@ -13688,7 +13765,7 @@
"symfony"
],
"support": {
"source": "https://github.com/web-token/jwt-signature/tree/3.2.9"
"source": "https://github.com/web-token/jwt-signature/tree/3.2.10"
},
"funding": [
{
@@ -13700,7 +13777,7 @@
},
{
"name": "web-token/jwt-signature-algorithm-ecdsa",
"version": "3.2.9",
"version": "3.2.10",
"source": {
"type": "git",
"url": "https://github.com/web-token/jwt-signature-algorithm-ecdsa.git",
@@ -13758,7 +13835,7 @@
"symfony"
],
"support": {
"source": "https://github.com/web-token/jwt-signature-algorithm-ecdsa/tree/3.2.9"
"source": "https://github.com/web-token/jwt-signature-algorithm-ecdsa/tree/3.2.10"
},
"funding": [
{
@@ -16614,16 +16691,16 @@
},
{
"name": "spatie/laravel-ignition",
"version": "2.4.1",
"version": "2.4.2",
"source": {
"type": "git",
"url": "https://github.com/spatie/laravel-ignition.git",
"reference": "005e1e7b1232f3b22d7e7be3f602693efc7dba67"
"reference": "351504f4570e32908839fc5a2dc53bf77d02f85e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/005e1e7b1232f3b22d7e7be3f602693efc7dba67",
"reference": "005e1e7b1232f3b22d7e7be3f602693efc7dba67",
"url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/351504f4570e32908839fc5a2dc53bf77d02f85e",
"reference": "351504f4570e32908839fc5a2dc53bf77d02f85e",
"shasum": ""
},
"require": {
@@ -16702,7 +16779,7 @@
"type": "github"
}
],
"time": "2024-01-12T13:14:58+00:00"
"time": "2024-02-09T16:08:40+00:00"
},
{
"name": "symfony/yaml",
@@ -16835,5 +16912,5 @@
"php": "^7.3|^8.0"
},
"platform-dev": [],
"plugin-api-version": "2.6.0"
"plugin-api-version": "2.2.0"
}

View File

@@ -1,6 +1,6 @@
{
"name": "@fleetbase/console",
"version": "0.4.0",
"version": "0.4.2",
"private": true,
"description": "Fleetbase Console",
"repository": "https://github.com/fleetbase/fleetbase",
@@ -31,7 +31,7 @@
"@fleetbase/ember-core": "^0.2.4",
"@fleetbase/ember-ui": "^0.2.10",
"@fleetbase/storefront-engine": "^0.2.11",
"@fleetbase/fleetops-engine": "^0.4.7",
"@fleetbase/fleetops-engine": "^0.4.8",
"@fleetbase/fleetops-data": "^0.1.8",
"@fleetbase/dev-engine": "^0.2.1",
"@fleetbase/iam-engine": "^0.0.9",

View File

@@ -22,8 +22,8 @@ dependencies:
specifier: ^0.1.8
version: 0.1.8
'@fleetbase/fleetops-engine':
specifier: ^0.4.7
version: 0.4.7(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.9.6)(tracked-built-ins@3.3.0)(webpack@5.89.0)
specifier: ^0.4.8
version: 0.4.8(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.9.6)(tracked-built-ins@3.3.0)(webpack@5.89.0)
'@fleetbase/iam-engine':
specifier: ^0.0.9
version: 0.0.9(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.9.6)(tracked-built-ins@3.3.0)(webpack@5.89.0)
@@ -2784,8 +2784,8 @@ packages:
- supports-color
dev: false
/@fleetbase/fleetops-engine@0.4.7(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.9.6)(tracked-built-ins@3.3.0)(webpack@5.89.0):
resolution: {integrity: sha512-KUCxhqRVt2u4gnKKwwh397E7Xs1DZcN43vKds2nZ1yY0k8mzVWqweeJW0hSCWy9erjqpoDzalrhqnwemX32fSw==}
/@fleetbase/fleetops-engine@0.4.8(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.9.6)(tracked-built-ins@3.3.0)(webpack@5.89.0):
resolution: {integrity: sha512-RIlOFSWV/TOJspB/peqaoLCpUyt46M2Wt97m4+pNPiZyz4t3WYBu02owH64X33uBQXmEp2RaaP8MZEZFa8w+yg==}
engines: {node: '>= 18'}
peerDependencies:
ember-engines: ^0.9.0

View File

@@ -98,12 +98,12 @@ RUN chmod 0600 ./crontab
# Scheduler dev stage
FROM scheduler-base as scheduler-dev
ENTRYPOINT []
CMD ["go-crond", "--verbose", "--no-auto", "root:./crontab"]
CMD ["go-crond", "--verbose", "root:./crontab"]
# Scheduler stage
FROM scheduler-base as scheduler
ENTRYPOINT ["/sbin/ssm-parent", "-c", ".ssm-parent.yaml", "run", "--"]
CMD ["go-crond", "--verbose", "--no-auto", "root:./crontab"]
CMD ["go-crond", "--verbose", "root:./crontab"]
# Events stage
FROM base as events

View File

@@ -7,7 +7,7 @@ metadata:
{{- include "helm.labels" . | nindent 4 }}
spec:
{{- if not .Values.autoscaling.enabled }}
replicas: {{ .Values.replicaCount }}
replicas: 1
{{- end }}
selector:
matchLabels:
@@ -66,7 +66,7 @@ metadata:
{{- include "helm.labels" . | nindent 4 }}
spec:
{{- if not .Values.autoscaling.enabled }}
replicas: {{ .Values.replicaCount }}
replicas: 1
{{- end }}
selector:
matchLabels:

View File

@@ -2,7 +2,7 @@
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
replicaCount: 1
replicaCount: 2
image:
repository: OVERRIDE
@@ -25,10 +25,12 @@ serviceAccount:
podAnnotations: {}
podSecurityContext: {}
podSecurityContext:
{}
# fsGroup: 2000
securityContext: {}
securityContext:
{}
# capabilities:
# drop:
# - ALL
@@ -54,7 +56,8 @@ ingress:
# hosts:
# - chart-example.local
resources: {}
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