diff --git a/Dockerfile b/Dockerfile index e83f39380299b1ed32a06472daf67db801ed1ca8..3ff169c99b75c714a1412fbfa127d943f0d60e01 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG BASE_IMAGE=redhat/ubi/ubi8 ARG BASE_TAG=8.2 ############################################################### # Copy mixer contents to base image -FROM opensource/istio-1.6/istioctl-1.6/istioctl:1.6.0 AS base +FROM opensource/istio-1.6/istioctl-1.6/istioctl:1.6.1 AS base FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} ############################################################### @@ -13,7 +13,7 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} LABEL name="istio-istioctl" \ maintainer="cody.hutchins@darkwolf.co" \ vendor="Open Source" \ - version="1.6.0" \ + version="1.6.1" \ release="1" \ summary="Istio configuration command line utility" \ description="Istio configuration command line utility for service operators to debug and diagnose their Istio mesh." @@ -23,6 +23,6 @@ COPY --from=base /usr/local/bin/istioctl /usr/local/bin/istioctl ############################################################### # Run as another user, provide healthcheck, and set entrypoint -USER 1001 +USER 1000 HEALTHCHECK --interval=1m --start-period=30s CMD version --remote=false ENTRYPOINT ["/usr/local/bin/istioctl"] \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index f376c5c23c78804b42eb77abc15ada50e8ad1606..c536db007cdd4fe920d2158a2fe1a3866b75d6ba 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline( version: "1.6.0") \ No newline at end of file +dccscrPipeline( version: "1.6.1") \ No newline at end of file diff --git a/README.md b/README.md index 535992bd8e3aa04d505942af23a954f4e057beaa..b6b23303555c41d920c9dba4ae7b282ec897a19d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # istioctl -Version 1.6.0 +Version 1.6.1 istioctl allows you to install and configure an Istio mesh for production use or for evaluation purposes. istioctl is a command line tool which provides customization of the Istio control plane and of the sidecars for the Istio data plane. It has user input validation to help prevent installation errors and customization options to override any aspect of the configuration. @@ -65,7 +65,7 @@ This ensures that the hub being used as a source for image-pulling is the privat 2. The second workaround requires a deeper dive into the code and requires you to download the Istio from the releases page: -https://github.com/istio/istio/releases/tag/1.6.0 +https://github.com/istio/istio/releases/tag/1.6.1 Un-tar the download file and move it to the location on the machine of your choice. @@ -75,10 +75,14 @@ Navigate to the `install/kubernetes/operator/charts` directory. You will see var In order to use these external charts, run the following command (this example is using the default profile): -`istioctl manifest apply --set installPackagePath=< path to istio releases >/istio-1.6.0/install/kubernetes/operator/charts \ - --set profile=< path to istio releases >/istio-1.6.0/install/kubernetes/operator/profiles/default.yaml` +`istioctl manifest apply --set installPackagePath=< path to istio releases >/istio-1.6.1/install/kubernetes/operator/charts \ + --set profile=< path to istio releases >/istio-1.6.1/install/kubernetes/operator/profiles/default.yaml` You should then see the Iron Bank container images used in the Istio deployment. For more information, refer to the istioctl installation documentation referenced above. +## Notes + +The container runs as user 1000. + diff --git a/download.yaml b/download.yaml index 8e65453f950632eb4d25196578116b8fe10aa6cf..92aa0e0599319fcdb74585b1c4c578bfb41a9b5a 100644 --- a/download.yaml +++ b/download.yaml @@ -1,4 +1,4 @@ --- resources: - - url: "docker://docker.io/istio/istioctl@sha256:87f40d192a7f6cc2c0b788cacf97a0186e242df503dae6115a45ee19fda51f4b" - tag: "opensource/istio-1.6/istioctl-1.6/istioctl:1.6.0" + - url: "docker://docker.io/istio/istioctl@sha256:090478dfa99e1779f0a90a83587229afda16cacf21621ef126dee95507d2f3d4" + tag: "opensource/istio-1.6/istioctl-1.6/istioctl:1.6.1"