Skip to content

Upgrade istio dependencies to 1.18.1 #385

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.

Sign up for GitHub

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

Merged
merged 9 commits into from
Aug 20, 2023
Merged

Upgrade istio dependencies to 1.18.1 #385

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7d57442
upgrade istio dependencies to 1.18.1
zhaohuabing Aug 18, 2023
f22d38c
fix goimports
zhaohuabing Aug 18, 2023
ae491b0
fix lint
zhaohuabing Aug 18, 2023
b45dc56
fix test
zhaohuabing Aug 18, 2023
20935e4
address comments
zhaohuabing Aug 18, 2023
b2fd61f
fix lint
zhaohuabing Aug 18, 2023
f88ae6d
fix test
zhaohuabing Aug 19, 2023
97c8292
remove istio-1.18.2 directory
zhaohuabing Aug 19, 2023
2b8f687
fix lint
zhaohuabing Aug 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 5 additions & 5 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v1
with:
go-version: 1.19
go-version: '1.20'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is recommended to merge the commit, there are too many commit id.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All the commits will be squashed into one when this PR is merged into the master.

- name: Build
run: go build -race ./internal/...
- name: Test
Expand All @@ -54,9 +54,9 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v1
with:
go-version: 1.19
go-version: '1.20'
- name: golangci-lint
uses: golangci/golangci-lint-action@v3.1.0
uses: golangci/golangci-lint-action@v3.7.0
with:
args: --timeout=10m --tests="false"
version: v1.47.0
Expand All @@ -69,7 +69,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: 1.19
go-version: '1.20'
- name: Install dependencies
run: |
go version
Expand All @@ -83,7 +83,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v1
with:
go-version: 1.19
go-version: '1.20'
- run: go mod tidy
- name: Check for changes in go.mod or go.sum
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e-metaprotocol-gateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
- "**/*.md"

env:
ISTIO_VERSION: 1.18.2
ISTIO_VERSION: 1.18.1
ISTIO_NAMESPACE: istio-system
SCRIPTS_DIR: test/e2e/scripts
COMMON_DIR: test/e2e/common
Expand All @@ -36,7 +36,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: 1.19
go-version: '1.20'
- name: Install dependencies
run: |
go version
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/e2e-metaprotocol.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
- "**/*.md"

env:
ISTIO_VERSION: 1.18.2
ISTIO_VERSION: 1.18.1
ISTIO_NAMESPACE: istio-system
SCRIPTS_DIR: test/e2e/scripts
COMMON_DIR: test/e2e/common
Expand All @@ -36,7 +36,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: 1.19
go-version: '1.20'
- name: Install dependencies
run: |
go version
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: 1.19
go-version: '1.20'
- name: Install dependencies
run: |
go version
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: 1.19
go-version: '1.20'
- name: Install dependencies
run: |
go version
Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: 1.19
go-version: '1.20'
- name: Install dependencies
run: |
go version
Expand Down Expand Up @@ -152,7 +152,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: 1.19
go-version: '1.20'
- name: Install dependencies
run: |
go version
Expand Down Expand Up @@ -181,7 +181,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: 1.19
go-version: '1.20'
- name: Install dependencies
run: |
go version
Expand Down Expand Up @@ -210,7 +210,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: 1.19
go-version: '1.20'
- name: Install dependencies
run: |
go version
Expand Down Expand Up @@ -239,7 +239,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: 1.19
go-version: '1.20'
- name: Install dependencies
run: |
go version
Expand Down Expand Up @@ -268,7 +268,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: 1.19
go-version: '1.20'
- name: Install dependencies
run: |
go version
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e-redis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
- "**/*.md"

env:
ISTIO_VERSION: 1.18.2
ISTIO_VERSION: 1.18.1
ISTIO_NAMESPACE: istio-system
SCRIPTS_DIR: test/e2e/scripts
COMMON_DIR: test/e2e/common
Expand All @@ -36,7 +36,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: 1.19
go-version: '1.20'
- name: Install dependencies
run: |
go install golang.org/x/tools/cmd/goimports@latest
Expand Down
1 change: 0 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ demo-brpc:
uninstall-demo-brpc:
bash demo/uninstall-demo.sh brpc
test: style-check
$(GOMOD) tidy
$(GOTEST) -race `go list ./internal/... | grep -v e2e`
build: test
CGO_ENABLED=0 GOOS=$(IMAGE_OS) GOARCH=$(IMAGE_ARCH) $(GOBUILD) -o $(OUT)/$(IMAGE_ARCH)/$(IMAGE_OS)/$(IMAGE_NAME) $(MAIN_PATH)
Expand Down
2 changes: 1 addition & 1 deletion demo/install-demo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ DEMO=$1
SCRIPTS_DIR=$BASEDIR/test/e2e/scripts

