From b20e692cea1acee5402a44d1bdb20d0dd7c82ff9 Mon Sep 17 00:00:00 2001
From: "liheng.zms" <liheng.zms@alibaba-inc.com>
Date: Wed, 20 Dec 2023 10:28:02 +0800
Subject: [PATCH] modify rollout types description

Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>
---
 Dockerfile_multiarch                          | 20 +++++++++++++++----
 api/v1beta1/rollout_types.go                  |  3 ++-
 .../bases/rollouts.kruise.io_rollouts.yaml    | 10 ++++++----
 go.mod                                        |  2 +-
 4 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/Dockerfile_multiarch b/Dockerfile_multiarch
index eb0b740e..08c48490 100644
--- a/Dockerfile_multiarch
+++ b/Dockerfile_multiarch
@@ -1,7 +1,7 @@
 # Build the manager binary
 ARG BASE_IMAGE=alpine
 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
 
@@ -23,12 +23,24 @@ ARG BASE_IMAGE
 ARG 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 \
-    && rm -rf /var/cache/apk/*
+RUN set -eux; \
+    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 /
 COPY --from=builder /workspace/manager .
 COPY lua_configuration /lua_configuration
-USER 1000
 
 ENTRYPOINT ["/manager"]
diff --git a/api/v1beta1/rollout_types.go b/api/v1beta1/rollout_types.go
index 9a40a22b..5287185b 100644
--- a/api/v1beta1/rollout_types.go
+++ b/api/v1beta1/rollout_types.go
@@ -82,7 +82,7 @@ type CanaryStrategy struct {
 	// Steps define the order of phases to execute release in batches(20%, 40%, 60%, 80%, 100%)
 	// +optional
 	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
 	TrafficRoutings []TrafficRoutingRef `json:"trafficRoutings,omitempty"`
 	// FailureThreshold indicates how many failed pods can be tolerated in all upgraded pods.
@@ -123,6 +123,7 @@ type CanaryStep struct {
 
 type TrafficRoutingStrategy struct {
 	// 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
 	Traffic *string `json:"traffic,omitempty"`
 	// Set overwrites the request with the given header (name, value)
diff --git a/config/crd/bases/rollouts.kruise.io_rollouts.yaml b/config/crd/bases/rollouts.kruise.io_rollouts.yaml
index fef3a3c6..226cf5c7 100644
--- a/config/crd/bases/rollouts.kruise.io_rollouts.yaml
+++ b/config/crd/bases/rollouts.kruise.io_rollouts.yaml
@@ -808,7 +808,8 @@ spec:
                               type: object
                             traffic:
                               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: object
                         type: array
@@ -816,9 +817,10 @@ spec:
                         description: TrafficRoutingRef is TrafficRouting's Name
                         type: string
                       trafficRoutings:
-                        description: TrafficRoutings hosts all the supported service
-                          meshes supported to enable more fine-grained traffic routing
-                          and current only support one TrafficRouting
+                        description: 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
                         items:
                           description: TrafficRoutingRef hosts all the different configuration
                             for supported service meshes to enable more fine-grained
diff --git a/go.mod b/go.mod
index 9c14fbd4..1f9b7683 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/openkruise/rollouts
 
-go 1.18
+go 1.19
 
 require (
 	github.com/davecgh/go-spew v1.1.1