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

add HTTP2 support for http.Client and Vald HTTP Server #2572

Merged
merged 1 commit into from
Aug 7, 2024
Merged
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
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ assignees: ""

<!--- Please change the versions below along with your environment -->

- Vald Version: v1.7.12
- Go Version: v1.22.5
- Vald Version: v1.7.13
- Go Version: v1.22.6
- Rust Version: v1.80.0
- Docker Version: v27.1.1
- Kubernetes Version: v1.30.3
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/security_issue_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ assignees: ""

<!--- Please change the versions below along with your environment -->

- Vald Version: v1.7.12
- Go Version: v1.22.5
- Vald Version: v1.7.13
- Go Version: v1.22.6
- Rust Version: v1.80.0
- Docker Version: v27.1.1
- Kubernetes Version: v1.30.3
Expand Down
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
### Versions

<!--- Please change the versions below along with your environment -->
- Vald Version: v1.7.12
- Go Version: v1.22.5
- Vald Version: v1.7.13
- Go Version: v1.22.6
- Rust Version: v1.80.0
- Docker Version: v27.1.1
- Kubernetes Version: v1.30.3
Expand Down
48 changes: 48 additions & 0 deletions .github/workflows/dockers-buildkit-syft-scanner-image.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
#
# Copyright (C) 2019-2024 vdaas.org vald team <vald@vdaas.org>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# You may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
name: "Build docker image: buildkit-syft-scanner"
on:
schedule:
- cron: "0 * * * *"
push:
branches:
- "main"
- "release/v*.*"
- "!release/v*.*.*"
tags:
- "*.*.*"
- "v*.*.*"
- "*.*.*-*"
- "v*.*.*-*"
pull_request:
paths:
- ".github/actions/docker-build/action.yaml"
- ".github/workflows/_docker-image.yaml"
- ".github/workflows/dockers-buildkit-syft-scanner-image.yml"
- "dockers/buildkit/syft/scanner/Dockerfile"
pull_request_target:
paths:
- ".github/actions/docker-build/action.yaml"
- ".github/workflows/_docker-image.yaml"
- ".github/workflows/dockers-buildkit-syft-scanner-image.yml"
- "dockers/buildkit/syft/scanner/Dockerfile"
jobs:
build:
uses: ./.github/workflows/_docker-image.yaml
with:
target: buildkit-syft-scanner
platforms: linux/amd64,linux/arm64
secrets: inherit
1 change: 1 addition & 0 deletions .github/workflows/helm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
needs: [detect-ci-container]
container:
image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }}
options: "--add-host host.docker.internal:host-gateway"
steps:
- uses: actions/checkout@v4
with:
Expand Down
9 changes: 8 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ BENCHMARK_OPERATOR_IMAGE = $(NAME)-benchmark-operator
BINFMT_IMAGE = $(NAME)-binfmt
BUILDBASE_IMAGE = $(NAME)-buildbase
BUILDKIT_IMAGE = $(NAME)-buildkit
BUILDKIT_SYFT_SCANNER_IMAGE = $(NAME)-buildkit-syft-scanner
CI_CONTAINER_IMAGE = $(NAME)-ci-container
DEV_CONTAINER_IMAGE = $(NAME)-dev-container
DISCOVERER_IMAGE = $(NAME)-discoverer-k8s
Expand Down Expand Up @@ -478,7 +479,13 @@ format: \
format/go \
format/json \
format/md \
format/yaml
format/yaml \
remove/empty/file

.PHONY: remove/empty/file
## removes empty file such as just includes \r \n space tab
remove/empty/file:
find $(ROOTDIR)/ -type f ! -name ".gitkeep" -print0 | xargs -0 -P$(CORES) -n 1 sh -c 'grep -qvE "^[ \t\n]*$$" "$$1" || rm "$$1"' sh

.PHONY: format/go
## run golines, gofumpt, goimports for all go files
Expand Down
14 changes: 13 additions & 1 deletion Makefile.d/docker.mk
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ docker/build: \
docker/build/binfmt \
docker/build/buildbase \
docker/build/buildkit \
docker/build/buildkit-syft-scanner \
docker/build/ci-container \
docker/build/dev-container \
docker/build/discoverer-k8s \
Expand Down Expand Up @@ -67,7 +68,7 @@ ifeq ($(REMOTE),true)
--build-arg GO_VERSION=$(GO_VERSION) \
--build-arg RUST_VERSION=$(RUST_VERSION) \
--build-arg MAINTAINER=$(MAINTAINER) \
--sbom=true \
--attest type=sbom,generator=docker/buildkit-syft-scanner:edge \
--provenance=mode=max \
-t $(CRORG)/$(IMAGE):$(TAG) \
-t $(GHCRORG)/$(IMAGE):$(TAG) \
Expand Down Expand Up @@ -219,6 +220,17 @@ docker/build/binfmt:
IMAGE=$(BINFMT_IMAGE) \
docker/build/image

PHONY: docker/name/buildkit-syft-scanner
docker/name/buildkit-syft-scanner:
@echo "$(ORG)/$(BUILDKIT_SYFT_SCANNER_IMAGE)"

.PHONY: docker/build/buildkit-syft-scanner
## build buildkit-syft-scanner image
docker/build/buildkit-syft-scanner:
@make DOCKERFILE="$(ROOTDIR)/dockers/buildkit/syft/scanner/Dockerfile" \
IMAGE=$(BUILDKIT_SYFT_SCANNER_IMAGE) \
docker/build/image

.PHONY: docker/name/ci-container
docker/name/ci-container:
@echo "$(ORG)/$(CI_CONTAINER_IMAGE)"
Expand Down
Empty file.
Empty file.
Empty file.
1 change: 0 additions & 1 deletion assets/test/templates/option/inline.tmpl

This file was deleted.

1 change: 0 additions & 1 deletion assets/test/templates/option/inputs.tmpl

This file was deleted.

1 change: 0 additions & 1 deletion assets/test/templates/option/message.tmpl

This file was deleted.

Loading
Loading