Skip to content

Commit

Permalink
Merge branch 'main' into feature/bucket-inspect-output
Browse files Browse the repository at this point in the history
  • Loading branch information
someshkoli committed Nov 8, 2021
2 parents 639c8cc + 995f846 commit 2d18563
Show file tree
Hide file tree
Showing 343 changed files with 56,807 additions and 18,818 deletions.
6 changes: 3 additions & 3 deletions .bingo/Variables.mk
Expand Up @@ -89,11 +89,11 @@ $(JSONNETFMT): $(BINGO_DIR)/jsonnetfmt.mod
@echo "(re)installing $(GOBIN)/jsonnetfmt-v0.17.0"
@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=jsonnetfmt.mod -o=$(GOBIN)/jsonnetfmt-v0.17.0 "github.com/google/go-jsonnet/cmd/jsonnetfmt"

MDOX := $(GOBIN)/mdox-v0.2.2-0.20210617084122-22b44c491197
MDOX := $(GOBIN)/mdox-v0.9.0
$(MDOX): $(BINGO_DIR)/mdox.mod
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
@echo "(re)installing $(GOBIN)/mdox-v0.2.2-0.20210617084122-22b44c491197"
@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=mdox.mod -o=$(GOBIN)/mdox-v0.2.2-0.20210617084122-22b44c491197 "github.com/bwplotka/mdox"
@echo "(re)installing $(GOBIN)/mdox-v0.9.0"
@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=mdox.mod -o=$(GOBIN)/mdox-v0.9.0 "github.com/bwplotka/mdox"

MINIO := $(GOBIN)/minio-v0.0.0-20200527010300-cccf2de129da
$(MINIO): $(BINGO_DIR)/minio.mod
Expand Down
4 changes: 1 addition & 3 deletions .bingo/mdox.mod
Expand Up @@ -2,6 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

go 1.16

replace github.com/Kunde21/markdownfmt/v2 => github.com/bwplotka/markdownfmt/v2 v2.0.0-20210616121647-559e77044d46

require github.com/bwplotka/mdox v0.2.2-0.20210617084122-22b44c491197
require github.com/bwplotka/mdox v0.9.0
1 change: 1 addition & 0 deletions .bingo/prometheus.mod
Expand Up @@ -9,6 +9,7 @@ replace (
github.com/cockroachdb/cmux => github.com/cockroachdb/cmux v0.0.0-20170110192607-30d10be49292
github.com/cockroachdb/cockroach => github.com/cockroachdb/cockroach v0.0.0-20170608034007-84bc9597164f
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.2.3-0.20180520015035-48a0ecefe2e4
github.com/gophercloud/gophercloud => github.com/gophercloud/gophercloud v0.18.0
github.com/miekg/dns => github.com/miekg/dns v1.0.4
github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.0-pre1.0.20180607123607-faf4ec335fe0
github.com/prometheus/common => github.com/prometheus/common v0.0.0-20180518154759-7600349dcfe1
Expand Down
2 changes: 1 addition & 1 deletion .bingo/variables.env
Expand Up @@ -32,7 +32,7 @@ JSONNET="${GOBIN}/jsonnet-v0.17.0"

JSONNETFMT="${GOBIN}/jsonnetfmt-v0.17.0"

MDOX="${GOBIN}/mdox-v0.2.2-0.20210617084122-22b44c491197"
MDOX="${GOBIN}/mdox-v0.9.0"

MINIO="${GOBIN}/minio-v0.0.0-20200527010300-cccf2de129da"

Expand Down
4 changes: 2 additions & 2 deletions .circleci/config.yml
Expand Up @@ -11,7 +11,7 @@ executors:
golang-test:
docker:
- image: cimg/go:1.16-node
- image: beaukode/docker-swift-onlyone-authv2-keystone
- image: quay.io/thanos/docker-swift-onlyone-authv2-keystone:v0.1

jobs:
test:
Expand All @@ -35,7 +35,7 @@ jobs:
- run:
name: "Run unit tests."
environment:
THANOS_TEST_OBJSTORE_SKIP: AZURE,COS,ALIYUNOSS
THANOS_TEST_OBJSTORE_SKIP: AZURE,COS,ALIYUNOSS,BOS
# Variables for Swift testing.
OS_AUTH_URL: http://127.0.0.1:5000/v2.0
OS_PASSWORD: s3cr3t
Expand Down
17 changes: 6 additions & 11 deletions .github/workflows/react.yml
Expand Up @@ -15,19 +15,14 @@ jobs:
name: React UI test on Node ${{ matrix.node }}
steps:
- uses: actions/checkout@v2
- name: Setup node
uses: actions/setup-node@v1
- name: install nodejs
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node }}
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"

