Skip to content

Commit

Permalink
Merge pull request #10197 from rawlingsj/istio
Browse files Browse the repository at this point in the history
isto related packages mitigate CVE-2023-48795
  • Loading branch information
cpanato authored Dec 20, 2023
2 parents 1aeb230 + ca32eba commit e17c0b0
Show file tree
Hide file tree
Showing 10 changed files with 55 additions and 14 deletions.
9 changes: 7 additions & 2 deletions istio-cni-1.19.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package:
name: istio-cni-1.19
version: 1.19.5
epoch: 1
description:
epoch: 2
description: Istio Container Network Interface
copyright:
- license: Apache-2.0
dependencies:
Expand All @@ -25,6 +25,11 @@ pipeline:
tag: ${{package.version}}
expected-commit: a61a751512256f27bc3b1ff9bc9c38119c6e978c

- uses: go/bump
with:
deps: golang.org/x/[email protected]
go-version: "1.21"

- uses: go/build
with:
packages: ./cni/cmd/istio-cni
Expand Down
9 changes: 7 additions & 2 deletions istio-cni-1.20.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package:
name: istio-cni-1.20
version: 1.20.1
epoch: 1
description:
epoch: 2
description: Istio Container Network Interface
copyright:
- license: Apache-2.0
dependencies:
Expand All @@ -25,6 +25,11 @@ pipeline:
tag: ${{package.version}}
expected-commit: 552626bd81f625917bcba6e415cae5aa3d5c61af

- uses: go/bump
with:
deps: golang.org/x/[email protected]
go-version: "1.21"

- uses: go/build
with:
packages: ./cni/cmd/istio-cni
Expand Down
7 changes: 6 additions & 1 deletion istio-operator-1.19.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: istio-operator-1.19
version: 1.19.5
epoch: 1
epoch: 2
description: Istio operator provides user friendly options to operate the Istio service mesh
copyright:
- license: Apache-2.0
Expand All @@ -25,6 +25,11 @@ pipeline:
tag: ${{package.version}}
expected-commit: a61a751512256f27bc3b1ff9bc9c38119c6e978c

- uses: go/bump
with:
deps: golang.org/x/[email protected]
go-version: "1.21"

- uses: go/build
with:
packages: ./operator/cmd/operator
Expand Down
7 changes: 6 additions & 1 deletion istio-operator-1.20.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: istio-operator-1.20
version: 1.20.1
epoch: 1
epoch: 2
description: Istio operator provides user friendly options to operate the Istio service mesh
copyright:
- license: Apache-2.0
Expand All @@ -25,6 +25,11 @@ pipeline:
tag: ${{package.version}}
expected-commit: 552626bd81f625917bcba6e415cae5aa3d5c61af

- uses: go/bump
with:
deps: golang.org/x/[email protected]
go-version: "1.21"

- uses: go/build
with:
packages: ./operator/cmd/operator
Expand Down
7 changes: 6 additions & 1 deletion istio-pilot-agent-1.18.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: istio-pilot-agent-1.18
version: 1.18.6
epoch: 1
epoch: 2
description: Nanny binary for Istio Envoy
copyright:
- license: Apache-2.0
Expand All @@ -25,6 +25,11 @@ pipeline:
tag: ${{package.version}}
expected-commit: f45e66f0bf73cbcfbd66c732fff7dd43cded3c0e

- uses: go/bump
with:
deps: golang.org/x/[email protected]
go-version: "1.21"

- uses: go/build
with:
packages: ./pilot/cmd/pilot-agent
Expand Down
7 changes: 6 additions & 1 deletion istio-pilot-agent-1.19.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: istio-pilot-agent-1.19
version: 1.19.5
epoch: 1
epoch: 2
description: Nanny binary for Istio Envoy
copyright:
- license: Apache-2.0
Expand All @@ -25,6 +25,11 @@ pipeline:
tag: ${{package.version}}
expected-commit: a61a751512256f27bc3b1ff9bc9c38119c6e978c

- uses: go/bump
with:
deps: golang.org/x/[email protected]
go-version: "1.21"

- uses: go/build
with:
packages: ./pilot/cmd/pilot-agent
Expand Down
7 changes: 6 additions & 1 deletion istio-pilot-agent-1.20.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: istio-pilot-agent-1.20
version: 1.20.1
epoch: 1
epoch: 2
description: Nanny binary for Istio Envoy
copyright:
- license: Apache-2.0
Expand All @@ -25,6 +25,11 @@ pipeline:
tag: ${{package.version}}
expected-commit: 552626bd81f625917bcba6e415cae5aa3d5c61af

- uses: go/bump
with:
deps: golang.org/x/[email protected]
go-version: "1.21"

- uses: go/build
with:
packages: ./pilot/cmd/pilot-agent
Expand Down
7 changes: 6 additions & 1 deletion istio-pilot-discovery-1.18.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: istio-pilot-discovery-1.18
version: 1.18.6
epoch: 0
epoch: 1
description: Istio controller
copyright:
- license: Apache-2.0
Expand All @@ -25,6 +25,11 @@ pipeline:
tag: ${{package.version}}
expected-commit: f45e66f0bf73cbcfbd66c732fff7dd43cded3c0e

- uses: go/bump
with:
deps: github.com/go-jose/go-jose/[email protected] golang.org/x/[email protected]
go-version: "1.21"

- uses: go/build
with:
packages: ./pilot/cmd/pilot-discovery
Expand Down
5 changes: 3 additions & 2 deletions istio-pilot-discovery-1.19.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: istio-pilot-discovery-1.19
version: 1.19.5
epoch: 1
epoch: 2
description: Istio controller
copyright:
- license: Apache-2.0
Expand All @@ -27,7 +27,8 @@ pipeline:

- uses: go/bump
with:
deps: github.com/go-jose/go-jose/[email protected]
deps: github.com/go-jose/go-jose/[email protected] golang.org/x/[email protected]
go-version: "1.21"

- uses: go/build
with:
Expand Down
4 changes: 2 additions & 2 deletions istio-pilot-discovery-1.20.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: istio-pilot-discovery-1.20
version: 1.20.1
epoch: 1
epoch: 2
description: Istio controller
copyright:
- license: Apache-2.0
Expand All @@ -27,7 +27,7 @@ pipeline:

- uses: go/bump
with:
deps: github.com/go-jose/go-jose/[email protected]
deps: github.com/go-jose/go-jose/[email protected] golang.org/x/[email protected]
go-version: "1.21"

- uses: go/build
Expand Down

0 comments on commit e17c0b0

Please sign in to comment.