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

Istio 1.8 support #210

Merged
merged 4 commits into from
Oct 27, 2020
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
6 changes: 5 additions & 1 deletion .github/workflows/pull_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ jobs:
istio-version: [
'1.5.1',
'1.6.6',
'1.7.1'
'1.7.1',
'1.8.0-alpha.0'
]
include:
- istio-version: '1.5.1'
Expand All @@ -115,6 +116,9 @@ jobs:
- istio-version: '1.7.1'
istio-binary: 'https://github.com/istio/istio/releases/download/1.7.1/istio-1.7.1-linux-amd64.tar.gz'
istio-filter-image: 'webassemblyhub.io/sodman/istio-1-7:v0.3'
- istio-version: '1.8.0-alpha.0'
istio-binary: 'https://github.com/istio/istio/releases/download/1.8.0-alpha.0/istio-1.8.0-alpha.0-linux-amd64.tar.gz'
istio-filter-image: 'webassemblyhub.io/sodman/istio-1-7:v0.3'
steps:
- uses: actions/checkout@v2
- name: Set up Go 1.15
Expand Down
5 changes: 5 additions & 0 deletions tools/wasme/changelog/v0.0.29/istio-1-8.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
changelog:
- type: NEW_FEATURE
description: >
Add support for cpp, assemblyscript, rust and tinygo filters in Istio 1.8.x
issueLink: https://github.com/solo-io/wasm/issues/209
2 changes: 1 addition & 1 deletion tools/wasme/cli/ci/setup-kind-istio.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ kubectl apply -f https://raw.githubusercontent.com/solo-io/gloo/master/example/p
if [[ "$ISTIO_VERSION" == *"1.5"* ]]; then
istioctl manifest apply --set profile=minimal
else
istioctl install --set profile=minimal
istioctl install --set profile=minimal --skip-confirmation
fi

kubectl -n istio-system rollout status deployment istiod
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ wasme deploys a server-side cache component which runs in cluster and pulls filt

If --name is not provided, all deployments in the targeted namespace will attach the filter.

Note: currently only Istio 1.5.x, 1.6.x and 1.7.x are supported.
Note: currently only Istio 1.5.x - 1.8.x are supported.


```
Expand Down
2 changes: 1 addition & 1 deletion tools/wasme/cli/docs/content/reference/cli/wasme_init.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ wasme init DEST_DIRECTORY [--language=FILTER_LANGUAGE] [--platform=TARGET_PLATFO
-h, --help help for init
--language string The programming language with which to create the filter. Supported languages are: [cpp rust assemblyscript tinygo]
--platform string The name of the target platform against which to build. Supported platforms are: [gloo istio]
--platform-version string The version of the target platform against which to build. Supported Istio versions are: [1.5.x 1.6.x]. Supported Gloo versions are: [1.3.x 1.5.x 1.6.x]
--platform-version string The version of the target platform against which to build. Supported Istio versions are: [1.5.x 1.6.x 1.7.x 1.8.x]. Supported Gloo versions are: [1.3.x 1.5.x 1.6.x]
```

### Options inherited from parent commands
Expand Down
6 changes: 6 additions & 0 deletions tools/wasme/cli/pkg/abi/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const (
Version15x = "1.5.x"
Version16x = "1.6.x"
Version17x = "1.7.x"
Version18x = "1.8.x"
)

