modify rollout types description
Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>
This commit is contained in:
parent
a3f91043a7
commit
b20e692cea
|
|
@ -1,7 +1,7 @@
|
||||||
# Build the manager binary
|
# Build the manager binary
|
||||||
ARG BASE_IMAGE=alpine
|
ARG BASE_IMAGE=alpine
|
||||||
ARG BASE_IMAGE_VERION=3.17
|
ARG BASE_IMAGE_VERION=3.17
|
||||||
FROM --platform=$BUILDPLATFORM golang:1.18-alpine3.17 as builder
|
FROM --platform=$BUILDPLATFORM golang:1.19-alpine3.17 as builder
|
||||||
|
|
||||||
WORKDIR /workspace
|
WORKDIR /workspace
|
||||||
|
|
||||||
|
|
@ -23,12 +23,24 @@ ARG BASE_IMAGE
|
||||||
ARG BASE_IMAGE_VERION
|
ARG BASE_IMAGE_VERION
|
||||||
FROM ${BASE_IMAGE}:${BASE_IMAGE_VERION}
|
FROM ${BASE_IMAGE}:${BASE_IMAGE_VERION}
|
||||||
|
|
||||||
RUN apk add --no-cache ca-certificates=~20220614-r4 bash=~5.2.15-r0 expat=~2.5.0-r0 \
|
RUN set -eux; \
|
||||||
&& rm -rf /var/cache/apk/*
|
apk --no-cache --update upgrade && \
|
||||||
|
apk --no-cache add ca-certificates && \
|
||||||
|
apk --no-cache add tzdata && \
|
||||||
|
rm -rf /var/cache/apk/* && \
|
||||||
|
update-ca-certificates && \
|
||||||
|
echo "only include root and nobody user" && \
|
||||||
|
echo -e "root:x:0:0:root:/root:/bin/ash\nnobody:x:65534:65534:nobody:/:/sbin/nologin" | tee /etc/passwd && \
|
||||||
|
echo -e "root:x:0:root\nnobody:x:65534:" | tee /etc/group && \
|
||||||
|
rm -rf /usr/local/sbin/* && \
|
||||||
|
rm -rf /usr/local/bin/* && \
|
||||||
|
rm -rf /usr/sbin/* && \
|
||||||
|
rm -rf /usr/bin/* && \
|
||||||
|
rm -rf /sbin/* && \
|
||||||
|
rm -rf /bin/*
|
||||||
|
|
||||||
WORKDIR /
|
WORKDIR /
|
||||||
COPY --from=builder /workspace/manager .
|
COPY --from=builder /workspace/manager .
|
||||||
COPY lua_configuration /lua_configuration
|
COPY lua_configuration /lua_configuration
|
||||||
USER 1000
|
|
||||||
|
|
||||||
ENTRYPOINT ["/manager"]
|
ENTRYPOINT ["/manager"]
|
||||||
|
|
|
||||||
|
|
@ -82,7 +82,7 @@ type CanaryStrategy struct {
|
||||||
// Steps define the order of phases to execute release in batches(20%, 40%, 60%, 80%, 100%)
|
// Steps define the order of phases to execute release in batches(20%, 40%, 60%, 80%, 100%)
|
||||||
// +optional
|
// +optional
|
||||||
Steps []CanaryStep `json:"steps,omitempty"`
|
Steps []CanaryStep `json:"steps,omitempty"`
|
||||||
// TrafficRoutings hosts all the supported service meshes supported to enable more fine-grained traffic routing
|
// TrafficRoutings support ingress, gateway api and custom network resource(e.g. istio, apisix) to enable more fine-grained traffic routing
|
||||||
// and current only support one TrafficRouting
|
// and current only support one TrafficRouting
|
||||||
TrafficRoutings []TrafficRoutingRef `json:"trafficRoutings,omitempty"`
|
TrafficRoutings []TrafficRoutingRef `json:"trafficRoutings,omitempty"`
|
||||||
// FailureThreshold indicates how many failed pods can be tolerated in all upgraded pods.
|
// FailureThreshold indicates how many failed pods can be tolerated in all upgraded pods.
|
||||||
|
|
@ -123,6 +123,7 @@ type CanaryStep struct {
|
||||||
|
|
||||||
type TrafficRoutingStrategy struct {
|
type TrafficRoutingStrategy struct {
|
||||||
// Traffic indicate how many percentage of traffic the canary pods should receive
|
// Traffic indicate how many percentage of traffic the canary pods should receive
|
||||||
|
// Value is of string type and is a percentage, e.g. 5%.
|
||||||
// +optional
|
// +optional
|
||||||
Traffic *string `json:"traffic,omitempty"`
|
Traffic *string `json:"traffic,omitempty"`
|
||||||
// Set overwrites the request with the given header (name, value)
|
// Set overwrites the request with the given header (name, value)
|
||||||
|
|
|
||||||
|
|
@ -808,7 +808,8 @@ spec:
|
||||||
type: object
|
type: object
|
||||||
traffic:
|
traffic:
|
||||||
description: Traffic indicate how many percentage of
|
description: Traffic indicate how many percentage of
|
||||||
traffic the canary pods should receive
|
traffic the canary pods should receive Value is of
|
||||||
|
string type and is a percentage, e.g. 5%.
|
||||||
type: string
|
type: string
|
||||||
type: object
|
type: object
|
||||||
type: array
|
type: array
|
||||||
|
|
@ -816,9 +817,10 @@ spec:
|
||||||
description: TrafficRoutingRef is TrafficRouting's Name
|
description: TrafficRoutingRef is TrafficRouting's Name
|
||||||
type: string
|
type: string
|
||||||
trafficRoutings:
|
trafficRoutings:
|
||||||
description: TrafficRoutings hosts all the supported service
|
description: TrafficRoutings support ingress, gateway api
|
||||||
meshes supported to enable more fine-grained traffic routing
|
and custom network resource(e.g. istio, apisix) to enable
|
||||||
and current only support one TrafficRouting
|
more fine-grained traffic routing and current only support
|
||||||
|
one TrafficRouting
|
||||||
items:
|
items:
|
||||||
description: TrafficRoutingRef hosts all the different configuration
|
description: TrafficRoutingRef hosts all the different configuration
|
||||||
for supported service meshes to enable more fine-grained
|
for supported service meshes to enable more fine-grained
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue