feat: remove server related code and tools sidecar dependencies

.vscode/launch.json

@@ -36,20 +36,6 @@
       "restart": true,
       "cwd": "${workspaceRoot}"
     },
-    {
-      "name": "Debug node server",
-      "type": "node",
-      "request": "launch",
-      "program": "${workspaceRoot}/node_modules/.bin/tsx",
-      "runtimeArgs": ["--nolazy"],
-      "args": ["src/server.ts"],
-      "envFile": ".env",
-      "console": "integratedTerminal",
-      "cwd": "${workspaceRoot}",
-      "internalConsoleOptions": "openOnSessionStart",
-      "skipFiles": ["<node_internals>/**", "node_modules/**"],
-      "resolveSourceMapLocations": ["${workspaceFolder}/src/**"]
-    },
     {
       "name": "Debug all tests",
       "type": "node",

charts/otomi-api/templates/deployment.yaml

@@ -73,28 +73,6 @@ spec:
             - name: core-values
               mountPath: /etc/otomi/core.yaml
               subPath: core.yaml
-        - name: {{ .Chart.Name }}-tools
-          image: "{{ .Values.tools.image.repository }}:{{ .Values.tools.image.tag }}"
-          imagePullPolicy: {{ .Values.tools.image.pullPolicy }}
-          command: ['sh']
-          args: ['-c', 'binzx/otomi server -vv']
-          envFrom:
-            - secretRef:
-                name: {{ include "otomi-api.fullname" . }}
-            {{- with .Values.gitConfig.existingSecret }}
-            - secretRef:
-                name: {{ . }}
-            {{- end }}
-            - configMapRef:
-                name: {{ include "otomi-api.fullname" . }}
-          ports:
-            - name: http
-              containerPort: 17771
-              protocol: TCP
-          resources: {{- toYaml .Values.tools.resources | nindent 12 }}
-          volumeMounts:
-            - name: repo
-              mountPath: /tmp
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

charts/otomi-api/values.yaml

@@ -109,16 +109,3 @@ env:
 
 core: {}
 
-tools:
-  image:
-    repository: docker.io/linode/apl-core
-    tag: main
-    pullPolicy: IfNotPresent
-
-  resources: {}
-    # limits:
-    #   cpu: 500m
-    #   memory: 500Mi
-    # requests:
-    #   cpu: 100m
-    #   memory: 100Mi

docker-compose.yml

@@ -13,7 +13,6 @@ services:
       - ${PWD}/core.yaml:/etc/otomi/core.yaml
       - tmp:/tmp
     environment:
-      TOOLS_HOST: tools
       CLUSTER_ID: ${CLUSTER_ID:-google/dev}
       GIT_LOCAL_PATH: /tmp/otomi-values-core
       GIT_REPO_URL: ${GIT_REPO_URL:-github.com/redkubes/otomi-values.git}
@@ -23,23 +22,6 @@ services:
       GIT_PASSWORD: ${GIT_PASSWORD}
       CLUSTER_APISERVER: http://127.0.0.1:8080
 
-  tools:
-    container_name: tools
-    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:
-      - api
-    expose:
-      - 17771
-    ports:
-      - 17771:192019
-    volumes:
-      - tmp:/tmp
-      - $PWD:/home/app/stack
-    environment:
-      ENV_DIR: /tmp/otomi-values-core
-      GCLOUD_SERVICE_KEY: ${GCLOUD_SERVICE_KEY}
 
   web:
     image: linode/apl-console:${WEB_TAG:-latest}

helmfile.d/snippets/defaults.yaml

@@ -791,13 +791,6 @@ environments:
                 requests:
                   cpu: 100m
                   memory: 256Mi
-              tools:
-                limits:
-                  cpu: "1"
-                  memory: 1Gi
-                requests:
-                  cpu: 300m
-                  memory: 256Mi
           otomi-console:
             _rawValues: {}
             resources:

package.json

@@ -154,7 +154,6 @@
     "release:github": "github-release-from-changelog",
     "release:bump:minor": "standard-version --skip.changelog true --release-as minor",
     "score-templates": "binzx/otomi score-templates",
-    "server": "binzx/otomi server",
     "spellcheck": "cspell 'docs/**/*.md' 'values-schema.yaml' '*.md' '.values/README.md'",
     "tasks:copy-certs": "binzx/otomi task -n copyCerts",
     "test": "run-s test:ts lint validate-values validate-templates bootstrap-dev",

src/cmd/index.ts

@@ -18,7 +18,6 @@ import { module as migrateModule } from './migrate'
 import { module as playgroundModule } from './playground'
 import { module as pullModule } from './pull'
 import { module as scoreTemplatesModule } from './score-templates'
-import { module as serverModule } from './server'
 import { module as statusModule } from './status'
 import { module as syncModule } from './sync'
 import { module as templateModule } from './template'
@@ -47,7 +46,6 @@ export { module as lint } from './lint'
 export { module as migrate } from './migrate'
 export { module as pull } from './pull'
 export { module as scoreTemplates } from './score-templates'
-export { module as server } from './server'
 export { module as status } from './status'
 export { module as sync } from './sync'
 export { module as template } from './template'
@@ -77,7 +75,6 @@ export const commands: CommandModule[] = [
   playgroundModule,
   pullModule,
   scoreTemplatesModule,
-  serverModule,
   statusModule,
   syncModule,
   templateModule,

values/otomi-api/otomi-api.gotmpl

@@ -8,9 +8,6 @@
 {{- $httpRoute := tpl (readFile "../../helmfile.d/snippets/routes.gotmpl") $v | fromYaml }}
 {{- $version := $v.versions | get "api" }}
 {{- $isSemver := regexMatch "^[0-9.]+" $version }}
-{{- $coreVersion := $v.otomi.version }}
-{{- $coreIsSemver := regexMatch "^[0-9.]+" $coreVersion }}
-
 replicaCount: 1
 clusterDomainSuffix: {{ $v.cluster.domainSuffix }}
 resources: {{- $o.resources.api | toYaml | nindent 2 }}
@@ -22,18 +19,6 @@ image:
   tag: {{ printf "%s%s" ($isSemver | ternary "v" "") $version }}
   pullPolicy: {{ $isSemver | ternary "IfNotPresent" "Always" }}
 
-tools:
-  image:
-    {{- if $v.otomi.linodeLkeImageRepository }}
-    repository: "{{ $v.otomi.linodeLkeImageRepository }}/docker/linode/apl-core"
-    {{- end }}
-    tag: {{ $coreVersion | quote }}
-    pullPolicy: {{ $coreIsSemver | ternary "IfNotPresent" "Always" }}
-  resources: {{- $o.resources.tools | toYaml | nindent 4 }}
-  env:
-    DEBUG: '*'
-    VERBOSITY: '1'
-
 secrets:
   GIT_USER: {{ $git.username | quote }}
   GIT_EMAIL: {{ $git.email | quote }}