Skip to content
This repository has been archived by the owner on Mar 18, 2024. It is now read-only.

Commit

Permalink
refactor: all yml renamed to yaml
Browse files Browse the repository at this point in the history
  • Loading branch information
carlocorradini committed Dec 1, 2022
1 parent 7ed8704 commit e8e3a11
Show file tree
Hide file tree
Showing 21 changed files with 44 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
- name: Bundle
run: |
./scripts/bundle.sh \
--config-file ./scripts/bundle.config.yml \
--config-file ./scripts/bundle.config.yaml \
--out-file ./recluster.tar.gz
- name: Build Changelog
id: changelog
Expand Down
10 changes: 5 additions & 5 deletions configs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ reCluster configurations.

See [certs](../../scripts/README.md#📑-certssh) for more information.

## :bookmark_tabs: [`config.controller.yml`](./config.controller.yml)
## :bookmark_tabs: [`config.controller.yaml`](./config.controller.yaml)

reCluster controller configuration.

## :bookmark_tabs: [`config.worker.yml`](./config.worker.yml)
## :bookmark_tabs: [`config.worker.yaml`](./config.worker.yaml)

reCluster worker configuration.

## :bookmark_tabs: [`k3s.controller.yml`](./k3s.controller.yml)
## :bookmark_tabs: [`k3s.controller.yaml`](./k3s.controller.yaml)

K3s controller configuration.

## :bookmark_tabs: [`k3s.worker.yml`](./k3s.worker.yml)
## :bookmark_tabs: [`k3s.worker.yaml`](./k3s.worker.yaml)

K3s worker configuration.

## :bookmark_tabs: [`node_exporter.yml`](./node_exporter.yml)
## :bookmark_tabs: [`node_exporter.yaml`](./node_exporter.yaml)

Node exporter configuration.

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion dependencies/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*
!/.gitignore
!/dependencies.config.yml
!/dependencies.config.yaml
!/dependencies.sh
!/README.md
12 changes: 6 additions & 6 deletions dependencies/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

reCluster dependencies.

## :bookmark_tabs: [`dependencies.yml`](./dependencies.yml)
## :bookmark_tabs: [`dependencies.yaml`](./dependencies.yaml)

Dependencies file.

Expand All @@ -21,9 +21,9 @@ Dependencies script.
> **Note**: [commons arguments](../../scripts/README.md#commons-arguments) available
| **Name** | **Description** | **Default** | **Values** |
| ---------------------- | ------------------------------------------------------------------ | ------------------------- | -------------- |
| `--config-file <FILE>` | Configuration file | `dependencies.config.yml` | Any valid file |
| **Name** | **Description** | **Default** | **Values** |
| ---------------------- | ------------------------------------------------------------------ | -------------------------- | -------------- |
| `--config-file <FILE>` | Configuration file | `dependencies.config.yaml` | Any valid file |
| `--help` | Show help message and exit |
| `--sync` | Synchronize dependencies | `false` |
| `--sync-force` | Synchronize dependencies replacing assets that are already present | `false` |
| `--sync` | Synchronize dependencies | `false` |
| `--sync-force` | Synchronize dependencies replacing assets that are already present | `false` |
2 changes: 1 addition & 1 deletion dependencies/dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ DIRNAME=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
# CONFIGURATION
# ================
# Configuration file
CONFIG_FILE="dependencies.config.yml"
CONFIG_FILE="dependencies.config.yaml"
# Root directory
ROOT_DIR="$(readlink -f "$DIRNAME/..")"
# Synchronize flag
Expand Down
2 changes: 1 addition & 1 deletion docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ See [Installation requirements](./installation_requirements.md) for more informa
--out-dir "$_out_dir"
```

1. Copy the text from `configs/certs/ssh.pub` and put it in the `ssh_authorized_keys` property of [`configs/config.yml`](../configs/config.yml) (`ssh-ed25519 ...`).
1. Copy the text from `configs/certs/ssh.pub` and put it in the `ssh_authorized_keys` property of `configs/config.yaml` (`ssh-ed25519 ...`)

> **Warning**: All files from `configs/certs` should be copied and saved in a well known and secure place
Expand Down
16 changes: 8 additions & 8 deletions docs/installation_script.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ Installation script.
| ------------------------------------ | ------------------------------------------------------------------------------------------ | ----------------------------------------------- | ------------------------- |
| `--airgap` | Perform installation in Air-Gap environment | `false` |
| `--bench-time <TIME>` | Benchmark execution time in seconds | `30` | Any positive number |
| `--config-file <FILE>` | Configuration file | `configs/config.yml` | Any valid file |
| `--config-file <FILE>` | Configuration file | `configs/config.yaml` | Any valid file |
| `--help` | Show help message and exit |
| `--init-cluster` | Initialize cluster components and logic. Enable only when bootstrapping for the first time | `false` |
| `--k3s-config-file <FILE>` | K3s configuration file | `configs/k3s.yml` | Any valid file |
| `--k3s-config-file <FILE>` | K3s configuration file | `configs/k3s.yaml` | Any valid file |
| `--k3s-version <VERSION>` | K3s version | `latest` | Any K3s version |
| `--node-exporter-config-file <FILE>` | Node exporter configuration file | `configs/node_exporter.yml` | Any valid file |
| `--node-exporter-config-file <FILE>` | Node exporter configuration file | `configs/node_exporter.yaml` | Any valid file |
| `--node-exporter-version <VERSION>` | Node exporter version | `latest` | Any Node exporter version |
| `--pc-device-api <URL>` | Power consumption device api url | `http://pc.recluster.local/cm?cmnd=status%2010` | Any valid URL |
| `--pc-interval <TIME>` | Power consumption read interval time in seconds | `1` | Any positive number |
Expand All @@ -35,27 +35,27 @@ Installation script.

## Controller

> **Warning**: Argument `--init-cluster` and `cluster-init: true` property of [`configs/k3s.controller.yml`](../configs/k3s.controller.yml) must be set only for the first controller
> **Warning**: Argument `--init-cluster` and `cluster-init: true` property of [`configs/k3s.controller.yaml`](../configs/k3s.controller.yaml) must be set only for the first controller
> **Note**: `kind` property of [`configs/config.yml`](../configs/config.yml) must be set to `controller`
> **Note**: `kind` property of [`configs/config.yaml`](../configs/config.yaml) must be set to `controller`
Controller installation.

```sh
./install.sh \
--k3s-config-file configs/k3s.controller.yml \
--k3s-config-file configs/k3s.controller.yaml \
--init-cluster \
...
```

## Worker

> **Note**: `kind` property of [`configs/config.yml`](../configs/config.yml) must be set to to `worker`
> **Note**: `kind` property of [`configs/config.yaml`](../configs/config.yaml) must be set to to `worker`
Worker installation.

```sh
./install.sh \
--k3s-config-file configs/k3s.worker.yml \
--k3s-config-file configs/k3s.worker.yaml \
...
```
9 changes: 5 additions & 4 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ AIRGAP_ENV=false
# Benchmark time in seconds
BENCH_TIME=30
# Configuration file
CONFIG_FILE="configs/config.yml"
CONFIG_FILE="configs/config.yaml"
# Initialize cluster
INIT_CLUSTER=false
# K3s configuration file
K3S_CONFIG_FILE="configs/k3s.yml"
K3S_CONFIG_FILE="configs/k3s.yaml"
# K3s version
K3S_VERSION=latest
# Node exporter configuration file
NODE_EXPORTER_CONFIG_FILE="configs/node_exporter.yml"
NODE_EXPORTER_CONFIG_FILE="configs/node_exporter.yaml"
# Node exporter version
NODE_EXPORTER_VERSION=latest
# Power consumption device api url
Expand Down Expand Up @@ -1768,7 +1768,7 @@ EOF
install_recluster() {
# Files
_k3s_config_file=/etc/rancher/k3s/config.yaml
_recluster_config_file="$RECLUSTER_ETC_DIR/config.yml"
_recluster_config_file="$RECLUSTER_ETC_DIR/config.yaml"
_node_token_file="$RECLUSTER_ETC_DIR/token"
_commons_script_file="$RECLUSTER_OPT_DIR/__commons.sh"
_bootstrap_script_file="$RECLUSTER_OPT_DIR/bootstrap.sh"
Expand Down Expand Up @@ -2229,6 +2229,7 @@ start_recluster() {

# K8s manifests
if [ "$INIT_CLUSTER" = true ]; then
# TODO
_node_name=$($SUDO grep 'node-name:' /etc/rancher/k3s/config.yaml | sed -e 's/node-name://g' -e 's/[[:space:]]*//' -e 's/^"//' -e 's/"$//')
fi

Expand Down
10 changes: 5 additions & 5 deletions scripts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ reCluster bundle script.
> **Note**: [commons arguments](#commons-arguments) available
| **Name** | **Description** | **Default** | **Values** |
| ---------------------- | -------------------------- | ------------------- | -------------- |
| `--config-file <FILE>` | Configuration file | `bundle.config.yml` | Any valid file |
| **Name** | **Description** | **Default** | **Values** |
| ---------------------- | -------------------------- | -------------------- | -------------- |
| `--config-file <FILE>` | Configuration file | `bundle.config.yaml` | Any valid file |
| `--help` | Show help message and exit |
| `--out-file <FILE>` | Output file | `bundle.tar.gz` | Any valid file |
| `--skip-run` | Skip run | `false` |
| `--out-file <FILE>` | Output file | `bundle.tar.gz` | Any valid file |
| `--skip-run` | Skip run | `false` |

## :bookmark_tabs: [`certs.sh`](./certs.sh)

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion scripts/bundle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ DIRNAME=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
# CONFIGURATION
# ================
# Configuration file
CONFIG_FILE="bundle.config.yml"
CONFIG_FILE="bundle.config.yaml"
# Output file
OUT_FILE="bundle.tar.gz"
# Root directory
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"check": "npx npm-run-all --npm-path npm --serial check:*",
"check:db": "npm run db:format",
"check:lint": "npx eslint .",
"dev": "./scripts/dev.sh --k3d-config-file ./k3d.config.yml",
"dev": "./scripts/dev.sh --k3d-config-file ./k3d.config.yaml",
"db:deploy": "npx prisma migrate deploy",
"db:format": "npx prisma format",
"db:generate": "npx prisma generate",
Expand Down
16 changes: 8 additions & 8 deletions server/scripts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ reCluster dev script.
> **Note**: [commons arguments](../../scripts/README.md#commons-arguments) available
| **Name** | **Description** | **Default** | **Values** |
| -------------------------- | -------------------------- | ---------------- | -------------- |
| **Name** | **Description** | **Default** | **Values** |
| -------------------------- | -------------------------- | ----------------- | -------------- |
| `--help` | Show help message and exit |
| `--k3d-config-file <FILE>` | K3d configuration file | `k3d.config.yml` | Any valid file |
| `--skip-certs` | Skip certificates | `false` |
| `--skip-cluster` | Skip cluster | `false` |
| `--skip-db` | Skip database | `false` |
| `--skip-db-seed` | Skip database seed | `false` |
| `--skip-server` | Skip server | `false` |
| `--k3d-config-file <FILE>` | K3d configuration file | `k3d.config.yaml` | Any valid file |
| `--skip-certs` | Skip certificates | `false` |
| `--skip-cluster` | Skip cluster | `false` |
| `--skip-db` | Skip database | `false` |
| `--skip-db-seed` | Skip database seed | `false` |
| `--skip-server` | Skip server | `false` |

## :bookmark_tabs: [`dockerize.sh`](./dockerize.sh)

Expand Down
2 changes: 1 addition & 1 deletion server/scripts/dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ DIRNAME=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
# CONFIGURATION
# ================
# K3d configuration file
K3D_CONFIG_FILE="k3d.config.yml"
K3D_CONFIG_FILE="k3d.config.yaml"
# npm prefix
NPM_PREFIX="$DIRNAME/.."
# Postgres version
Expand Down

0 comments on commit e8e3a11

Please sign in to comment.