if [ -z "$AERAKI_TAG" ]; then
export AERAKI_TAG="1.4.0"
export AERAKI_TAG="1.4.1"
fi
bash ${SCRIPTS_DIR}/istio.sh
bash ${SCRIPTS_DIR}/addons.sh
Expand Down
6 changes: 3 additions & 3 deletions demo/metaprotocol-brpc/brpc-sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
metadata:
annotations:
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
labels:
app: brpc-echo-server
version: v1
Expand Down Expand Up @@ -57,7 +57,7 @@ spec:
metadata:
annotations:
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
labels:
app: brpc-echo-server
version: v2
Expand Down Expand Up @@ -86,7 +86,7 @@ spec:
metadata:
annotations:
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
labels:
app: brpc-echo-client
spec:
Expand Down
8 changes: 4 additions & 4 deletions demo/metaprotocol-dubbo-app-level/dubbo-sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ spec:
metadata:
annotations:
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
labels:
app: dubbo-sample-provider
version: v1
Expand Down Expand Up @@ -76,7 +76,7 @@ spec:
metadata:
annotations:
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
labels:
app: dubbo-sample-provider
version: v2
Expand Down Expand Up @@ -112,7 +112,7 @@ spec:
metadata:
annotations:
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
labels:
app: dubbo-sample-second-provider
version: v2
Expand All @@ -139,7 +139,7 @@ spec:
metadata:
annotations:
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
labels:
app: dubbo-sample-consumer
spec:
Expand Down
8 changes: 4 additions & 4 deletions demo/metaprotocol-dubbo/dubbo-sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ spec:
metadata:
annotations:
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
labels:
app: dubbo-sample-provider
version: v1
Expand Down Expand Up @@ -76,7 +76,7 @@ spec:
metadata:
annotations:
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
labels:
app: dubbo-sample-provider
version: v2
Expand Down Expand Up @@ -112,7 +112,7 @@ spec:
metadata:
annotations:
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
labels:
app: dubbo-sample-second-provider
version: v2
Expand All @@ -139,7 +139,7 @@ spec:
metadata:
annotations:
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
labels:
app: dubbo-sample-consumer
spec:
Expand Down
2 changes: 1 addition & 1 deletion demo/metaprotocol-thrift/outlier-detection/outlier-detection.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
metadata:
annotations:
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
sidecar.istio.io/rewriteAppHTTPProbers: "false"
labels:
app: thrift-sample-server
Expand Down
6 changes: 3 additions & 3 deletions demo/metaprotocol-thrift/thrift-sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
metadata:
annotations:
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
sidecar.istio.io/rewriteAppHTTPProbers: "false"
labels:
app: thrift-sample-server
Expand All @@ -55,7 +55,7 @@ spec:
metadata:
annotations:
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
sidecar.istio.io/rewriteAppHTTPProbers: "false"
labels:
app: thrift-sample-server
Expand All @@ -82,7 +82,7 @@ spec:
metadata:
annotations:
sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy-debug:1.4.0
sidecar.istio.io/proxyImage: ghcr.io/aeraki-mesh/meta-protocol-proxy:1.4.1
sidecar.istio.io/rewriteAppHTTPProbers: "false"
labels:
app: thrift-sample-client
Expand Down
4 changes: 4 additions & 0 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@

FROM alpine:3.17

LABEL org.opencontainers.image.source="https://github.com/aeraki-mesh/aeraki"
LABEL org.opencontainers.image.authors="[email protected]"
LABEL org.opencontainers.image.documentation="https://aeraki.net"

ARG AERAKI_ROOT_BIN_DIR
ARG ARCH
ARG OS
Expand Down
Loading