From 8693da44b771b3b45b9345ab91df1955b14116a9 Mon Sep 17 00:00:00 2001 From: Lin Yang Date: Wed, 18 Sep 2024 14:37:01 +0800 Subject: [PATCH] build(deps): bump pipy to v1.4.2 Signed-off-by: Lin Yang --- charts/fsm/README.md | 8 ++++---- charts/fsm/values.yaml | 4 ++-- cmd/fsm-bootstrap/crds/config.flomesh.io_meshconfigs.yaml | 2 +- dockerfiles/Dockerfile.fsm-gateway | 2 +- dockerfiles/Dockerfile.fsm-ingress | 2 +- docs/tests/gateway-api/README.md | 4 ++-- pkg/apis/config/v1alpha3/mesh_config.go | 2 +- tests/e2e/e2e_fsm_ingress_test.go | 2 +- tests/e2e/e2e_gatewayapi_test.go | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/charts/fsm/README.md b/charts/fsm/README.md index 0cfaf2be5..fd9b95365 100644 --- a/charts/fsm/README.md +++ b/charts/fsm/README.md @@ -445,11 +445,11 @@ The following table lists the configurable parameters of the fsm chart and their | fsm.remoteLogging.port | int | `30514` | Port of the remote logging service | | fsm.remoteLogging.sampledFraction | string | `"1.0"` | Sampled Fraction | | fsm.remoteLogging.secretName | string | `"fsm-remote-logging-secret"` | Secret Name | -| fsm.repoServer | object | `{"codebase":"","image":{"name":"pipy-repo","registry":"flomesh","tag":"1.4.1"},"ipaddr":"127.0.0.1","port":6060,"standalone":false}` | Pipy RepoServer | +| fsm.repoServer | object | `{"codebase":"","image":{"name":"pipy-repo","registry":"flomesh","tag":"1.4.2"},"ipaddr":"127.0.0.1","port":6060,"standalone":false}` | Pipy RepoServer | | fsm.repoServer.codebase | string | `""` | codebase is the folder used by fsmController. | | fsm.repoServer.image.name | string | `"pipy-repo"` | Repo server image name | | fsm.repoServer.image.registry | string | `"flomesh"` | Registry for repo server image | -| fsm.repoServer.image.tag | string | `"1.4.1"` | Repo server image tag | +| fsm.repoServer.image.tag | string | `"1.4.2"` | Repo server image tag | | fsm.repoServer.ipaddr | string | `"127.0.0.1"` | ipaddr of host/service where Pipy RepoServer is installed | | fsm.repoServer.port | int | `6060` | port of pipy RepoServer | | fsm.repoServer.standalone | bool | `false` | if false , Pipy RepoServer is installed within fsmController pod. | @@ -458,10 +458,10 @@ The following table lists the configurable parameters of the fsm chart and their | fsm.serviceLB.image.name | string | `"mirrored-klipper-lb"` | service-lb image name | | fsm.serviceLB.image.registry | string | `"flomesh"` | Registry for service-lb image | | fsm.serviceLB.image.tag | string | `"v0.4.7"` | service-lb image tag | -| fsm.sidecar | object | `{"image":{"name":"pipy","registry":"flomesh","tag":"1.4.1"},"sidecarDisabledMTLS":false,"sidecarLogLevel":"error","sidecarTimeout":60}` | Sidecar supported by fsm | +| fsm.sidecar | object | `{"image":{"name":"pipy","registry":"flomesh","tag":"1.4.2"},"sidecarDisabledMTLS":false,"sidecarLogLevel":"error","sidecarTimeout":60}` | Sidecar supported by fsm | | fsm.sidecar.image.name | string | `"pipy"` | Sidecar image name | | fsm.sidecar.image.registry | string | `"flomesh"` | Registry for sidecar image | -| fsm.sidecar.image.tag | string | `"1.4.1"` | Sidecar image tag | +| fsm.sidecar.image.tag | string | `"1.4.2"` | Sidecar image tag | | fsm.sidecar.sidecarDisabledMTLS | bool | `false` | Sidecar runs without mTLS | | fsm.sidecar.sidecarLogLevel | string | `"error"` | Log level for the proxy sidecar. Non developers should generally never set this value. In production environments the LogLevel should be set to `error` | | fsm.sidecar.sidecarTimeout | int | `60` | Sets connect/idle/read/write timeout | diff --git a/charts/fsm/values.yaml b/charts/fsm/values.yaml index b0215a776..8e4ffa580 100644 --- a/charts/fsm/values.yaml +++ b/charts/fsm/values.yaml @@ -76,7 +76,7 @@ fsm: # -- Sidecar image name name: pipy # -- Sidecar image tag - tag: 1.4.1 + tag: 1.4.2 # -- Sidecar runs without mTLS sidecarDisabledMTLS: false # -- Log level for the proxy sidecar. Non developers should generally never set this value. In production environments the LogLevel should be set to `error` @@ -92,7 +92,7 @@ fsm: # -- Repo server image name name: pipy-repo # -- Repo server image tag - tag: 1.4.1 + tag: 1.4.2 # -- if false , Pipy RepoServer is installed within fsmController pod. standalone: false # -- ipaddr of host/service where Pipy RepoServer is installed diff --git a/cmd/fsm-bootstrap/crds/config.flomesh.io_meshconfigs.yaml b/cmd/fsm-bootstrap/crds/config.flomesh.io_meshconfigs.yaml index ab1e5cce0..9a76ec232 100644 --- a/cmd/fsm-bootstrap/crds/config.flomesh.io_meshconfigs.yaml +++ b/cmd/fsm-bootstrap/crds/config.flomesh.io_meshconfigs.yaml @@ -1796,7 +1796,7 @@ spec: description: Misc defines the configurations of misc info properties: repoServerImage: - default: flomesh/pipy-repo:1.4.1 + default: flomesh/pipy-repo:1.4.2 description: RepoServerImage defines the image of repo server. type: string required: diff --git a/dockerfiles/Dockerfile.fsm-gateway b/dockerfiles/Dockerfile.fsm-gateway index 34a89f2df..f3697d031 100644 --- a/dockerfiles/Dockerfile.fsm-gateway +++ b/dockerfiles/Dockerfile.fsm-gateway @@ -24,7 +24,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -v -o bin/fsm-gateway -ldflags "$LDFLAGS" ./cmd/fsm-gateway # Build the final image -FROM flomesh/pipy:1.4.1-$DISTROLESS_TAG +FROM flomesh/pipy:1.4.2-$DISTROLESS_TAG WORKDIR / COPY --from=builder /fsm/bin/fsm-gateway . diff --git a/dockerfiles/Dockerfile.fsm-ingress b/dockerfiles/Dockerfile.fsm-ingress index 5422b24df..e7147e59a 100644 --- a/dockerfiles/Dockerfile.fsm-ingress +++ b/dockerfiles/Dockerfile.fsm-ingress @@ -24,7 +24,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -v -o bin/fsm-ingress -ldflags "$LDFLAGS" ./cmd/fsm-ingress # Build the final image -FROM flomesh/pipy:1.4.1-$DISTROLESS_TAG +FROM flomesh/pipy:1.4.2-$DISTROLESS_TAG WORKDIR / COPY --from=builder /fsm/bin/fsm-ingress . diff --git a/docs/tests/gateway-api/README.md b/docs/tests/gateway-api/README.md index 0d31f0653..03e861447 100644 --- a/docs/tests/gateway-api/README.md +++ b/docs/tests/gateway-api/README.md @@ -298,7 +298,7 @@ spec: spec: containers: - name: pipy - image: flomesh/pipy:1.4.1 + image: flomesh/pipy:1.4.2 ports: - name: pipy containerPort: 8080 @@ -396,7 +396,7 @@ spec: spec: containers: - name: pipy - image: flomesh/pipy:1.4.1 + image: flomesh/pipy:1.4.2 ports: - name: pipy containerPort: 8080 diff --git a/pkg/apis/config/v1alpha3/mesh_config.go b/pkg/apis/config/v1alpha3/mesh_config.go index 4e37487aa..7790b2872 100644 --- a/pkg/apis/config/v1alpha3/mesh_config.go +++ b/pkg/apis/config/v1alpha3/mesh_config.go @@ -775,7 +775,7 @@ type ImageSpec struct { // MiscSpec is the type to represent misc configs. type MiscSpec struct { - // +kubebuilder:default="flomesh/pipy-repo:1.4.1" + // +kubebuilder:default="flomesh/pipy-repo:1.4.2" // RepoServerImage defines the image of repo server. RepoServerImage string `json:"repoServerImage"` } diff --git a/tests/e2e/e2e_fsm_ingress_test.go b/tests/e2e/e2e_fsm_ingress_test.go index 1e8b19877..061501ecd 100644 --- a/tests/e2e/e2e_fsm_ingress_test.go +++ b/tests/e2e/e2e_fsm_ingress_test.go @@ -243,7 +243,7 @@ func deployAppForTestingIngress() { Containers: []corev1.Container{ { Name: "pipy", - Image: "flomesh/pipy:1.4.1", + Image: "flomesh/pipy:1.4.2", Ports: []corev1.ContainerPort{ { Name: "pipy", diff --git a/tests/e2e/e2e_gatewayapi_test.go b/tests/e2e/e2e_gatewayapi_test.go index 78154104b..e7f1afa10 100644 --- a/tests/e2e/e2e_gatewayapi_test.go +++ b/tests/e2e/e2e_gatewayapi_test.go @@ -351,7 +351,7 @@ func testFSMGatewayHTTPTrafficSameNamespace() { Containers: []corev1.Container{ { Name: "pipy", - Image: "flomesh/pipy:1.4.1", + Image: "flomesh/pipy:1.4.2", Ports: []corev1.ContainerPort{ { Name: "pipy", @@ -478,7 +478,7 @@ func testFSMGatewayHTTPTrafficCrossNamespace() { Containers: []corev1.Container{ { Name: "pipy", - Image: "flomesh/pipy:1.4.1", + Image: "flomesh/pipy:1.4.2", Ports: []corev1.ContainerPort{ { Name: "pipy",