From cdb0571c79b7fc3b71d86e6ca48e1b5f25709ce5 Mon Sep 17 00:00:00 2001 From: Jintao Zhang Date: Mon, 24 Jun 2019 01:46:19 +0800 Subject: [PATCH 1/2] update to alpine 3.10 Signed-off-by: Jintao Zhang --- rootfs/Dockerfile | 2 +- rootfs/Dockerfile.experimental | 2 +- rootfs/Dockerfile.rudder | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile index 2aa775a55..59ead977a 100644 --- a/rootfs/Dockerfile +++ b/rootfs/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM alpine:3.9 +FROM alpine:3.10 RUN apk add --no-cache ca-certificates socat diff --git a/rootfs/Dockerfile.experimental b/rootfs/Dockerfile.experimental index 9c1cab126..0fa9254ee 100644 --- a/rootfs/Dockerfile.experimental +++ b/rootfs/Dockerfile.experimental @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM alpine:3.9 +FROM alpine:3.10 RUN apk add --no-cache ca-certificates diff --git a/rootfs/Dockerfile.rudder b/rootfs/Dockerfile.rudder index 87efba401..ed153ee67 100644 --- a/rootfs/Dockerfile.rudder +++ b/rootfs/Dockerfile.rudder @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM alpine:3.9 +FROM alpine:3.10 RUN apk add --no-cache ca-certificates From b16ec08899658cad65cd5ae6a14334aed47f0101 Mon Sep 17 00:00:00 2001 From: Shao Yang Hong Date: Mon, 24 Jun 2019 11:50:21 +0800 Subject: [PATCH 2/2] Revert "Fixed default value for `helm.sh/chart` label" Signed-off-by: Shao Yang --- docs/chart_best_practices/labels.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/chart_best_practices/labels.md b/docs/chart_best_practices/labels.md index 5a41ed1cc..6b7d24c49 100644 --- a/docs/chart_best_practices/labels.md +++ b/docs/chart_best_practices/labels.md @@ -26,7 +26,7 @@ are recommended, and _should_ be placed onto a chart for global consistency. Tho Name|Status|Description -----|------|---------- `app.kubernetes.io/name` | REC | This should be the app name, reflecting the entire app. Usually `{{ template "name" . }}` is used for this. This is used by many Kubernetes manifests, and is not Helm-specific. -`helm.sh/chart` | REC | This should be the chart name and version: `{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}`. +`helm.sh/chart` | REC | This should be the chart name and version: `{{ .Chart.Name }}-{{ .Chart.Version \| replace "+" "_" }}`. `app.kubernetes.io/managed-by` | REC | This should always be set to `{{ .Release.Service }}`. It is for finding all things managed by Tiller. `app.kubernetes.io/instance` | REC | This should be the `{{ .Release.Name }}`. It aids in differentiating between different instances of the same application. `app.kubernetes.io/version` | OPT | The version of the app and can be set to `{{ .Chart.AppVersion }}`.