From 22eef0fab5ad650bcd250836928fc4f9b3dde89b Mon Sep 17 00:00:00 2001
From: jeho <17126497+j-zimnowoda@users.noreply.github.com>
Date: Mon, 8 Jul 2024 14:31:30 +0200
Subject: [PATCH] chore: apl-core transfer (#1639)
---
.github/workflows/integration.yml | 2 +-
.github/workflows/main.yml | 45 +++++++++++-------------
.values/README.md | 2 +-
README.md | 18 +++++-----
adr/index.md | 28 +++++++--------
binzx/README.md | 2 +-
binzx/installer | 2 +-
binzx/otomi | 10 +++---
chart/otomi/Chart.yaml | 2 +-
docs/development.md | 10 +++---
docs/migrating-values.md | 8 ++---
docs/setup.md | 2 +-
package-lock.json | 4 +--
package.json | 8 ++---
src/cmd/apply-as-apps.ts | 2 +-
src/cmd/bash.ts | 6 ++--
src/cmd/bootstrap.ts | 2 +-
src/common/utils.ts | 2 +-
src/playground.ts | 2 +-
tests/fixtures/README.md | 2 +-
tests/integration/minimal-with-team.yaml | 2 +-
tests/integration/upgrade.yaml | 2 +-
values-schema.yaml | 2 +-
versions.yaml | 2 +-
24 files changed, 82 insertions(+), 85 deletions(-)
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 6d38581db8..45509ec925 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -123,7 +123,7 @@ on:
default: 'yes'
env:
CACHE_REGISTRY: ghcr.io
- CACHE_REPO: redkubes/otomi-core
+ CACHE_REPO: linode/apl-core
REPO: otomi/core
GIT_USER: svcAPLBot
SCALEWAY_NODE_TYPE: PRO2-M
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ab6e6e5d41..744b7c16ef 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -7,9 +7,8 @@ on:
- '*'
env:
CACHE_REGISTRY: ghcr.io
- CACHE_REPO: redkubes/otomi-core
+ CACHE_REPO: linode/apl-core
REPO: otomi/core
- GIT_USER: redkubesbot
jobs:
build-test-cache:
@@ -17,33 +16,27 @@ jobs:
runs-on: ubuntu-latest
env:
COMMIT_MSG: ${{ github.event.head_commit.message }}
+ BOT_EMAIL: ${{ vars.BOT_EMAIL }}
+ BOT_USERNAME: ${{ vars.BOT_USERNAME }}
steps:
- name: Set env
run: |
tag=${GITHUB_REF##*/}
echo "Creating tag: $tag"
echo "TAG=$tag" >> $GITHUB_ENV
- git config --global user.email $GIT_USER@users.noreply.github.com
- git config --global user.name $GIT_USER
+ git config --global user.email $BOT_EMAIL
+ git config --global user.name $BOT_USERNAME
+
- name: Checkout
uses: actions/checkout@v4
- # - name: CI tests, image build and push tag for main or branch
- # uses: whoan/docker-build-with-cache-action@v5
- # with:
- # username: ${{ env.GIT_USER }}
- # password: '${{ secrets.NPM_TOKEN }}'
- # registry: ${{ env.CACHE_REGISTRY }}
- # image_name: ${{ env.CACHE_REPO }}
- # image_tag: ${{ env.TAG }}
- # pull_image_and_stages: true
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to Github Packages
uses: docker/login-action@v3
with:
registry: ${{ env.CACHE_REGISTRY }}
- username: ${{ env.GIT_USER }}
- password: '${{ secrets.NPM_TOKEN }}'
+ username: ${{ env.BOT_USERNAME }}
+ password: '${{ secrets.BOT_TOKEN }}'
- name: CI tests, image build and push tag for main or branch
uses: docker/build-push-action@v5
with:
@@ -55,11 +48,15 @@ jobs:
needs: build-test-cache
if: always() && ((contains(needs.build-test-cache.result, 'success') && !contains(needs.integration.outputs.started, 'true')) || (contains(needs.integration.result, 'success'))) && !github.event.act
runs-on: ubuntu-latest
+ env:
+ BOT_EMAIL: ${{ vars.BOT_EMAIL }}
+ BOT_USERNAME: ${{ vars.BOT_USERNAME }}
steps:
- name: Push to docker hub
run: |
+ set -u
TAG=${GITHUB_REF##*/}
- docker login -u $GIT_USER -p '${{ secrets.NPM_TOKEN }}' ghcr.io
+ docker login ghcr.io -u $BOT_USERNAME -p ${{ secrets.BOT_TOKEN }}
image="$CACHE_REGISTRY/$CACHE_REPO:$TAG"
docker pull $image
docker tag $image $REPO:$TAG
@@ -80,8 +77,8 @@ jobs:
uses: actions/checkout@v4
- name: Set env
run: |
- git config --global user.email $GIT_USER@users.noreply.github.com
- git config --global user.name $GIT_USER
+ git config --global user.email $BOT_EMAIL
+ git config --global user.name $BOT_USERNAME
- name: Create and push git tag
id: git_tag
run: |
@@ -95,10 +92,10 @@ jobs:
echo "Releasing $REPO:$release_tag"
docker tag $REPO:$TAG $REPO:$release_tag
docker push $REPO:$release_tag
- docker login -u $GIT_USER -p '${{ secrets.NPM_TOKEN }}' ghcr.io
+ docker login -u $BOT_USERNAME -p '${{ secrets.BOT_TOKEN }}' ghcr.io
docker tag $REPO:$TAG $CACHE_REGISTRY/$CACHE_REPO:$release_tag
docker push $CACHE_REGISTRY/$CACHE_REPO:$release_tag
- echo "machine github.com login $GIT_USER password ${{ secrets.GIT_PASSWORD }}" > ~/.netrc
+ echo "machine github.com login ${{ env.BOT_USERNAME }} password ${{ secrets.BOT_TOKEN }}" > ~/.netrc
git tag -am "$COMMIT_MSG" $release_tag && git push --follow-tags
#Cut the CHANGELOG.md file up to the first occurence of the "### \[[0-9]*" (meaning three #, a space,a square bracket and any number after it)
sed -n '/### \[[0-9]*/q;p' CHANGELOG.md > NEW_CHANGELOG.md
@@ -125,7 +122,7 @@ jobs:
id: prepare_chart
run: |
# Install and update helm repo
- helm repo add otomi https://otomi.io/otomi-core
+ helm repo add otomi https://otomi.io/apl-core
helm repo update
# Retrieve the app version from package.json
@@ -164,8 +161,8 @@ jobs:
npx js-yaml values-schema.yaml > chart/otomi/values.schema.json
# Set the global id for git as it seems needed by the next step when a custom image is used
- git config --global user.email $GIT_USER@users.noreply.github.com
- git config --global user.name $GIT_USER
+ git config --global user.email ${{ env.BOT_EMAIL }}
+ git config --global user.name ${{ env.BOT_USERNAME }}
- name: Create and publish otomi chart release
id: chart_release
uses: helm/chart-releaser-action@v1.6.0
@@ -194,7 +191,7 @@ jobs:
- name: Pulling the helm chart
run: |
# Install and update helm repo
- helm repo add otomi https://otomi.io/otomi-core
+ helm repo add otomi https://otomi.io/apl-core
helm repo update
# Get latest version of otomi
diff --git a/.values/README.md b/.values/README.md
index bb5b2df12d..4492cf283b 100644
--- a/.values/README.md
+++ b/.values/README.md
@@ -2,6 +2,6 @@
Part of Otomi Container Platform.
-Repo that holds cluster configuration to be used by [otomi-core](https://github.com/redkubes/otomi-core).
+Repo that holds cluster configuration to be used by [apl-core](https://github.com/linode/apl-core).
Please read the online [otomi documentation](https://otomi.io/) for instructions on how to work with the platform.
diff --git a/README.md b/README.md
index 93f240425a..1a6c873c1e 100644
--- a/README.md
+++ b/README.md
@@ -10,16 +10,16 @@ Otomi has been acquired by Akamai. W
- 
- 
- 
+ 
+ 
+ 
-
+
Otomi turns any Kubernetes cluster into an Application Platform to provide paved roads from code to production
@@ -42,7 +42,7 @@ To install Otomi, make sure to have a K8s cluster running with at least:
Add the Helm repository:
```bash
-helm repo add otomi https://otomi.io/otomi-core
+helm repo add otomi https://otomi.io/apl-core
helm repo update
```
@@ -147,15 +147,15 @@ If you wish to contribute please read our [Contributor Code of Conduct](https://
If you want to say **thank you** or/and support the active development of Otomi:
-- [Star](https://github.com/redkubes/otomi-core) the Otomi project on Github
+- [Star](https://github.com/linode/apl-core) the Otomi project on Github
- Feel free to write articles about the project on [dev.to](https://dev.to/), [medium](https://medium.com/) or on your personal blog and share your experiences
This project exists thanks to all the people who have contributed
-
- 
+
+ 
## License
-Otomi is licensed under the [Apache 2.0 License](https://github.com/redkubes/otomi-core/blob/main/LICENSE).
+Otomi is licensed under the [Apache 2.0 License](https://github.com/linode/apl-core/blob/main/LICENSE).
diff --git a/adr/index.md b/adr/index.md
index 5e66d8a65e..1161080fe3 100644
--- a/adr/index.md
+++ b/adr/index.md
@@ -1,22 +1,22 @@
# Architectural Decision Log
-This log lists the architectural decisions for otomi-core.
+This log lists the architectural decisions for apl-core.
-* [ADR-2020-10-01](2020-10-01-github-workflow.md) - Our GitHub workflow
-* [ADR-2020-10-02](2020-10-02-docker-compose.md) - docker compose
-* [ADR-2020-11-06](2020-11-06-bash-style-guide.md) - Bash coding standard
-* [ADR-2020-11-06](2020-11-06-konstraint-policy-library.md) - Konstraint library to support Common Rego Language definitions
-* [ADR-2021-10-18](2021-10-18-defaults-and-derived.md) - Derived values
-* [ADR-2021-10-28](2021-10-28-internal-values.md) - Internal values
-* [ADR-2022-03-24](2022-03-24-custom-ca.md) - urice:
-* [ADR-2022-04-22](2022-04-22-values-migration.md) - Values migration
-* [ADR-2022-04-23](2022-04-23-pre-upgrade.md) - A new otomi pre-upgrade command
-* [ADR-2022-05-17](2022-05-17-destroy-upon-uninstall.md) - Extra flags to accomodate destroy upon uninstall
-* [ADR-2022-06-07](2022-06-07-ingress-classes.md) - Ingress classes
-* [ADR-2022-07-02](2022-07-02-node-affinity.md) - Node affinity
-* [ADR-2022-08-26](2022-08-26-other-dns-provider.md) - Other DNS provider
+- [ADR-2020-10-01](2020-10-01-github-workflow.md) - Our GitHub workflow
+- [ADR-2020-10-02](2020-10-02-docker-compose.md) - docker compose
+- [ADR-2020-11-06](2020-11-06-bash-style-guide.md) - Bash coding standard
+- [ADR-2020-11-06](2020-11-06-konstraint-policy-library.md) - Konstraint library to support Common Rego Language definitions
+- [ADR-2021-10-18](2021-10-18-defaults-and-derived.md) - Derived values
+- [ADR-2021-10-28](2021-10-28-internal-values.md) - Internal values
+- [ADR-2022-03-24](2022-03-24-custom-ca.md) - urice:
+- [ADR-2022-04-22](2022-04-22-values-migration.md) - Values migration
+- [ADR-2022-04-23](2022-04-23-pre-upgrade.md) - A new otomi pre-upgrade command
+- [ADR-2022-05-17](2022-05-17-destroy-upon-uninstall.md) - Extra flags to accomodate destroy upon uninstall
+- [ADR-2022-06-07](2022-06-07-ingress-classes.md) - Ingress classes
+- [ADR-2022-07-02](2022-07-02-node-affinity.md) - Node affinity
+- [ADR-2022-08-26](2022-08-26-other-dns-provider.md) - Other DNS provider
diff --git a/binzx/README.md b/binzx/README.md
index 2b4b06716a..a760ccb3d8 100644
--- a/binzx/README.md
+++ b/binzx/README.md
@@ -1,7 +1,7 @@
# How to use the new otomi cli
```sh
-# In the otomi-core directory
+# In the apl-core directory
export DOCKER_TAG=binzx
docker build --target prod -t otomi/core:binzx .
./binzx/otomi
diff --git a/binzx/installer b/binzx/installer
index 343975287a..2d942b4ebb 100755
--- a/binzx/installer
+++ b/binzx/installer
@@ -3,7 +3,7 @@
readonly script=otomi
readonly current_branch=$(git rev-parse --abbrev-ref HEAD)
readonly branch=${OTOMI_TAG:-$current_branch}
-readonly remote=https://raw.githubusercontent.com/redkubes/otomi-core/$branch/binzx/$script
+readonly remote=https://raw.githubusercontent.com/linode/apl-core/$branch/binzx/$script
readonly path=/usr/local/bin
readonly msg="Please choose the default install location [$path]: "
diff --git a/binzx/otomi b/binzx/otomi
index b03ce71b10..a8182fa915 100755
--- a/binzx/otomi
+++ b/binzx/otomi
@@ -2,12 +2,12 @@
#####################################################################################
##
## NOTE:
-## This is a command line tool to operate on otomi-core.
+## This is a command line tool to operate on apl-core.
## All commands are executed in docker container.
## Keep this file as simple as possible:
## - do not depend on any external files.
## - do not use any non standard tooling.
-## - only Docker is needed to run otomi-core image
+## - only Docker is needed to run apl-core image
## If you need to use any extra binaries then most probably you want to add them to the otomi/tools image.
##
#####################################################################################
@@ -97,7 +97,7 @@ if [[ ${BASH_SOURCE[0]} == '/'* ]]; then
script_full_path="${BASH_SOURCE[0]}"
fi
readonly script_full_path
-update_base="https://raw.githubusercontent.com/redkubes/otomi-core/${otomi_branch_or_tag}/binzx/otomi"
+update_base="https://raw.githubusercontent.com/linode/apl-core/${otomi_branch_or_tag}/binzx/otomi"
function date_to_format() {
date=${1:-'1970-01-01T00:00:00Z'}
@@ -164,7 +164,7 @@ check_update() {
[[ $calling_args == *'-ni'* ]]; then
return 0
fi
- last_commit_date=$(curl -s "https://api.github.com/repos/redkubes/otomi-core/commits?sha=${otomi_branch_or_tag}&path=binzx%2Fotomi&page=1&per_page=1" | grep -A5 '"committer":' | grep '"date":' | awk -F': ' '{print $2}' | tr -d '"')
+ last_commit_date=$(curl -s "https://api.github.com/repos/linode/apl-core/commits?sha=${otomi_branch_or_tag}&path=binzx%2Fotomi&page=1&per_page=1" | grep -A5 '"committer":' | grep '"date":' | awk -F': ' '{print $2}' | tr -d '"')
last_file_change=$(date -u -r $script_full_path '+%Y-%m-%dT%H:%M:%SZ')
last_commit_date_sec=$(date_to_format $last_commit_date)
last_file_change_sec=$(date_to_format $last_file_change)
@@ -307,7 +307,7 @@ fi
mkdir -p /tmp/otomi
# Issue arises due to OSX not assuming UTF-8 format: https://unix.stackexchange.com/a/64905 need to set LC_ALL=C
-container_name="otomi-core-$(cat /dev/urandom | LC_ALL=C tr -dc 'a-zA-Z0-9' | fold -w 6 | head -n 1)"
+container_name="apl-core-$(cat /dev/urandom | LC_ALL=C tr -dc 'a-zA-Z0-9' | fold -w 6 | head -n 1)"
if [ "${IN_DOCKER,,}" == "false" ]; then
silent echo $cmd
diff --git a/chart/otomi/Chart.yaml b/chart/otomi/Chart.yaml
index 456694ea27..cb3d6a306a 100644
--- a/chart/otomi/Chart.yaml
+++ b/chart/otomi/Chart.yaml
@@ -19,4 +19,4 @@ keywords:
- metrics
- tracing
sources:
- - https://github.com/redkubes/otomi-core
+ - https://github.com/linode/apl-core
diff --git a/docs/development.md b/docs/development.md
index 0f6f16e5d9..45cd4f09c8 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -17,7 +17,7 @@ Effective development starts with an understanding the code structure and the re
## Project structure
```
-otomi-core
+apl-core
├── .values # Boilerplate for initializing git repository
├── adr # Architectural Decision Records [read more](https://adr.github.io/madr/)
├── bin # Otomi CLI entrypoint (deprecated)
@@ -44,7 +44,7 @@ otomi-core
It is important that you get familiar with reusable code snippets located at `helmfile.d/snippets`. Below, I describe the most essential ones:
```
-otomi-core/helmfile.d/snippets
+apl-core/helmfile.d/snippets
├── defaults.yaml # static defaults that can be overwritten by user values and/or derived values
├── derived.gotmpl # values derived from default and user values
├── env.gotmpl # define helmfile environment settings
@@ -141,7 +141,7 @@ In the [Code structure](#Code-structure) chapter, you have learned about reusabl
> We present `myapp` integration. The `myapp` is an arbitrary name and can be anything else.
-> A core apps are those defined in otomi-core. Do not confuse them with team services, which are defined in the values repo.
+> A core apps are those defined in apl-core. Do not confuse them with team services, which are defined in the values repo.
## Using the default code snippet
@@ -316,11 +316,11 @@ TBD
## Using CLI while developing templates
-Using Otomi CLI can be very helpful while integrating apps or developing new features that involve the execution of Helmfile because it allows you to render and validate manifests. It is possible to use Otomi CLI in development mode, so the Otomi CLI reflects changes made in your local `otomi-core` directory.
+Using Otomi CLI can be very helpful while integrating apps or developing new features that involve the execution of Helmfile because it allows you to render and validate manifests. It is possible to use Otomi CLI in development mode, so the Otomi CLI reflects changes made in your local `apl-core` directory.
To run Otomi CLI in the development mode, you must:
-- execute Otomi CLI commands from a root directory of the `otomi-core` project
+- execute Otomi CLI commands from a root directory of the `apl-core` project
- export `ENV_DIR`
First, run `npm install` to build all modules required for CLI.
diff --git a/docs/migrating-values.md b/docs/migrating-values.md
index 4ba6e1300a..cd870708ed 100644
--- a/docs/migrating-values.md
+++ b/docs/migrating-values.md
@@ -2,7 +2,7 @@
Assumptions/conventions used in this document:
-- `otomi-values` is a git repo with values bootstrapped by a version of an `otomi-core` container.
+- `otomi-values` is a git repo with values bootstrapped by a version of an `apl-core` container.
### The problem
@@ -13,11 +13,11 @@ We break the schema (`values-schema.yaml`) in our `otomi-values` when:
- We move props around
- We mutate a property's type and/or it's value shape
-In order to move to another version of `otomi-core` (which might contain some of these changes), we needed a mechanism that migrates the old `otomi-values` to conform to the new schema. So we came up with a simple approach that serves our simple schema.
+In order to move to another version of `apl-core` (which might contain some of these changes), we needed a mechanism that migrates the old `otomi-values` to conform to the new schema. So we came up with a simple approach that serves our simple schema.
### Solution
-By comparing the diff between the old and the new schema a developer is able to create change records in `otomi-core` and store them in `values-changes.yaml`. Each record is given a successive number. If a user wants to upgrade the platform to a newer version of `otomi-core`, these change records will have to be applied to the values in successive order. When a dev runs `otomi commit` in an `otomi-values` repo, changes made to `otomi.version` will be detected, and the migration script will run in the newer container. The script only needs to compare the new `version` in `values-schema.yaml` with the `version` found in `otomi-values`.
+By comparing the diff between the old and the new schema a developer is able to create change records in `apl-core` and store them in `values-changes.yaml`. Each record is given a successive number. If a user wants to upgrade the platform to a newer version of `apl-core`, these change records will have to be applied to the values in successive order. When a dev runs `otomi commit` in an `otomi-values` repo, changes made to `otomi.version` will be detected, and the migration script will run in the newer container. The script only needs to compare the new `version` in `values-schema.yaml` with the `version` found in `otomi-values`.
### Change records
@@ -72,7 +72,7 @@ changes:
### Workflow
-Every time a developer changes the schema (`values-schema.yaml`) and adds change records, the `otomi migrate` command should be performed that will migrate the values to the new structure. For the following example workflow, we assume that the current (new) schema version of `otomi-core` is `4`, and the previous `otomi-values` version is at `3`.
+Every time a developer changes the schema (`values-schema.yaml`) and adds change records, the `otomi migrate` command should be performed that will migrate the values to the new structure. For the following example workflow, we assume that the current (new) schema version of `apl-core` is `4`, and the previous `otomi-values` version is at `3`.
Note:
diff --git a/docs/setup.md b/docs/setup.md
index c177b13c71..ec33c68f91 100644
--- a/docs/setup.md
+++ b/docs/setup.md
@@ -16,7 +16,7 @@ The bulk of the work in this repo consists of go templates. These are highlighte
A prefilled values repo with valid values can be generated quickly like this:
-1. Create a yaml file with the [minimal chart values](https://github.com/redkubes/otomi-core/blob/main/chart/otomi/values.yaml) (Only the 3 in `otomi.*` are sufficient)
+1. Create a yaml file with the [minimal chart values](https://github.com/linode/apl-core/blob/main/chart/otomi/values.yaml) (Only the 3 in `otomi.*` are sufficient)
2. Point to a location for the repo: `export ENV_DIR=...`
3. Generate the repo: `VALUES_INPUT={location of chart values} chart/otomi/localtest.sh`
diff --git a/package-lock.json b/package-lock.json
index d37c55d102..e40b988146 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
{
- "name": "otomi-core",
+ "name": "apl-core",
"version": "2.11.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
- "name": "otomi-core",
+ "name": "apl-core",
"version": "2.11.0",
"license": "Apache-2.0",
"dependencies": {
diff --git a/package.json b/package.json
index f1d9d5cedd..1508ec0b8c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"author": "RedKubes",
"bugs": {
- "url": "https://github.com/redkubes/otomi-core/issues"
+ "url": "https://github.com/linode/apl-core/issues"
},
"config": {
"commitizen": {
@@ -94,7 +94,7 @@
"npm": ">=8.0.0 <9.0.0",
"node": ">=16.0.0 <17.0.0"
},
- "homepage": "https://github.com/redkubes/otomi-core#readme",
+ "homepage": "https://github.com/linode/apl-core#readme",
"license": "Apache-2.0",
"lint-staged": {
"*.{json,yml,yaml}": [
@@ -105,11 +105,11 @@
]
},
"main": "src/otomi.ts",
- "name": "otomi-core",
+ "name": "apl-core",
"private": true,
"repository": {
"type": "git",
- "url": "git+https://github.com/redkubes/otomi-core.git"
+ "url": "git+https://github.com/linode/apl-core.git"
},
"run-if-changed": {
"package-lock.json": "npm install --prefer-offline --no-audit",
diff --git a/src/cmd/apply-as-apps.ts b/src/cmd/apply-as-apps.ts
index e83d58acc5..29d2ef78dd 100644
--- a/src/cmd/apply-as-apps.ts
+++ b/src/cmd/apply-as-apps.ts
@@ -65,7 +65,7 @@ const getArgocdAppManifest = (release: HelmRelease, values: Record,
project: 'default',
source: {
path: release.chart.replace('../', ''),
- repoURL: 'https://github.com/redkubes/otomi-core.git',
+ repoURL: 'https://github.com/linode/apl-core.git',
targetRevision: otomiVersion,
helm: {
releaseName: release.name,
diff --git a/src/cmd/bash.ts b/src/cmd/bash.ts
index c9bb6563b3..a2fad42679 100644
--- a/src/cmd/bash.ts
+++ b/src/cmd/bash.ts
@@ -1,9 +1,9 @@
-import { Argv, CommandModule } from 'yargs'
-import { $, nothrow } from 'zx'
import { prepareEnvironment } from 'src/common/cli'
import { terminal } from 'src/common/debug'
import { getFilename } from 'src/common/utils'
import { BasicArguments, getParsedArgs, parser, setParsedArgs } from 'src/common/yargs'
+import { Argv, CommandModule } from 'yargs'
+import { $, nothrow } from 'zx'
const cmdName = getFilename(__filename)
@@ -31,7 +31,7 @@ const bash = async (): Promise => {
export const module: CommandModule = {
command: cmdName,
- describe: 'Run interactive bash shell in otomi-core container',
+ describe: 'Run interactive bash shell in apl-core container',
builder: (args: Argv): Argv => args,
handler: async (argv: BasicArguments): Promise => {
diff --git a/src/cmd/bootstrap.ts b/src/cmd/bootstrap.ts
index ff818525f6..0c8436aaa3 100644
--- a/src/cmd/bootstrap.ts
+++ b/src/cmd/bootstrap.ts
@@ -116,7 +116,7 @@ export const copySchema = async (deps = { terminal, rootDir, env, isCore, loadYa
// for validation of .values/env/* files we also generate a schema here:
// deps.outputFile(devOnlyPath, trimmedVS)
await deps.copyFile(sourcePath, devOnlyPath)
- d.debug(`Stored loose YAML schema for otomi-core devs at: ${devOnlyPath}`)
+ d.debug(`Stored loose YAML schema for apl-core devs at: ${devOnlyPath}`)
}
}
diff --git a/src/common/utils.ts b/src/common/utils.ts
index 6488e3be00..fcbe927a9f 100644
--- a/src/common/utils.ts
+++ b/src/common/utils.ts
@@ -161,7 +161,7 @@ export const stringContainsSome = (str: string, ...args: string[]): boolean => {
const isCoreCheck = (): boolean => {
if (packagePath === '/home/app/stack' || !existsSync(`${packagePath}/package.json`)) return false
- return pkg.name === 'otomi-core'
+ return pkg.name === 'apl-core'
}
export const isCore: boolean = isCoreCheck()
diff --git a/src/playground.ts b/src/playground.ts
index 8a89be853e..a82773e7c3 100755
--- a/src/playground.ts
+++ b/src/playground.ts
@@ -11,7 +11,7 @@ async function play() {
// const releases = await getHelmReleases()
const data = await hfValues(
{ withWorkloadValues: true },
- '/Users/jehoszafatzimnowoda/workspace/redkubes/otomi-core/tests/fixtures',
+ '/Users/jehoszafatzimnowoda/workspace/linode/apl-core/tests/fixtures',
)
// await writeValuesToFile(`/tmp/status.yaml`, { status: { otomi: state, helm: releases } }, true)
}
diff --git a/tests/fixtures/README.md b/tests/fixtures/README.md
index bb5b2df12d..4492cf283b 100644
--- a/tests/fixtures/README.md
+++ b/tests/fixtures/README.md
@@ -2,6 +2,6 @@
Part of Otomi Container Platform.
-Repo that holds cluster configuration to be used by [otomi-core](https://github.com/redkubes/otomi-core).
+Repo that holds cluster configuration to be used by [apl-core](https://github.com/linode/apl-core).
Please read the online [otomi documentation](https://otomi.io/) for instructions on how to work with the platform.
diff --git a/tests/integration/minimal-with-team.yaml b/tests/integration/minimal-with-team.yaml
index 511b88fb6e..4fc8e6ebdd 100644
--- a/tests/integration/minimal-with-team.yaml
+++ b/tests/integration/minimal-with-team.yaml
@@ -90,7 +90,7 @@ teamConfig:
- name: httpbin
path: charts/httpbin
revision: HEAD
- url: https://github.com/redkubes/otomi-core.git
+ url: https://github.com/linode/apl-core.git
- name: nginx-deployment
path: deployment
revision: main
diff --git a/tests/integration/upgrade.yaml b/tests/integration/upgrade.yaml
index 05396b0eca..8f60c2c920 100644
--- a/tests/integration/upgrade.yaml
+++ b/tests/integration/upgrade.yaml
@@ -123,7 +123,7 @@ teamConfig:
- name: httpbin
path: charts/httpbin
revision: HEAD
- url: https://github.com/redkubes/otomi-core.git
+ url: https://github.com/linode/apl-core.git
- name: nginx-deployment
path: deployment
revision: main
diff --git a/values-schema.yaml b/values-schema.yaml
index 26ee9d9756..5ed812cd39 100644
--- a/values-schema.yaml
+++ b/values-schema.yaml
@@ -3096,7 +3096,7 @@ properties:
external-dns:
title: YAML for external-dns.
type: object
- description: 'The provider config as provided here: https://github.com/redkubes/otomi-core/blob/main/charts/external-dns/values.yaml'
+ description: 'The provider config as provided here: https://github.com/linode/apl-core/blob/main/charts/external-dns/values.yaml'
cert-manager:
title: YAML for cert-manager.
type: object
diff --git a/versions.yaml b/versions.yaml
index bd419d2a01..3ed377cbd7 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -1,4 +1,4 @@
api: main
console: main
-tasks: 2.5.0
+tasks: main
tools: 1.6.4