underpost 2.8.781 → 2.8.782
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/README.md +1 -1
- package/cli.md +1 -2
- package/docker-compose.yml +1 -1
- package/package.json +1 -1
- package/src/cli/cluster.js +7 -7
- package/src/cli/index.js +2 -2
- package/src/index.js +1 -1
package/README.md
CHANGED
package/cli.md
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
## underpost ci/cd cli v2.8.
|
|
1
|
+
## underpost ci/cd cli v2.8.782
|
|
2
2
|
|
|
3
3
|
### Usage: `underpost [options] [command]`
|
|
4
4
|
```
|
|
@@ -204,7 +204,6 @@ Options:
|
|
|
204
204
|
--mongodb Init with mongodb statefulset
|
|
205
205
|
--postgresql Init with postgresql statefulset
|
|
206
206
|
--mongodb4 Init with mongodb 4.4 service
|
|
207
|
-
--istio Init base istio cluster
|
|
208
207
|
--valkey Init with valkey service
|
|
209
208
|
--contour Init with project contour base HTTPProxy and envoy
|
|
210
209
|
--cert-manager Init with letsencrypt-prod ClusterIssuer
|
package/docker-compose.yml
CHANGED
package/package.json
CHANGED
package/src/cli/cluster.js
CHANGED
|
@@ -92,8 +92,8 @@ class UnderpostCluster {
|
|
|
92
92
|
|
|
93
93
|
if (
|
|
94
94
|
!alrreadyCluster &&
|
|
95
|
-
((!options.
|
|
96
|
-
(options.
|
|
95
|
+
((!options.kubeadm && !UnderpostDeploy.API.get('kube-apiserver-kind-control-plane')[0]) ||
|
|
96
|
+
(options.kubeadm === true && !UnderpostDeploy.API.get('calico-kube-controllers')[0]))
|
|
97
97
|
) {
|
|
98
98
|
shellExec(`sudo setenforce 0`);
|
|
99
99
|
shellExec(`sudo sed -i 's/^SELINUX=enforcing$/SELINUX=permissive/' /etc/selinux/config`);
|
|
@@ -106,7 +106,7 @@ class UnderpostCluster {
|
|
|
106
106
|
shellExec(`sudo service docker restart`);
|
|
107
107
|
shellExec(`sudo systemctl enable --now containerd.service`);
|
|
108
108
|
shellExec(`sudo swapoff -a; sudo sed -i '/swap/d' /etc/fstab`);
|
|
109
|
-
if (options.
|
|
109
|
+
if (options.kubeadm === true) {
|
|
110
110
|
shellExec(`sysctl net.bridge.bridge-nf-call-iptables=1`);
|
|
111
111
|
shellExec(
|
|
112
112
|
`sudo kubeadm init --pod-network-cidr=192.168.0.0/16 --control-plane-endpoint="${os.hostname()}:6443"`,
|
|
@@ -464,14 +464,14 @@ Allocatable:
|
|
|
464
464
|
},
|
|
465
465
|
initHost() {
|
|
466
466
|
// Base
|
|
467
|
-
shellExec(`sudo dnf
|
|
468
|
-
shellExec(`sudo dnf install epel-release
|
|
467
|
+
shellExec(`sudo dnf -y update`);
|
|
468
|
+
shellExec(`sudo dnf -y install epel-release`);
|
|
469
469
|
// Install docker
|
|
470
470
|
shellExec(`sudo dnf -y install dnf-plugins-core
|
|
471
471
|
sudo dnf config-manager --add-repo https://download.docker.com/linux/rhel/docker-ce.repo`);
|
|
472
|
-
shellExec(`sudo dnf install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin`);
|
|
472
|
+
shellExec(`sudo dnf -y install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin`);
|
|
473
473
|
// Install podman
|
|
474
|
-
shellExec(`sudo dnf install podman`);
|
|
474
|
+
shellExec(`sudo dnf -y install podman`);
|
|
475
475
|
// Install kind
|
|
476
476
|
shellExec(`[ $(uname -m) = aarch64 ] && curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.29.0/kind-linux-arm64
|
|
477
477
|
chmod +x ./kind
|
package/src/cli/index.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import dotenv from 'dotenv';
|
|
2
2
|
import { Command } from 'commander';
|
|
3
3
|
import Underpost from '../index.js';
|
|
4
|
-
import { getUnderpostRootPath, loadConf } from '../server/conf.js';
|
|
4
|
+
import { getNpmRootPath, getUnderpostRootPath, loadConf } from '../server/conf.js';
|
|
5
5
|
import fs from 'fs-extra';
|
|
6
6
|
import { commitData } from '../client/components/core/CommonJs.js';
|
|
7
7
|
import { shellExec } from '../server/process.js';
|
|
@@ -97,7 +97,7 @@ program
|
|
|
97
97
|
.option('--mongodb', 'Init with mongodb statefulset')
|
|
98
98
|
.option('--postgresql', 'Init with postgresql statefulset')
|
|
99
99
|
.option('--mongodb4', 'Init with mongodb 4.4 service')
|
|
100
|
-
.option('--istio', 'Init base istio
|
|
100
|
+
// .option('--istio', 'Init base istio service mesh')
|
|
101
101
|
.option('--valkey', 'Init with valkey service')
|
|
102
102
|
.option('--contour', 'Init with project contour base HTTPProxy and envoy')
|
|
103
103
|
.option('--cert-manager', 'Init with letsencrypt-prod ClusterIssuer')
|