diff --git a/.github/ISSUE_TEMPLATE/k8s_support.md b/.github/ISSUE_TEMPLATE/k8s_support.md index 4ccd04ced8..791eccb00b 100644 --- a/.github/ISSUE_TEMPLATE/k8s_support.md +++ b/.github/ISSUE_TEMPLATE/k8s_support.md @@ -25,8 +25,8 @@ Get familiar with the `schemas/Readme.md` file - [ ] Kubectl [version skew](https://kubernetes.io/releases/version-skew-policy/#kubectl) from is compatible with all three supported k8s versions - [ ] Helm [version skew](https://helm.sh/docs/topics/version_skew/#supported-version-skew) from is compatible with all three supported k8s versions -- [ ] A new otomi/tools version is published -- [ ] The otomi/tools version is used by the otomi/core image +- [ ] A new linode/apl-tools version is published +- [ ] The linode/apl-tools version is used by the linode/apl-core image **.github/workflows** diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index f04572599e..926b4320a1 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -123,7 +123,7 @@ on: env: CACHE_REGISTRY: ghcr.io CACHE_REPO: linode/apl-core - REPO: otomi/core + REPO: linode/apl-core GIT_USER: svcAPLBot SCALEWAY_NODE_TYPE: PRO2-M SCALEWAY_NODE_POOL_MIN_SIZE: 3 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 44586aea8d..66704cf679 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,9 @@ on: env: CACHE_REGISTRY: ghcr.io CACHE_REPO: linode/apl-core - REPO: otomi/core + REPO: linode/apl-core + DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_LINODEBOT_TOKEN }} + DOCKER_USERNAME: ${{ vars.DOCKERHUB_LINODEBOT_USERNAME }} jobs: build-test-cache: @@ -60,7 +62,7 @@ jobs: image="$CACHE_REGISTRY/$CACHE_REPO:$TAG" docker pull $image docker tag $image $REPO:$TAG - docker login -u otomi -p ${{ secrets.DOCKERHUB_OTOMI_TOKEN }} + docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD docker push $REPO:$TAG - name: Show me the logic run: | @@ -83,7 +85,7 @@ jobs: id: git_tag run: | TAG=${GITHUB_REF##*/} - docker login -u otomi -p ${{ secrets.DOCKERHUB_OTOMI_TOKEN }} + docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD docker pull $REPO:$TAG docker tag $REPO:$TAG $REPO:latest docker push $REPO:latest @@ -113,7 +115,7 @@ jobs: if: always() && contains(needs.release.result, 'success') && !github.event.act runs-on: ubuntu-latest container: - image: otomi/tools:v1.4.20 + image: linode/apl-tools:v2.4.0 options: --user 0 steps: - name: Checkout diff --git a/.github/workflows/otomi-tools-build-push.yaml b/.github/workflows/otomi-tools-build-push.yaml index 8c82b53961..deca377c44 100644 --- a/.github/workflows/otomi-tools-build-push.yaml +++ b/.github/workflows/otomi-tools-build-push.yaml @@ -1,4 +1,4 @@ -name: Otomi Tools Build and Versioning +name: APL Tools Build and Versioning on: workflow_dispatch: @@ -13,8 +13,8 @@ on: - 'main' env: - NAMESPACE: otomi - REPO: tools + NAMESPACE: linode + REPO: apl-tools jobs: build-and-version: @@ -76,8 +76,8 @@ jobs: if: ${{ env.NEW_VERSION != null }} uses: docker/login-action@v3 with: - username: 'otomi' - password: '${{ secrets.DOCKERHUB_OTOMI_TOKEN }}' + username: ${{ vars.DOCKERHUB_LINODEBOT_USERNAME }} + password: ${{ secrets.DOCKERHUB_LINODEBOT_TOKEN }} - name: image build and push tag for branch if: ${{ env.NEW_VERSION != null }} uses: docker/build-push-action@v5 diff --git a/Dockerfile b/Dockerfile index 21f75087d3..1ffbba216e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM otomi/tools:v2.3.0 as ci +FROM linode/apl-tools:v2.4.0 as ci ENV APP_HOME=/home/app/stack @@ -27,7 +27,7 @@ FROM ci as clean RUN npm prune --production #----------------------------- -FROM otomi/tools:v2.3.0 as prod +FROM linode/apl-tools:v2.4.0 as prod ENV APP_HOME=/home/app/stack ENV ENV_DIR=/home/app/stack/env diff --git a/README.md b/README.md index 925f85b5cd..9f25abc47d 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@

Contributions - Website otomi.io + Website apl-docs.net

@@ -35,7 +35,7 @@ To install APL, make sure to have a Kubernetes cluster running with at least: > The transition from Otomi to APL is still in progress. Installing APL will use the latest Otomi release (v2.11.5). > [!TIP] -> Install APL with DNS to unlock it's full potential. Check [here](https://otomi.io) for more info. +> Install APL with DNS to unlock it's full potential. Check [here](https://apl-docs.net) for more info. Add the Helm repository: @@ -53,7 +53,7 @@ helm install apl apl/otomi \ --set cluster.provider=$PROVIDER # use 'linode' for LKE or 'custom' for any other cloud/infrastructure ``` -When the installer job is completed, follow the [activation steps](https://otomi.io/docs/get-started/activation). +When the installer job is completed, follow the [activation steps](https://apl-docs.net/docs/get-started/activation). ## Integrations @@ -93,7 +93,7 @@ When the installer job is completed, follow the [activation steps](https://otomi ## Documentation -Check out [otomi.io](https://otomi.io) for more detailed documentation. +Check out [apl-docs.net](https://apl-docs.net) for more detailed documentation. ## License diff --git a/bin/common.sh b/bin/common.sh index 0b5f3f4441..c84671bbea 100644 --- a/bin/common.sh +++ b/bin/common.sh @@ -18,7 +18,7 @@ LOG_LEVEL='--log-level warn' # Common vars readonly otomi_settings="$ENV_DIR/env/settings.yaml" -readonly otomi_tools_image="otomi/core:latest" +readonly otomi_tools_image="linode/apl-core:latest" [ $(uname -s) == 'Linux' ] && readonly LINUX_WORKAROUND='--user=root:root' # Mutliple files vars diff --git a/binzx/README.md b/binzx/README.md index a760ccb3d8..fae8b46a21 100644 --- a/binzx/README.md +++ b/binzx/README.md @@ -3,7 +3,7 @@ ```sh # In the apl-core directory export DOCKER_TAG=binzx -docker build --target prod -t otomi/core:binzx . +docker build --target prod -t linode/apl-core:binzx . ./binzx/otomi ``` diff --git a/binzx/otomi b/binzx/otomi index a8182fa915..0501820dda 100755 --- a/binzx/otomi +++ b/binzx/otomi @@ -8,7 +8,7 @@ ## - do not depend on any external files. ## - do not use any non standard tooling. ## - 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. +## If you need to use any extra binaries then most probably you want to add them to the linode/apl-tools image. ## ##################################################################################### # shellcheck disable=SC2128 @@ -90,7 +90,7 @@ else fi otomi_branch_or_tag=${OTOMI_TAG:-$otomi_version} otomi_version_used=${OTOMI_TAG:-$otomi_version} -readonly otomi_tools_image="otomi/core:${otomi_version_used}" +readonly otomi_tools_image="linode/apl-core:${otomi_version_used}" script_full_path="$base_dir/${BASH_SOURCE[0]##*/}" if [[ ${BASH_SOURCE[0]} == '/'* ]]; then diff --git a/chart/apl/templates/job.yaml b/chart/apl/templates/job.yaml index 87e9db4312..7de1fec76d 100644 --- a/chart/apl/templates/job.yaml +++ b/chart/apl/templates/job.yaml @@ -1,5 +1,5 @@ {{- $kms := .Values.kms | default dict }} -{{- $imageName := .Values.imageName | default "otomi/core" }} +{{- $imageName := .Values.imageName | default "linode/apl-core" }} {{- $version := .Values.otomi.version | default .Chart.AppVersion }} apiVersion: batch/v1 kind: Job diff --git a/chart/apl/templates/post-job.yaml b/chart/apl/templates/post-job.yaml index 7446ea8b6b..e76a4704d7 100644 --- a/chart/apl/templates/post-job.yaml +++ b/chart/apl/templates/post-job.yaml @@ -29,7 +29,7 @@ spec: type: RuntimeDefault containers: - name: destroy - image: otomi/core:{{ $version }} + image: linode/apl-core:{{ $version }} imagePullPolicy: {{ ternary "IfNotPresent" "Always" (regexMatch "^v\\d" $version) }} securityContext: allowPrivilegeEscalation: false diff --git a/charts/otomi-api/values.yaml b/charts/otomi-api/values.yaml index 9f0eceba38..68269293cf 100644 --- a/charts/otomi-api/values.yaml +++ b/charts/otomi-api/values.yaml @@ -102,7 +102,7 @@ core: {} tools: image: registry: docker.io - repository: otomi/core + repository: linode/apl-core tag: latest pullPolicy: IfNotPresent diff --git a/charts/otomi-pipelines/templates/tekton-otomi-git-clone.yaml b/charts/otomi-pipelines/templates/tekton-otomi-git-clone.yaml index 21a0983af1..c1ba6bd2a4 100644 --- a/charts/otomi-pipelines/templates/tekton-otomi-git-clone.yaml +++ b/charts/otomi-pipelines/templates/tekton-otomi-git-clone.yaml @@ -32,7 +32,7 @@ spec: stepTemplate: computeResources: {{- toYaml .Values.tektonTask.resources | nindent 6 }} workingDir: $(workspaces.source.path) - image: otomi/core:{{ .Values.otomiVersion }} + image: linode/apl-core:{{ .Values.otomiVersion }} steps: - name: git-clone computeResources: {} diff --git a/charts/otomi-pipelines/templates/tekton-otomi-task-teams.yaml b/charts/otomi-pipelines/templates/tekton-otomi-task-teams.yaml index 633b3f4f8d..ab88921384 100644 --- a/charts/otomi-pipelines/templates/tekton-otomi-task-teams.yaml +++ b/charts/otomi-pipelines/templates/tekton-otomi-task-teams.yaml @@ -23,7 +23,7 @@ spec: stepTemplate: computeResources: {{- toYaml .Values.tektonTask.resources | nindent 6 }} imagePullPolicy: Always - image: otomi/core:$(params["OTOMI_VERSION"]) + image: linode/apl-core:$(params["OTOMI_VERSION"]) workingDir: /home/app/stack {{- if hasKey $kms "sops" }} envFrom: diff --git a/charts/otomi-pipelines/templates/tekton-otomi-task.yaml b/charts/otomi-pipelines/templates/tekton-otomi-task.yaml index 1f869e1e56..789f4a27b7 100644 --- a/charts/otomi-pipelines/templates/tekton-otomi-task.yaml +++ b/charts/otomi-pipelines/templates/tekton-otomi-task.yaml @@ -23,7 +23,7 @@ spec: stepTemplate: computeResources: {{- toYaml .Values.tektonTask.resources | nindent 6 }} imagePullPolicy: Always - image: otomi/core:$(params["OTOMI_VERSION"]) + image: linode/apl-core:$(params["OTOMI_VERSION"]) workingDir: /home/app/stack {{- if hasKey $kms "sops" }} envFrom: diff --git a/docker-compose.yml b/docker-compose.yml index 05b21931d0..f36cdca4fa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,7 +25,7 @@ services: tools: container_name: tools - image: otomi/core:${TOOLS_TAG:-latest} + image: linode/apl-core:${TOOLS_TAG:-latest} user: ${USER_ID}:${GROUP_ID} command: npm run compile && node --no-warnings ./dist/src/otomi.js -- server depends_on: diff --git a/helmfile.d/snippets/defaults.yaml b/helmfile.d/snippets/defaults.yaml index bbe9190c4f..b6d25a4605 100644 --- a/helmfile.d/snippets/defaults.yaml +++ b/helmfile.d/snippets/defaults.yaml @@ -122,7 +122,7 @@ environments: quay.io/prometheus-operator/prometheus-operator, quay.io/prometheus/prometheus, quay.io/kiwigrid/k8s-sidecar, - docker.io/otomi/core, + docker.io/linode/apl-core, docker.io/linode/apl-tasks, docker.io/linode/apl-api, docker.io/drone/drone-runner-kube, @@ -163,7 +163,7 @@ environments: condition: ( container.image.repository in ( docker.io/linode/apl-tasks, - ocker.io/otomi/core + docker.io/linode/apl-core ) or (k8s.ns.name = "drone-pipelines") ) - macro: user_known_non_sudo_setuid_conditions @@ -719,14 +719,14 @@ environments: operator: requests: cpu: 100m - memory: 64Mi + memory: 256Mi limits: - cpu: 500m - memory: 512Mi + cpu: "1" + memory: 1Gi trivy: requests: cpu: 100m - memory: 64M + memory: 128M limits: cpu: 500m memory: 512Mi diff --git a/helmfile.d/snippets/job.gotmpl b/helmfile.d/snippets/job.gotmpl index b6fb434f9a..b47daed279 100644 --- a/helmfile.d/snippets/job.gotmpl +++ b/helmfile.d/snippets/job.gotmpl @@ -5,10 +5,9 @@ {{- $skipScript := . | get "skipScript" false }} {{- $task := . | get "task" nil }} {{- $type := . | get "type" "job" }} -{{- $repositoryPrefix := default "otomi/" (index . "repositoryPrefix" | default "") }} image: registry: docker.io - repository: {{ $repositoryPrefix }}{{ .item }} + repository: linode/apl-{{ .item }} tag: {{ printf "%s%s" ($isSemver | ternary "v" "") $version }} pullPolicy: {{ $isSemver | ternary "IfNotPresent" "Always" }} {{ if $v._derived.untrustedCA }} diff --git a/src/cmd/bootstrap.ts b/src/cmd/bootstrap.ts index 9022919c49..87d0d7f0eb 100644 --- a/src/cmd/bootstrap.ts +++ b/src/cmd/bootstrap.ts @@ -359,7 +359,7 @@ export const bootstrap = async ( const { ENV_DIR } = env const hasOtomi = await deps.pathExists(`${ENV_DIR}/bin/otomi`) - const otomiImage = `otomi/core:${tag}` + const otomiImage = `linode/apl-core:${tag}` d.log(`Installing artifacts from ${otomiImage}`) await deps.copyBasicFiles() await deps.migrate() diff --git a/tools/Readme.md b/tools/Readme.md index c087dfe306..da8f94f15a 100644 --- a/tools/Readme.md +++ b/tools/Readme.md @@ -1,11 +1,11 @@ -# Building otomi/tools container image +# Building linode/apl-tools container image ``` -docker build . -f Dockerfile -t otomi/tools: +docker build . -f Dockerfile -t linode/apl-tools: ``` -# Building otomi/tools-db container image +# Building linode/apl-tools-db container image ``` -docker build . -f Dockerfile-db -t otomi/tools-db: +docker build . -f Dockerfile-db -t linode/apl-tools-db: ``` diff --git a/values/otomi-api/otomi-api.gotmpl b/values/otomi-api/otomi-api.gotmpl index ac1aca85be..43e5f4ce91 100644 --- a/values/otomi-api/otomi-api.gotmpl +++ b/values/otomi-api/otomi-api.gotmpl @@ -24,7 +24,7 @@ resources: memory: 256Mi {{- end }} -{{- tpl (readFile "../../helmfile.d/snippets/job.gotmpl") (dict "repositoryPrefix" "linode/apl-" "item" "api" "v" $v "skipScript" true) }} +{{- tpl (readFile "../../helmfile.d/snippets/job.gotmpl") (dict "item" "api" "v" $v "skipScript" true) }} secrets: GIT_USER: otomi-admin diff --git a/values/otomi-console/otomi-console.gotmpl b/values/otomi-console/otomi-console.gotmpl index 965beef41b..05672d8c8d 100644 --- a/values/otomi-console/otomi-console.gotmpl +++ b/values/otomi-console/otomi-console.gotmpl @@ -15,7 +15,7 @@ resources: memory: 128Mi {{- end }} -{{- tpl (readFile "../../helmfile.d/snippets/job.gotmpl") (dict "repositoryPrefix" "linode/apl-" "item" "console" "v" $v "skipScript" true ) }} +{{- tpl (readFile "../../helmfile.d/snippets/job.gotmpl") (dict "item" "console" "v" $v "skipScript" true ) }} env: API_BASE_URL: /api diff --git a/versions.yaml b/versions.yaml index 3ed377cbd7..0ba82346ff 100644 --- a/versions.yaml +++ b/versions.yaml @@ -1,4 +1,4 @@ api: main console: main tasks: main -tools: 1.6.4 +tools: 2.4.0