Skip to content

Commit

Permalink
feat: implement omnictl support command
Browse files Browse the repository at this point in the history
Works the same way as `talosctl support` but also grabs some relevant
Omni resources to help with the diagnostics.

Uses `go-talos-support` common module to collect Talos data.

Signed-off-by: Artem Chernyshev <[email protected]>
  • Loading branch information
Unix4ever committed Mar 19, 2024
1 parent a835cc7 commit 1e4e303
Show file tree
Hide file tree
Showing 43 changed files with 3,238 additions and 396 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-03-07T17:30:39Z by kres latest.
# Generated on 2024-03-13T17:28:42Z by kres latest.

name: default
concurrency:
Expand Down Expand Up @@ -50,8 +50,8 @@ jobs:
uses: docker/setup-buildx-action@v3
with:
driver: remote
endpoint: tcp://localhost:1234
timeout-minutes: 1
endpoint: tcp://127.0.0.1:1234
timeout-minutes: 10
- name: js
run: |
make js
Expand Down Expand Up @@ -200,8 +200,8 @@ jobs:
uses: docker/setup-buildx-action@v3
with:
driver: remote
endpoint: tcp://localhost:1234
timeout-minutes: 1
endpoint: tcp://127.0.0.1:1234
timeout-minutes: 10
- name: Download artifacts
uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -253,8 +253,8 @@ jobs:
uses: docker/setup-buildx-action@v3
with:
driver: remote
endpoint: tcp://localhost:1234
timeout-minutes: 1
endpoint: tcp://127.0.0.1:1234
timeout-minutes: 10
- name: Download artifacts
uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -306,8 +306,8 @@ jobs:
uses: docker/setup-buildx-action@v3
with:
driver: remote
endpoint: tcp://localhost:1234
timeout-minutes: 1
endpoint: tcp://127.0.0.1:1234
timeout-minutes: 10
- name: Download artifacts
uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -359,8 +359,8 @@ jobs:
uses: docker/setup-buildx-action@v3
with:
driver: remote
endpoint: tcp://localhost:1234
timeout-minutes: 1
endpoint: tcp://127.0.0.1:1234
timeout-minutes: 10
- name: Download artifacts
uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -412,8 +412,8 @@ jobs:
uses: docker/setup-buildx-action@v3
with:
driver: remote
endpoint: tcp://localhost:1234
timeout-minutes: 1
endpoint: tcp://127.0.0.1:1234
timeout-minutes: 10
- name: Download artifacts
uses: actions/download-artifact@v4
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e-backups-cron.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-02-28T11:30:58Z by kres latest.
# Generated on 2024-03-13T17:28:42Z by kres latest.

