@leverege/build-tools 2.50.11 → 2.50.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@leverege/build-tools",
3
- "version": "2.50.11",
3
+ "version": "2.50.13",
4
4
  "description": "A collection of build / support tools for Leverege developers",
5
5
  "main": "index.js",
6
6
  "repository": {
@@ -62,9 +62,9 @@
62
62
  "deepmerge": "^4.3.1",
63
63
  "enquirer": "^2.4.1",
64
64
  "execa": "^9.1.0",
65
- "glob": "^10.3.16",
65
+ "glob": "^10.4.1",
66
66
  "handlebars": "^4.7.8",
67
- "inquirer": "^9.2.22",
67
+ "inquirer": "^9.2.23",
68
68
  "js-yaml": "^4.1.0",
69
69
  "ms": "^2.1.3",
70
70
  "npm-registry-fetch": "^17.0.1",
@@ -74,10 +74,10 @@
74
74
  "readline-sync": "^1.4.10",
75
75
  "semver": "^7.6.2",
76
76
  "simple-git": "^3.24.0",
77
- "zx": "^8.1.1"
77
+ "zx": "^8.1.2"
78
78
  },
79
79
  "devDependencies": {
80
80
  "@leverege/eslint-config-leverege": "^4.2.0",
81
- "npm": "^10.8.0"
81
+ "npm": "^10.8.1"
82
82
  }
83
83
  }
@@ -1,3 +1,9 @@
1
+ # migrations
2
+ # v5.11.0+
3
+ # - k8x api-server pod
4
+ # - node tools/UpdateESComponentTemplateV2.js
5
+ # - node tools/UpdateESMappingV2.js
6
+ #
1
7
  image:
2
8
  tag: # v5.12.3
3
9
 
@@ -1,3 +1,8 @@
1
+ # migrations
2
+ # v2.1.0+
3
+ # - k8x authz-server
4
+ # - npm run sequelizeRunMigrations
5
+ #
1
6
  image:
2
7
  tag: # v2.1.3
3
8
 
@@ -1,6 +1,5 @@
1
1
  # ONLY EDIT grafana-local.yaml.ovh / grafana-local.yaml is git ignored
2
2
  service:
3
- type: "NodePort"
4
3
  port: "9000"
5
4
 
6
5
  datasources:
@@ -39,7 +38,7 @@ tolerations:
39
38
  effect: "NoSchedule"
40
39
 
41
40
  extraObjects:
42
- - apiVersion: traefik.containo.us/v1alpha1
41
+ - apiVersion: traefik.io/v1alpha1
43
42
  kind: IngressRoute
44
43
  metadata:
45
44
  name: grafana
@@ -25,6 +25,11 @@ master:
25
25
  persistence:
26
26
  size: 8Gi # 8Gi is default
27
27
 
28
+ resources:
29
+ requests:
30
+ cpu: 250m
31
+ memory: 500Mi
32
+
28
33
  replica:
29
34
  affinity:
30
35
  nodeAffinity:
@@ -45,6 +50,11 @@ replica:
45
50
  persistence:
46
51
  size: 8Gi # 8Gi is default
47
52
 
53
+ resources:
54
+ requests:
55
+ cpu: 250m
56
+ memory: 500Mi
57
+
48
58
  architecture: replication
49
59
 
50
60
  sentinel:
@@ -1,5 +1,7 @@
1
1
  # migrations
2
- # v1.2+ run => npm run sequelizeRunMigrations
2
+ # v1.2+
3
+ # - k8x resource-server
4
+ # - npm run sequelizeRunMigrations
3
5
  #
4
6
  image:
5
7
  tag: # v1.2.2
@@ -1,5 +1,5 @@
1
1
  image:
2
- tag: # v2.3.0
2
+ tag: # v2.3.1
3
3
 
4
4
  config:
5
5
  LOG_CONFIG: '{"type":"pino","level":"warn"}'
@@ -5,7 +5,11 @@
5
5
  # ***REMEMBER*** the instructions provided on the internet typically assume
6
6
  # the default namespace not traefik
7
7
  #
8
- # ***DO NOT FORGET*** the -n traefik for kubectl commands
8
+ # ***DO NOT FORGET*** the -n traefik for kubectl commands - so in order to
9
+ # move beyond v20 of the chart run the kubectl command below before upgrading
10
+ #
11
+ # kubectl apply --namespace traefik --server-side \
12
+ # --force-conflicts -k https://github.com/traefik/traefik-helm-chart/traefik/crds/\?ref\=v27
9
13
  #
10
14
  showInstalling "Traefik Load Balancer / Router"
11
15
 
package/src/k8scale.sh CHANGED
@@ -19,8 +19,11 @@ case $DIRECTION in
19
19
  REPLICAS=0
20
20
  DIRECTION=down
21
21
  ;;
22
+ roll)
23
+ DIRECTION=roll
24
+ ;;
22
25
  *)
23
- printf "Usage: `color g 'k8scale <up|dn|down> [deployment-list]'`\n\n" && exit 1
26
+ printf "Usage: `color g 'k8scale <up|dn|down|roll> [deployment-list]'`\n\n" && exit 1
24
27
  esac
25
28
 
26
29
  printf " scaled => `color g $DIRECTION`\n\n"
@@ -28,7 +31,12 @@ for DEPLOYMENT in "$@";
28
31
  do
29
32
  IFS="/" read SERVICE <<< "$DEPLOYMENT" # strip trailing /
30
33
  RESULTS="`color g SUCCESS`"
31
- kubectl scale --replicas=$REPLICAS deployment $SERVICE &>/dev/null
34
+ if [ "$DIRECTION" == "roll" ];
35
+ then
36
+ kubectl rollout restart deployment $SERVICE &> $DEVNULL
37
+ else
38
+ kubectl scale --replicas=$REPLICAS deployment $SERVICE &> $DEVNULL
39
+ fi
32
40
  [ $? -eq 1 ] && RESULTS="`color r FAILURE`"
33
41
  printf " $RESULTS => $SERVICE\n"
34
42
  sendToSlack "k8scale $DIRECTION $SERVICE"
package/src/overwhelm.mjs CHANGED
@@ -64,10 +64,14 @@ if ( !fs.existsSync( 'overwhelm.yaml' ) ) {
64
64
  if ( fs.existsSync( 'values-default.yaml' ) ) {
65
65
  log( chalk.red.bold( `
66
66
 
67
- ***ERROR overwhelm => values-default.yaml is no longer used/supported
68
- all defaults should be set in default-configs.yaml.ovh
67
+ ***ERROR overwhelm => values-default.yaml is no longer used/supported and will
68
+ be ignored - all defaults should be set in default-configs.yaml.ovh
69
69
  ` ) )
70
- process.exit( 1 )
70
+
71
+ const ans = ask.question( `Enter "${chalk.bold.red( 'skip' )}" if you wish to ignore and continue => ` )
72
+ if ( ans !== 'skip' ) {
73
+ process.exit( 1 )
74
+ }
71
75
  }
72
76
 
73
77
  // Load the default values and then overlay with the project specific yaml