Skip to content

Commit d979b43

Browse files
ferruhcihanferruhcihan
authored
feat: use linode dockerhub for apl-core and apl-tools (#1686)
1 parent 9bf5ed3 commit d979b43

File tree

22 files changed

+38
-37
lines changed

22 files changed

+38
-37
lines changed

‎.github/ISSUE_TEMPLATE/k8s_support.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ Get familiar with the `schemas/Readme.md` file
2525

2626
- [ ] Kubectl [version skew](https://kubernetes.io/releases/version-skew-policy/#kubectl) from is compatible with all three supported k8s versions
2727
- [ ] Helm [version skew](https://helm.sh/docs/topics/version_skew/#supported-version-skew) from is compatible with all three supported k8s versions
28-
- [ ] A new otomi/tools version is published
29-
- [ ] The otomi/tools version is used by the otomi/core image
28+
- [ ] A new linode/apl-tools version is published
29+
- [ ] The linode/apl-tools version is used by the linode/apl-core image
3030

3131
**.github/workflows**
3232

‎.github/workflows/integration.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ on:
123123
env:
124124
CACHE_REGISTRY: ghcr.io
125125
CACHE_REPO: linode/apl-core
126-
REPO: otomi/core
126+
REPO: linode/apl-core
127127
GIT_USER: svcAPLBot
128128
SCALEWAY_NODE_TYPE: PRO2-M
129129
SCALEWAY_NODE_POOL_MIN_SIZE: 3

‎.github/workflows/main.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ on:
88
env:
99
CACHE_REGISTRY: ghcr.io
1010
CACHE_REPO: linode/apl-core
11-
REPO: otomi/core
11+
REPO: linode/apl-core
12+
DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_LINODEBOT_TOKEN }}
13+
DOCKER_USERNAME: ${{ vars.DOCKERHUB_LINODEBOT_USERNAME }}
1214

1315
jobs:
1416
build-test-cache:
@@ -60,7 +62,7 @@ jobs:
6062
image="$CACHE_REGISTRY/$CACHE_REPO:$TAG"
6163
docker pull $image
6264
docker tag $image $REPO:$TAG
63-
docker login -u otomi -p ${{ secrets.DOCKERHUB_OTOMI_TOKEN }}
65+
docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
6466
docker push $REPO:$TAG
6567
- name: Show me the logic
6668
run: |
@@ -83,7 +85,7 @@ jobs:
8385
id: git_tag
8486
run: |
8587
TAG=${GITHUB_REF##*/}
86-
docker login -u otomi -p ${{ secrets.DOCKERHUB_OTOMI_TOKEN }}
88+
docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
8789
docker pull $REPO:$TAG
8890
docker tag $REPO:$TAG $REPO:latest
8991
docker push $REPO:latest
@@ -113,7 +115,7 @@ jobs:
113115
if: always() && contains(needs.release.result, 'success') && !github.event.act
114116
runs-on: ubuntu-latest
115117
container:
116-
image: otomi/tools:v1.4.20
118+
image: linode/apl-tools:v2.4.0
117119
options: --user 0
118120
steps:
119121
- name: Checkout

‎.github/workflows/otomi-tools-build-push.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Otomi Tools Build and Versioning
1+
name: APL Tools Build and Versioning
22

33
on:
44
workflow_dispatch:
@@ -13,8 +13,8 @@ on:
1313
- 'main'
1414

1515
env:
16-
NAMESPACE: otomi
17-
REPO: tools
16+
NAMESPACE: linode
17+
REPO: apl-tools
1818

1919
jobs:
2020
build-and-version:
@@ -76,8 +76,8 @@ jobs:
7676
if: ${{ env.NEW_VERSION != null }}
7777
uses: docker/login-action@v3
7878
with:
79-
username: 'otomi'
80-
password: '${{ secrets.DOCKERHUB_OTOMI_TOKEN }}'
79+
username: ${{ vars.DOCKERHUB_LINODEBOT_USERNAME }}
80+
password: ${{ secrets.DOCKERHUB_LINODEBOT_TOKEN }}
8181
- name: image build and push tag for branch
8282
if: ${{ env.NEW_VERSION != null }}
8383
uses: docker/build-push-action@v5

‎Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM otomi/tools:v2.3.0 as ci
1+
FROM linode/apl-tools:v2.4.0 as ci
22

33
ENV APP_HOME=/home/app/stack
44

@@ -27,7 +27,7 @@ FROM ci as clean
2727
RUN npm prune --production
2828

2929
#-----------------------------
30-
FROM otomi/tools:v2.3.0 as prod
30+
FROM linode/apl-tools:v2.4.0 as prod
3131

3232
ENV APP_HOME=/home/app/stack
3333
ENV ENV_DIR=/home/app/stack/env

‎bin/common.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ LOG_LEVEL='--log-level warn'
1818

1919
# Common vars
2020
readonly otomi_settings="$ENV_DIR/env/settings.yaml"
21-
readonly otomi_tools_image="otomi/core:latest"
21+
readonly otomi_tools_image="linode/apl-core:latest"
2222
[ $(uname -s) == 'Linux' ] && readonly LINUX_WORKAROUND='--user=root:root'
2323

2424
# Mutliple files vars

‎binzx/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
```sh
44
# In the apl-core directory
55
export DOCKER_TAG=binzx
6-
docker build --target prod -t otomi/core:binzx .
6+
docker build --target prod -t linode/apl-core:binzx .
77
./binzx/otomi <commands here>
88
```
99

‎binzx/otomi

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
## - do not depend on any external files.
99
## - do not use any non standard tooling.
1010
## - only Docker is needed to run apl-core image
11-
## If you need to use any extra binaries then most probably you want to add them to the otomi/tools image.
11+
## If you need to use any extra binaries then most probably you want to add them to the linode/apl-tools image.
1212
##
1313
#####################################################################################
1414
# shellcheck disable=SC2128
@@ -90,7 +90,7 @@ else
9090
fi
9191
otomi_branch_or_tag=${OTOMI_TAG:-$otomi_version}
9292
otomi_version_used=${OTOMI_TAG:-$otomi_version}
93-
readonly otomi_tools_image="otomi/core:${otomi_version_used}"
93+
readonly otomi_tools_image="linode/apl-core:${otomi_version_used}"
9494

9595
script_full_path="$base_dir/${BASH_SOURCE[0]##*/}"
9696
if [[ ${BASH_SOURCE[0]} == '/'* ]]; then

‎chart/apl/templates/job.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{- $kms := .Values.kms | default dict }}
2-
{{- $imageName := .Values.imageName | default "otomi/core" }}
2+
{{- $imageName := .Values.imageName | default "linode/apl-core" }}
33
{{- $version := .Values.otomi.version | default .Chart.AppVersion }}
44
apiVersion: batch/v1
55
kind: Job

‎chart/apl/templates/post-job.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
type: RuntimeDefault
3030
containers:
3131
- name: destroy
32-
image: otomi/core:{{ $version }}
32+
image: linode/apl-core:{{ $version }}
3333
imagePullPolicy: {{ ternary "IfNotPresent" "Always" (regexMatch "^v\\d" $version) }}
3434
securityContext:
3535
allowPrivilegeEscalation: false

‎charts/otomi-api/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ core: {}
102102
tools:
103103
image:
104104
registry: docker.io
105-
repository: otomi/core
105+
repository: linode/apl-core
106106
tag: latest
107107
pullPolicy: IfNotPresent
108108

‎charts/otomi-pipelines/templates/tekton-otomi-git-clone.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
stepTemplate:
3333
computeResources: {{- toYaml .Values.tektonTask.resources | nindent 6 }}
3434
workingDir: $(workspaces.source.path)
35-
image: otomi/core:{{ .Values.otomiVersion }}
35+
image: linode/apl-core:{{ .Values.otomiVersion }}
3636
steps:
3737
- name: git-clone
3838
computeResources: {}

‎charts/otomi-pipelines/templates/tekton-otomi-task-teams.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
stepTemplate:
2424
computeResources: {{- toYaml .Values.tektonTask.resources | nindent 6 }}
2525
imagePullPolicy: Always
26-
image: otomi/core:$(params["OTOMI_VERSION"])
26+
image: linode/apl-core:$(params["OTOMI_VERSION"])
2727
workingDir: /home/app/stack
2828
{{- if hasKey $kms "sops" }}
2929
envFrom:

‎charts/otomi-pipelines/templates/tekton-otomi-task.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
stepTemplate:
2424
computeResources: {{- toYaml .Values.tektonTask.resources | nindent 6 }}
2525
imagePullPolicy: Always
26-
image: otomi/core:$(params["OTOMI_VERSION"])
26+
image: linode/apl-core:$(params["OTOMI_VERSION"])
2727
workingDir: /home/app/stack
2828
{{- if hasKey $kms "sops" }}
2929
envFrom:

‎docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ services:
2525

2626
tools:
2727
container_name: tools
28-
image: otomi/core:${TOOLS_TAG:-latest}
28+
image: linode/apl-core:${TOOLS_TAG:-latest}
2929
user: ${USER_ID}:${GROUP_ID}
3030
command: npm run compile && node --no-warnings ./dist/src/otomi.js -- server
3131
depends_on:

‎helmfile.d/snippets/defaults.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ environments:
122122
quay.io/prometheus-operator/prometheus-operator,
123123
quay.io/prometheus/prometheus,
124124
quay.io/kiwigrid/k8s-sidecar,
125-
docker.io/otomi/core,
125+
docker.io/linode/apl-core,
126126
docker.io/linode/apl-tasks,
127127
docker.io/linode/apl-api,
128128
docker.io/drone/drone-runner-kube,
@@ -163,7 +163,7 @@ environments:
163163
condition: (
164164
container.image.repository in (
165165
docker.io/linode/apl-tasks,
166-
ocker.io/otomi/core
166+
docker.io/linode/apl-core
167167
) or (k8s.ns.name = "drone-pipelines")
168168
)
169169
- macro: user_known_non_sudo_setuid_conditions

‎helmfile.d/snippets/job.gotmpl

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
{{- $skipScript := . | get "skipScript" false }}
66
{{- $task := . | get "task" nil }}
77
{{- $type := . | get "type" "job" }}
8-
{{- $repositoryPrefix := default "otomi/" (index . "repositoryPrefix" | default "") }}
98
image:
109
registry: docker.io
11-
repository: {{ $repositoryPrefix }}{{ .item }}
10+
repository: linode/apl-{{ .item }}
1211
tag: {{ printf "%s%s" ($isSemver | ternary "v" "") $version }}
1312
pullPolicy: {{ $isSemver | ternary "IfNotPresent" "Always" }}
1413
{{ if $v._derived.untrustedCA }}

‎src/cmd/bootstrap.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ export const bootstrap = async (
359359
const { ENV_DIR } = env
360360
const hasOtomi = await deps.pathExists(`${ENV_DIR}/bin/otomi`)
361361

362-
const otomiImage = `otomi/core:${tag}`
362+
const otomiImage = `linode/apl-core:${tag}`
363363
d.log(`Installing artifacts from ${otomiImage}`)
364364
await deps.copyBasicFiles()
365365
await deps.migrate()

‎tools/Readme.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# Building otomi/tools container image
1+
# Building linode/apl-tools container image
22

33
```
4-
docker build . -f Dockerfile -t otomi/tools:<TAG>
4+
docker build . -f Dockerfile -t linode/apl-tools:<TAG>
55
```
66

7-
# Building otomi/tools-db container image
7+
# Building linode/apl-tools-db container image
88

99
```
10-
docker build . -f Dockerfile-db -t otomi/tools-db:<TAG>
10+
docker build . -f Dockerfile-db -t linode/apl-tools-db:<TAG>
1111
```

‎values/otomi-api/otomi-api.gotmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ resources:
2424
memory: 256Mi
2525
{{- end }}
2626

27-
{{- tpl (readFile "../../helmfile.d/snippets/job.gotmpl") (dict "repositoryPrefix" "linode/apl-" "item" "api" "v" $v "skipScript" true) }}
27+
{{- tpl (readFile "../../helmfile.d/snippets/job.gotmpl") (dict "item" "api" "v" $v "skipScript" true) }}
2828

2929
secrets:
3030
GIT_USER: otomi-admin

‎values/otomi-console/otomi-console.gotmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ resources:
1515
memory: 128Mi
1616
{{- end }}
1717

18-
{{- tpl (readFile "../../helmfile.d/snippets/job.gotmpl") (dict "repositoryPrefix" "linode/apl-" "item" "console" "v" $v "skipScript" true ) }}
18+
{{- tpl (readFile "../../helmfile.d/snippets/job.gotmpl") (dict "item" "console" "v" $v "skipScript" true ) }}
1919

2020
env:
2121
API_BASE_URL: /api

‎versions.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
api: main
22
console: main
33
tasks: main
4-
tools: 1.6.4
4+
tools: 2.4.0

0 commit comments

Comments
 (0)