// an abi provider
Expand Down Expand Up @@ -103,6 +104,10 @@ var (
Name: PlatformNameIstio,
Version: Version17x,
}
Istio18 = Platform{
Name: PlatformNameIstio,
Version: Version18x,
}
Gloo13 = Platform{
Name: PlatformNameGloo,
Version: Version13x,
Expand Down Expand Up @@ -154,6 +159,7 @@ var (
},
Version_4689a30309abf31aee9ae36e73d34b1bb182685f: {
Istio17,
Istio18,
},
Version_0_2_1: {
Gloo16,
Expand Down
4 changes: 3 additions & 1 deletion tools/wasme/cli/pkg/abi/version_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@ var _ = Describe("ABI Version Registry", func() {
err = DefaultRegistry.ValidateIstioVersion([]string{Version_097b7f2e4cc1fb490cc1943d0d633655ac3c522f.Name}, "1.6.0")
Expect(err).NotTo(HaveOccurred())

// This version should work with Istio 1.7.x but not 1.6.x:
// This version should work with Istio 1.7.x & 1.8.x but not 1.6.x:
err = DefaultRegistry.ValidateIstioVersion([]string{Version_4689a30309abf31aee9ae36e73d34b1bb182685f.Name}, "1.7.0")
Expect(err).NotTo(HaveOccurred())
err = DefaultRegistry.ValidateIstioVersion([]string{Version_4689a30309abf31aee9ae36e73d34b1bb182685f.Name}, "1.8.0")
Expect(err).NotTo(HaveOccurred())
err = DefaultRegistry.ValidateIstioVersion([]string{Version_4689a30309abf31aee9ae36e73d34b1bb182685f.Name}, "1.6.0")
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(ContainSubstring("no versions of istio found which support abi versions"))
Expand Down
2 changes: 1 addition & 1 deletion tools/wasme/cli/pkg/cmd/deploy/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ wasme deploys a server-side cache component which runs in cluster and pulls filt

If --name is not provided, all deployments in the targeted namespace will attach the filter.

Note: currently only Istio 1.5.x, 1.6.x and 1.7.x are supported.
Note: currently only Istio 1.5.x - 1.8.x are supported.
`
cmd := makeDeployCommand(ctx, opts,
Provider_Istio,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,19 +137,19 @@ var assemblyscriptTarBytes []byte = []byte{
0xf4, 0x2b, 0x4d, 0xb8, 0xf4, 0xe7, 0x62, 0x4f, 0xf5, 0x72, 0x73, 0x1a,
0xf1, 0x45, 0xad, 0xe8, 0x82, 0x9e, 0x61, 0x63, 0xad, 0xaa, 0x67, 0x8d,
0xdc, 0x54, 0xc5, 0x66, 0xfb, 0xf8, 0x67, 0xd1, 0xf4, 0x98, 0xf0, 0x6e,
0x7f, 0xfe, 0xfd, 0xc4, 0xff, 0x7f, 0x86, 0x99, 0x7c, 0xff, 0x2b, 0x14,
0x35, 0xa3, 0xa8, 0x15, 0xa2, 0xf3, 0x7f, 0xb1, 0xa8, 0x6f, 0xea, 0xff,
0x47, 0x50, 0x5c, 0xff, 0xc5, 0x24, 0x88, 0xd3, 0x1f, 0xfb, 0x43, 0x3a,
0xb9, 0x4b, 0x3e, 0xf6, 0xc5, 0xf9, 0x0f, 0x2d, 0x92, 0x9e, 0xff, 0xf9,
0xfc, 0xbf, 0xbd, 0xa1, 0x2a, 0x17, 0x4c, 0xcd, 0xd2, 0x6d, 0x4d, 0x2b,
0x14, 0x1c, 0xc7, 0xb1, 0xb4, 0x82, 0x6d, 0x23, 0x5c, 0xd6, 0xad, 0x5d,
0x43, 0x37, 0x1d, 0x03, 0x1b, 0xbb, 0x4e, 0xc9, 0x30, 0xca, 0x16, 0x2c,
0x4e, 0x2b, 0xce, 0x50, 0x95, 0xd5, 0x72, 0xc9, 0x2a, 0x39, 0x3a, 0x36,
0x6d, 0x5b, 0x73, 0x2c, 0xb3, 0xac, 0xda, 0xb6, 0x56, 0x36, 0x0d, 0xa4,
0xa2, 0xa2, 0x61, 0x14, 0x0b, 0x05, 0x68, 0x1b, 0x76, 0x41, 0xd7, 0x9d,
0xf9, 0x14, 0x45, 0x4f, 0xea, 0xc9, 0xf7, 0xd8, 0x94, 0x24, 0x40, 0xe7,
0x15, 0x88, 0x51, 0x2a, 0x8e, 0xd1, 0xdc, 0x2c, 0xb0, 0xf4, 0x35, 0x21,
0x7e, 0xf5, 0x3d, 0x29, 0x46, 0x9f, 0x0d, 0xf1, 0x86, 0x36, 0xb4, 0xa1,
0x0d, 0xfd, 0x4f, 0xd2, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x74, 0x9b,
0x34, 0x9a, 0x00, 0x28, 0x00, 0x00,
0x7f, 0xfe, 0xfd, 0xc4, 0xff, 0x7f, 0x86, 0x99, 0x7c, 0xff, 0x2b, 0xaa,
0x85, 0x52, 0xa9, 0xa0, 0x46, 0xe7, 0xff, 0x62, 0x71, 0x73, 0xfe, 0xff,
0x10, 0x8a, 0xeb, 0xbf, 0x98, 0x04, 0x71, 0xfa, 0x63, 0x7f, 0x48, 0x27,
0x77, 0xc9, 0xc7, 0xbe, 0x38, 0xff, 0xa1, 0x45, 0xd2, 0xf3, 0x3f, 0x9f,
0xff, 0xb7, 0x37, 0x54, 0xe5, 0x82, 0xa9, 0x59, 0xba, 0xad, 0x69, 0x85,
0x82, 0xe3, 0x38, 0x96, 0x56, 0xb0, 0x6d, 0x84, 0xcb, 0xba, 0xb5, 0x6b,
0xe8, 0xa6, 0x63, 0x60, 0x63, 0xd7, 0x29, 0x19, 0x46, 0xd9, 0x82, 0xc5,
0x69, 0xc5, 0x19, 0xaa, 0xb2, 0x5a, 0x2e, 0x59, 0x25, 0x47, 0xc7, 0xa6,
0x6d, 0x6b, 0x8e, 0x65, 0x96, 0x55, 0xdb, 0xd6, 0xca, 0xa6, 0x81, 0x54,
0x54, 0x34, 0x8c, 0x62, 0xa1, 0x00, 0x6d, 0xc3, 0x2e, 0xe8, 0xba, 0x33,
0x9f, 0xa2, 0xe8, 0x49, 0x3d, 0xf9, 0x1e, 0x9b, 0x92, 0x04, 0xe8, 0xbc,
0x02, 0x31, 0x4a, 0xc5, 0x31, 0x9a, 0x9b, 0x05, 0x96, 0xbe, 0x26, 0xc4,
0xaf, 0xbe, 0x27, 0xc5, 0xe8, 0xb3, 0x21, 0xde, 0xd0, 0x86, 0x36, 0xb4,
0xa1, 0xff, 0x49, 0xfa, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x46,
0x90, 0xf7, 0x00, 0x28, 0x00, 0x00,
}
Loading