name: e2e-backups-cron
concurrency:
Expand Down Expand Up @@ -33,8 +33,8 @@ jobs:
uses: docker/setup-buildx-action@v3
with:
driver: remote
endpoint: tcp://localhost:1234
timeout-minutes: 1
endpoint: tcp://127.0.0.1:1234
timeout-minutes: 10
- name: run-integration-test
env:
AUTH0_TEST_PASSWORD: ${{ secrets.AUTH0_TEST_PASSWORD }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e-scaling-cron.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-02-28T11:30:58Z by kres latest.
# Generated on 2024-03-13T17:28:42Z by kres latest.

name: e2e-scaling-cron
concurrency:
Expand Down Expand Up @@ -33,8 +33,8 @@ jobs:
uses: docker/setup-buildx-action@v3
with:
driver: remote
endpoint: tcp://localhost:1234
timeout-minutes: 1
endpoint: tcp://127.0.0.1:1234
timeout-minutes: 10
- name: run-integration-test
env:
AUTH0_TEST_PASSWORD: ${{ secrets.AUTH0_TEST_PASSWORD }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e-short-cron.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-02-28T11:30:58Z by kres latest.
# Generated on 2024-03-13T17:28:42Z by kres latest.

name: e2e-short-cron
concurrency:
Expand Down Expand Up @@ -33,8 +33,8 @@ jobs:
uses: docker/setup-buildx-action@v3
with:
driver: remote
endpoint: tcp://localhost:1234
timeout-minutes: 1
endpoint: tcp://127.0.0.1:1234
timeout-minutes: 10
- name: run-integration-test
env:
AUTH0_TEST_PASSWORD: ${{ secrets.AUTH0_TEST_PASSWORD }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e-templates-cron.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-02-28T11:30:58Z by kres latest.
# Generated on 2024-03-13T17:28:42Z by kres latest.

name: e2e-templates-cron
concurrency:
Expand Down Expand Up @@ -33,8 +33,8 @@ jobs:
uses: docker/setup-buildx-action@v3
with:
driver: remote
endpoint: tcp://localhost:1234
timeout-minutes: 1
endpoint: tcp://127.0.0.1:1234
timeout-minutes: 10
- name: run-integration-test
env:
AUTH0_TEST_PASSWORD: ${{ secrets.AUTH0_TEST_PASSWORD }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e-upgrades-cron.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-02-28T11:30:58Z by kres latest.
# Generated on 2024-03-13T17:28:42Z by kres latest.

name: e2e-upgrades-cron
concurrency:
Expand Down Expand Up @@ -33,8 +33,8 @@ jobs:
uses: docker/setup-buildx-action@v3
with:
driver: remote
endpoint: tcp://localhost:1234
timeout-minutes: 1
endpoint: tcp://127.0.0.1:1234
timeout-minutes: 10
- name: run-integration-test
env:
AUTH0_TEST_PASSWORD: ${{ secrets.AUTH0_TEST_PASSWORD }}
Expand Down
10 changes: 5 additions & 5 deletions .kres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ spec:
versionPackagePath: internal/version
licenseText: |
Copyright (c) 2024 Sidero Labs, Inc.
Use of this software is governed by the Business Source License
included in the LICENSE file.
---
Expand Down Expand Up @@ -332,10 +332,10 @@ spec:
- source: https://raw.githubusercontent.com/googleapis/googleapis/master/google/rpc/status.proto
subdirectory: google/rpc/
genGateway: true
- source: https://raw.githubusercontent.com/siderolabs/talos/03a20da9da5916c63015d355f4b56823778e994f/api/common/common.proto
- source: https://raw.githubusercontent.com/siderolabs/talos/3c8f51d707b897fb34ed3a9f7c32b7cd3e5ee5b0/api/common/common.proto
subdirectory: common/
genGateway: true
- source: https://raw.githubusercontent.com/siderolabs/talos/03a20da9da5916c63015d355f4b56823778e994f/api/machine/machine.proto
- source: https://raw.githubusercontent.com/siderolabs/talos/3c8f51d707b897fb34ed3a9f7c32b7cd3e5ee5b0/api/machine/machine.proto
subdirectory: talos/machine/
genGateway: true
- source: https://raw.githubusercontent.com/cosi-project/specification/c644a4b0fd408ec41bd29193bcdbd1a5b7feead2/proto/v1alpha1/resource.proto
Expand All @@ -346,7 +346,7 @@ kind: js.Build
spec:
licenseText: |
Copyright (c) 2024 Sidero Labs, Inc.
Use of this software is governed by the Business Source License
included in the LICENSE file.
---
Expand Down Expand Up @@ -495,7 +495,7 @@ spec:
header: |
<!--
Copyright (c) 2024 Sidero Labs, Inc.
Use of this software is governed by the Business Source License
included in the LICENSE file.
-->
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-03-08T09:31:20Z by kres latest.
# Generated on 2024-03-13T17:28:42Z by kres latest.

ARG JS_TOOLCHAIN
ARG TOOLCHAIN
Expand All @@ -21,7 +21,7 @@ ENV GOPATH /go
ENV PATH ${PATH}:/usr/local/go/bin

# runs markdownlint
FROM docker.io/node:21.6.2-alpine3.19 AS lint-markdown
FROM docker.io/node:21.7.1-alpine3.19 AS lint-markdown
WORKDIR /src
RUN npm i -g [email protected]
RUN npm i [email protected]
Expand All @@ -47,8 +47,8 @@ ADD client/api/omni/specs/omni.proto /client/api/omni/specs/
ADD client/api/omni/specs/siderolink.proto /client/api/omni/specs/
ADD client/api/omni/specs/system.proto /client/api/omni/specs/
ADD https://raw.githubusercontent.com/googleapis/googleapis/master/google/rpc/status.proto /client/api/google/rpc/
ADD https://raw.githubusercontent.com/siderolabs/talos/03a20da9da5916c63015d355f4b56823778e994f/api/common/common.proto /client/api/common/
ADD https://raw.githubusercontent.com/siderolabs/talos/03a20da9da5916c63015d355f4b56823778e994f/api/machine/machine.proto /client/api/talos/machine/
ADD https://raw.githubusercontent.com/siderolabs/talos/3c8f51d707b897fb34ed3a9f7c32b7cd3e5ee5b0/api/common/common.proto /client/api/common/
ADD https://raw.githubusercontent.com/siderolabs/talos/3c8f51d707b897fb34ed3a9f7c32b7cd3e5ee5b0/api/machine/machine.proto /client/api/talos/machine/
ADD https://raw.githubusercontent.com/cosi-project/specification/c644a4b0fd408ec41bd29193bcdbd1a5b7feead2/proto/v1alpha1/resource.proto /client/api/v1alpha1/

# collects proto specs
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-03-08T09:31:20Z by kres latest.
# Generated on 2024-03-13T17:28:42Z by kres latest.

# common variables

SHA := $(shell git describe --match=none --always --abbrev=8 --dirty)
TAG := $(shell git describe --tag --always --dirty)
TAG := $(shell git describe --tag --always --dirty --match v[0-9]\*)
ABBREV_TAG := $(shell git describe --tags >/dev/null 2>/dev/null && git describe --tag --always --match v[0-9]\* --abbrev=0 || echo 'undefined')
BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
ARTIFACTS := _out
Expand Down Expand Up @@ -69,7 +69,7 @@ COMMON_ARGS += --build-arg=GOLANGCILINT_VERSION="$(GOLANGCILINT_VERSION)"
COMMON_ARGS += --build-arg=GOIMPORTS_VERSION="$(GOIMPORTS_VERSION)"
COMMON_ARGS += --build-arg=GOFUMPT_VERSION="$(GOFUMPT_VERSION)"
COMMON_ARGS += --build-arg=TESTPKGS="$(TESTPKGS)"
JS_TOOLCHAIN ?= docker.io/node:21.6.2-alpine3.19
JS_TOOLCHAIN ?= docker.io/node:21.7.1-alpine3.19
TOOLCHAIN ?= docker.io/golang:1.22-alpine

# extra variables
Expand Down
6 changes: 6 additions & 0 deletions client/api/common/common.proto
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,12 @@ enum ContainerDriver {
CRI = 1;
}

enum ContainerdNamespace {
NS_UNKNOWN = 0;
NS_SYSTEM = 1;
NS_CRI = 2;
}

message URL {
string full_path = 1;
}
Expand Down
2 changes: 1 addition & 1 deletion client/api/common/omni.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 1e4e303

Please sign in to comment.