- uses: actions/cache@v1
id: yarn-cache
- uses: actions/cache@v2
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('pkg/ui/react-app/yarn.lock') }}
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-yarn-
${{ runner.os }}-node-
- run: make react-app-test
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -12,7 +12,7 @@ kube/.minikube

# Ignore e2e working dirs.
data/
test/e2e/e2e_integration_test*
test/e2e/e2e_*

# Ignore promu artifacts.
/.build
Expand Down
1 change: 1 addition & 0 deletions .lift/config.toml
@@ -0,0 +1 @@
ignoreRules = [ "Severe OSS Vulnerability", "Critical OSS Vulnerability" ]
65 changes: 65 additions & 0 deletions .mdox.prev-release.yaml
@@ -0,0 +1,65 @@
version: 1

inputDir: "$(OUTPUT_CONTENT_DIR)/$(tags)-git-docs"
outputDir: "$(OUTPUT_CONTENT_DIR)/$(tags)"
extraInputGlobs:
- "CHANGELOG.md"
- "SECURITY.md"
- "MAINTAINERS.md"
- "CONTRIBUTING.md"
- "CODE_OF_CONDUCT.md"

gitIgnored: true
localLinksStyle:
hugo:
indexFileName: "_index.md"

transformations:

- glob: "../../../CHANGELOG.md"
path: /thanos/CHANGELOG.md
frontMatter:
template: |
title: Changelog
type: docs
menu: thanos
lastmod: "{{ .Origin.LastMod }}"
- glob: "../../../MAINTAINERS.md"
path: /thanos/MAINTAINERS.md
frontMatter:
template: |
title: Maintainers
type: docs
menu: thanos
lastmod: "{{ .Origin.LastMod }}"
- glob: "../../../SECURITY.md"
path: /thanos/SECURITY.md
frontMatter:
template: |
title: Security
type: docs
menu: thanos
lastmod: "{{ .Origin.LastMod }}"
- glob: "../../../CODE_OF_CONDUCT.md"
path: /contributing/CODE_OF_CONDUCT.md
frontMatter:
template: |
title: Code of Conduct
type: docs
menu: contributing
lastmod: "{{ .Origin.LastMod }}"
- glob: "../../../CONTRIBUTING.md"
path: /contributing/CONTRIBUTING.md
frontMatter:
template: |
title: Contributing
type: docs
menu: contributing
lastmod: "{{ .Origin.LastMod }}"
- glob: "*.md"
path: /thanos/*
22 changes: 22 additions & 0 deletions .mdox.validate.yaml
@@ -0,0 +1,22 @@
version: 1

validators:
# Validators to skip checking PR/issue links of Thanos, Prometheus and Cortex.
- regex: '(^http[s]?:\/\/)(www\.)?(github\.com\/)thanos-io\/thanos(\/pull\/|\/issues\/)'
type: 'githubPullsIssues'
- regex: '(^http[s]?:\/\/)(www\.)?(github\.com\/)prometheus\/prometheus(\/pull\/|\/issues\/)'
type: 'githubPullsIssues'
- regex: '(^http[s]?:\/\/)(www\.)?(github\.com\/)cortexproject\/cortex(\/pull\/|\/issues\/)'
type: 'githubPullsIssues'
# Ignore Thanos release links.
- regex: '(^http[s]?:\/\/)(www\.)?(github\.com\/)thanos-io\/thanos(\/releases\/)'
type: 'ignore'
# Causes http stream errors with statuscode 0 sometimes. But is safe to skip.
- regex: 'slack\.cncf\.io'
type: 'ignore'
# 301 errors even when curl-ed.
- regex: 'envoyproxy\.io'
type: 'ignore'
# couldn't reach even when curl-ed.
- regex: 'cloud\.baidu\.com'
type: 'ignore'
146 changes: 146 additions & 0 deletions .mdox.yaml
@@ -0,0 +1,146 @@
version: 1

inputDir: "$(INPUT_DIR)"
outputDir: "$(OUTPUT_DIR)"
extraInputGlobs:
- "CHANGELOG.md"
- "SECURITY.md"
- "MAINTAINERS.md"
- "CONTRIBUTING.md"
- "CODE_OF_CONDUCT.md"

gitIgnored: true
localLinksStyle:
hugo:
indexFileName: "_index.md"

transformations:

- glob: "$(EXTERNAL_GLOB_REL)CHANGELOG.md"
path: /thanos/CHANGELOG.md
frontMatter:
template: |
title: Changelog
type: docs
menu: thanos
lastmod: "{{ .Origin.LastMod }}"
backMatter: &docBackMatter
template: |
Found a typo, inconsistency or missing information in our docs?
Help us to improve [Thanos](https://thanos.io) documentation by proposing a fix [on GitHub here](https://github.com/thanos-io/thanos/edit/main/{{ .Origin.Path }}) :heart:
- glob: "$(EXTERNAL_GLOB_REL)MAINTAINERS.md"
path: /thanos/MAINTAINERS.md
frontMatter:
template: |
title: Maintainers
type: docs
menu: thanos
lastmod: "{{ .Origin.LastMod }}"
backMatter: *docBackMatter

- glob: "$(EXTERNAL_GLOB_REL)SECURITY.md"
path: /thanos/SECURITY.md
frontMatter:
template: |
title: Security
type: docs
menu: thanos
lastmod: "{{ .Origin.LastMod }}"
backMatter: *docBackMatter

- glob: "$(EXTERNAL_GLOB_REL)CODE_OF_CONDUCT.md"
path: /contributing/CODE_OF_CONDUCT.md
frontMatter:
template: |
title: Code of Conduct
type: docs
menu: contributing
lastmod: "{{ .Origin.LastMod }}"
backMatter: *docBackMatter

- glob: "$(EXTERNAL_GLOB_REL)CONTRIBUTING.md"
path: /contributing/CONTRIBUTING.md
frontMatter:
template: |
title: Contributing
type: docs
menu: contributing
lastmod: "{{ .Origin.LastMod }}"
backMatter: *docBackMatter

- glob: "**/README.md"
path: _index.md
frontMatter: &justTitleFrontMatter
template: |
title: "{{ .Origin.FirstHeader }}"
backMatter: *docBackMatter

