Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "feat(docs): add generated openapi docs" #8007

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 29 additions & 30 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,27 +125,13 @@ commands:
echo "PR doesn't have label <<parameters.label>> keep running job"
exit 0
executors:
golang-amd64:
golang:
resource_class: xlarge
docker:
- image: "cimg/go:<< pipeline.parameters.go_version >>"
environment:
KUMA_DIR: .
GO_VERSION: << pipeline.parameters.go_version >>
golang-arm64:
resource_class: arm.xlarge
docker:
- image: "cimg/go:<< pipeline.parameters.go_version >>"
environment:
KUMA_DIR: .
GO_VERSION: << pipeline.parameters.go_version >>
vm-xlarge-amd64:
resource_class: xlarge
machine:
image: << pipeline.parameters.ubuntu_image >>
environment:
KUMA_DIR: .
GO_VERSION: << pipeline.parameters.go_version >>
vm-amd64:
resource_class: large
machine:
Expand All @@ -162,24 +148,34 @@ executors:
GO_VERSION: << pipeline.parameters.go_version >>
jobs:
go_cache:
executor: golang-<< parameters.arch >>
executor: << parameters.executor >>
parameters:
arch:
executor:
description: the executor to run on
type: string
default: golang
steps:
- when:
condition: {equal: [vm-amd64, << parameters.executor >>]}
steps:
- install_build_tools:
go_arch: amd64
- when:
condition: {equal: [vm-arm64, << parameters.executor >>]}
steps:
- install_build_tools:
go_arch: arm64
- checkout
- restore_cache:
key: vm-<< parameters.arch >>_go.mod_{{ checksum "go.sum" }}_{{ checksum "mk/dependencies/deps.lock" }}_{{ checksum ".circleci/config.yml" }}
key: << parameters.executor >>_go.mod_{{ checksum "go.sum" }}_{{ checksum "mk/dependencies/deps.lock" }}_{{ checksum ".circleci/config.yml" }}
- run:
command: make dev/tools
- run:
name: "Download Go modules"
command: |
go mod download -x
- save_cache:
key: vm-<< parameters.arch >>_go.mod_{{ checksum "go.sum" }}_{{ checksum "mk/dependencies/deps.lock" }}_{{ checksum ".circleci/config.yml" }}
key: << parameters.executor >>_go.mod_{{ checksum "go.sum" }}_{{ checksum "mk/dependencies/deps.lock" }}_{{ checksum ".circleci/config.yml" }}
paths:
- "/home/circleci/go/pkg/mod"
- "/home/circleci/.kuma-dev"
Expand Down Expand Up @@ -357,16 +353,19 @@ jobs:
name: "Store logs"
path: /tmp/e2e
build:
executor: vm-xlarge-amd64
executor:
name: golang
steps:
- install_build_tools
- checkout
- setup_remote_docker
- run:
command: ssh remote-docker "sudo apt-get update; sudo apt-get install -y qemu-user-static binfmt-support"
- setenv_depending_on_priority:
label: "ci/run-full-matrix"
env: ENABLED_GOARCHES="arm64 amd64" ENABLED_GOOSES="linux darwin"
- restore_cache:
keys:
- build_go.mod_{{ checksum "go.sum" }}_{{ checksum "mk/dependencies/deps.lock" }}_{{ checksum ".circleci/config.yml" }}
- docker_go.mod_{{ checksum "go.sum" }}_{{ checksum "mk/dependencies/deps.lock" }}_{{ checksum ".circleci/config.yml" }}
- run:
command: make dev/tools
- run:
Expand All @@ -382,7 +381,7 @@ jobs:
- run:
command: make -j docker/save
- save_cache:
key: build_go.mod_{{ checksum "go.sum" }}_{{ checksum "mk/dependencies/deps.lock" }}_{{ checksum ".circleci/config.yml" }}
key: docker_go.mod_{{ checksum "go.sum" }}_{{ checksum "mk/dependencies/deps.lock" }}_{{ checksum ".circleci/config.yml" }}
paths:
- "/home/circleci/go/pkg/mod"
- "/home/circleci/.kuma-dev"
Expand Down Expand Up @@ -456,11 +455,11 @@ workflows:
kuma-commit:
jobs:
- go_cache:
name: go_cache-<< matrix.arch >>
name: go_cache-<< matrix.executor >>
matrix:
alias: go_cache
parameters:
arch: [amd64, arm64]
executor: [vm-amd64, vm-arm64]
- build:
name: build
- test:
Expand All @@ -469,7 +468,7 @@ workflows:
alias: test
parameters:
arch: [amd64, arm64]
requires: [build, go_cache-<< matrix.arch >>]
requires: [build, go_cache-vm-<< matrix.arch >>]
- e2e:
name: legacy-k8s:<< matrix.arch >>-<< matrix.k8sVersion >>
matrix:
Expand All @@ -479,7 +478,7 @@ workflows:
arch: [amd64, arm64]
parallelism: 3
target: ""
requires: [build, go_cache-<< matrix.arch >>]
requires: [build, go_cache-vm-<< matrix.arch >>]
- e2e:
name: << matrix.target >>:<< matrix.arch >>-<< matrix.k8sVersion >>
matrix:
Expand All @@ -488,7 +487,7 @@ workflows:
k8sVersion: [<< pipeline.parameters.first_k8s_version >>, << pipeline.parameters.last_k8s_version >>, kind, kindIpv6]
target: [kubernetes, universal, multizone]
arch: [amd64, arm64]
requires: [build, go_cache-<< matrix.arch >>]
requires: [build, go_cache-vm-<< matrix.arch >>]
- e2e:
name: << matrix.target >>:<< matrix.arch >>-<< matrix.k8sVersion >>-delta-kds
matrix:
Expand All @@ -498,7 +497,7 @@ workflows:
target: [multizone]
arch: [amd64]
deltaKDS: [true]
requires: [build, go_cache-amd64]
requires: [build, go_cache-vm-amd64]
- e2e:
name: << matrix.target >>:<< matrix.arch >>-<< matrix.k8sVersion >>-calico
matrix:
Expand All @@ -508,7 +507,7 @@ workflows:
target: [multizone]
arch: [amd64]
cniNetworkPlugin: [calico]
requires: [build, go_cache-amd64]
requires: [build, go_cache-vm-amd64]
- container-structure:
name: container-structure
requires: [build]
Expand Down
3 changes: 1 addition & 2 deletions api/openapi/specs/global_insight.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ paths:
/global-insight:
get:
summary: Get Global Insight
tags: ["GlobalInsight"]
responses:
'200':
$ref: '#/components/responses/GlobalInsightResponse'
Expand Down Expand Up @@ -233,4 +232,4 @@ components:
policies:
total: 100
meshes:
total: 3
total: 3
Loading
Loading