- glob: "getting-started.md"
path: /thanos/getting-started.md
popHeader: false
frontMatter: &weightOneFrontMatter
template: |
type: docs
title: "{{ .Origin.FirstHeader }}"
menu: thanos
weight: 1
lastmod: "{{ .Origin.LastMod }}"
backMatter: *docBackMatter

- glob: "quick-tutorial.md"
path: /thanos/quick-tutorial.md
popHeader: false
frontMatter: *weightOneFrontMatter
backMatter: *docBackMatter

- glob: "proposals-*/README.md"
path: /proposals-*/_index.md
frontMatter: *justTitleFrontMatter
backMatter: *docBackMatter

- glob: "README.md"
path: /thanos/_index.md
frontMatter: *justTitleFrontMatter
backMatter: *docBackMatter

- glob: "*.md"
path: /thanos/*
popHeader: false
frontMatter:
template: |
type: docs
title: "{{ .Origin.FirstHeader }}"
menu: thanos
lastmod: "{{ .Origin.LastMod }}"
backMatter: *docBackMatter

- glob: "operating/*.md"
path: /operating/*
frontMatter:
template: |
type: docs
title: "{{ .Origin.FirstHeader }}"
menu: operating
lastmod: "{{ .Origin.LastMod }}"
backMatter: *docBackMatter

- glob: "contributing/*.md"
path: /contributing/*
frontMatter:
template: |
type: docs
title: "{{ .Origin.FirstHeader }}"
menu: contributing
lastmod: "{{ .Origin.LastMod }}"
backMatter: *docBackMatter

- glob: "components/*.md"
path: /components/*
frontMatter:
template: |
type: docs
title: "{{ .Origin.FirstHeader }}"
menu: components
lastmod: "{{ .Origin.LastMod }}"
backMatter: *docBackMatter

0 comments on commit 2d18563

Please sign in to comment.