2.1 Bootstrap

maistra · Nov 3, 2021 · e2792d3 · e2792d3
1 parent f13ee70
commit e2792d3
Show file tree

Hide file tree

Showing 15 changed files with 124 additions and 175 deletions.
diff --git a/Dockerfile.grafana b/Dockerfile.grafana
@@ -1,8 +1,8 @@
 FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 
-ARG REPO=https://copr.fedorainfracloud.org/coprs/g/maistra/istio-1.2/repo/epel-8/group_maistra-istio-1.2-epel-8.repo
-ARG VERSION=2.0.2
-ARG ISTIO_VERSION=1.6.14
+ARG REPO=https://copr.fedorainfracloud.org/coprs/g/maistra/istio-2.1/repo/centos-stream-8/group_maistra-istio-2.1-centos-stream-8.repo
+ARG VERSION=2.1.0
+ARG ISTIO_VERSION=1.9.8
 
 LABEL com.redhat.component="maistra-grafana-container"
 LABEL name="maistra/grafana-ubi8"
@@ -19,7 +19,7 @@ ENV ISTIO_VERSION="${ISTIO_VERSION}"
 
 RUN curl -Ls ${REPO} -o /etc/yum.repos.d/maistra.repo && \
     microdnf update -y && \
-    microdnf install -y grafana grafana-prometheus && \
+    microdnf install -y istio-grafana && \
     microdnf clean all
 
 ENV GF_PATHS_HOME="/usr/share/grafana"
@@ -29,8 +29,8 @@ ENV GF_PATHS_PLUGINS="/var/lib/grafana/plugins"
 ENV GF_PATHS_PROVISIONING="/etc/grafana/provisioning"
 ENV GF_PATHS_DATA="/var/lib/grafana"
 
-RUN chgrp -R 0 ${GF_PATHS_CONFIG} ${GF_PATHS_HOME} ${GF_PATHS_LOGS} ${GF_PATHS_PLUGINS} ${GF_PATHS_DATA} && \
-    chmod -R g=u ${GF_PATHS_CONFIG} ${GF_PATHS_HOME} ${GF_PATHS_LOGS} ${GF_PATHS_PLUGINS} ${GF_PATHS_DATA}
+RUN chgrp -R 0 `dirname ${GF_PATHS_CONFIG}` ${GF_PATHS_HOME} ${GF_PATHS_LOGS} ${GF_PATHS_PLUGINS} ${GF_PATHS_DATA} && \
+    chmod -R g=u `dirname ${GF_PATHS_CONFIG}` ${GF_PATHS_HOME} ${GF_PATHS_LOGS} ${GF_PATHS_PLUGINS} ${GF_PATHS_DATA}
 
 EXPOSE 3000
 WORKDIR $GF_PATHS_HOME

diff --git a/Dockerfile.istio-cni b/Dockerfile.istio-cni
@@ -1,8 +1,8 @@
 FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 
-ARG REPO=https://copr.fedorainfracloud.org/coprs/g/maistra/istio-1.2/repo/epel-8/group_maistra-istio-1.2-epel-8.repo
-ARG VERSION=2.0.2
-ARG ISTIO_VERSION=1.6.14
+ARG REPO=https://copr.fedorainfracloud.org/coprs/g/maistra/istio-2.1/repo/centos-stream-8/group_maistra-istio-2.1-centos-stream-8.repo
+ARG VERSION=2.1.0
+ARG ISTIO_VERSION=1.9.8
 
 LABEL com.redhat.component="maistra-cni"
 LABEL name="maistra/istio-cni-ubi8"
@@ -19,16 +19,9 @@ ENV ISTIO_VERSION="${ISTIO_VERSION}"
 
 RUN curl -Ls ${REPO} -o /etc/yum.repos.d/maistra.repo && \
     microdnf update -y && \
-    microdnf install -y hostname istio-cni-${VERSION} && \
+    microdnf install -y istio-cni-${VERSION} && \
     microdnf clean all
-# jq is not available in ubi8 yum repo
-RUN curl -Ls https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 -o /usr/bin/jq && chmod +x /usr/bin/jq
 
 WORKDIR /tmp/
 
-ENV PATH=$PATH:/opt/cni/bin
-VOLUME /opt/cni
-WORKDIR /opt/cni/bin
-CMD ["/install-cni.sh"]
-
-ENTRYPOINT [ "/install-cni.sh"]
+ENTRYPOINT [ "/usr/local/bin/install-cni"]
diff --git a/Dockerfile.istio-must-gather b/Dockerfile.istio-must-gather
@@ -1,8 +1,7 @@
-FROM quay.io/openshift/origin-must-gather:4.6
+FROM quay.io/openshift/origin-must-gather:4.8
 
-ARG REPO=https://copr.fedorainfracloud.org/coprs/g/maistra/istio-1.2/repo/epel-8/group_maistra-istio-1.2-epel-8.repo
-ARG VERSION=2.0.2
-ARG ISTIO_VERSION=1.6.14
+ARG VERSION=2.1.0
+ARG ISTIO_VERSION=1.9.8
 
 LABEL com.redhat.component="maistra-istio-must-gather"
 LABEL name="maistra/istio-must-gather"

diff --git a/Dockerfile.istio-operator b/Dockerfile.istio-operator
@@ -1,8 +1,8 @@
 FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 
-ARG REPO=https://copr.fedorainfracloud.org/coprs/g/maistra/istio-1.2/repo/epel-8/group_maistra-istio-1.2-epel-8.repo
-ARG VERSION=2.0.2
-ARG ISTIO_VERSION=1.6.14
+ARG REPO=https://copr.fedorainfracloud.org/coprs/g/maistra/istio-2.1/repo/centos-stream-8/group_maistra-istio-2.1-centos-stream-8.repo
+ARG VERSION=2.1.0
+ARG ISTIO_VERSION=1.9.8
 
 LABEL com.redhat.component="maistra-istio-operator"
 LABEL name="maistra/istio-ubi8-operator"

diff --git a/Dockerfile.mixer b/Dockerfile.mixer
diff --git a/Dockerfile.pilot b/Dockerfile.pilot
@@ -1,8 +1,8 @@
 FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 
-ARG REPO=https://copr.fedorainfracloud.org/coprs/g/maistra/istio-1.2/repo/epel-8/group_maistra-istio-1.2-epel-8.repo
-ARG VERSION=2.0.2
-ARG ISTIO_VERSION=1.6.14
+ARG REPO=https://copr.fedorainfracloud.org/coprs/g/maistra/istio-2.1/repo/centos-stream-8/group_maistra-istio-2.1-centos-stream-8.repo
+ARG VERSION=2.1.0
+ARG ISTIO_VERSION=1.9.8
 
 LABEL com.redhat.component="maistra-pilot-container"
 LABEL name="maistra/pilot-ubi8"
@@ -19,7 +19,7 @@ ENV ISTIO_VERSION="${ISTIO_VERSION}"
 
 RUN curl -Ls ${REPO} -o /etc/yum.repos.d/maistra.repo && \
     microdnf update -y && \
-    microdnf install -y istio-pilot-discovery-${VERSION} && \
+    microdnf install -y istio-pilot-discovery-${VERSION} podman util-linux && \
     microdnf clean all
 
 WORKDIR /tmp/

diff --git a/Dockerfile.prometheus b/Dockerfile.prometheus
@@ -1,8 +1,8 @@
 FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 
-ARG REPO=https://copr.fedorainfracloud.org/coprs/g/maistra/istio-1.2/repo/epel-8/group_maistra-istio-1.2-epel-8.repo
-ARG VERSION=2.0.2
-ARG ISTIO_VERSION=1.6.14
+ARG REPO=https://copr.fedorainfracloud.org/coprs/g/maistra/istio-2.1/repo/centos-stream-8/group_maistra-istio-2.1-centos-stream-8.repo
+ARG VERSION=2.1.0
+ARG ISTIO_VERSION=1.9.8
 
 LABEL com.redhat.component="maistra-prometheus-container"
 LABEL name="maistra/prometheus-ubi8"
@@ -19,7 +19,7 @@ ENV ISTIO_VERSION="${ISTIO_VERSION}"
 
 RUN curl -Ls ${REPO} -o /etc/yum.repos.d/maistra.repo && \
     microdnf update -y && \
-    microdnf install -y prometheus && \
+    microdnf install -y istio-prometheus && \
     microdnf clean all
 
 RUN mkdir -p /prometheus && \

diff --git a/Dockerfile.proxy-init b/Dockerfile.proxy-init
diff --git a/Dockerfile.proxy-init-centos7 b/Dockerfile.proxy-init-centos7
diff --git a/Dockerfile.proxyv2 b/Dockerfile.proxyv2
@@ -1,8 +1,8 @@
 FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 
-ARG REPO=https://copr.fedorainfracloud.org/coprs/g/maistra/istio-1.2/repo/epel-8/group_maistra-istio-1.2-epel-8.repo
-ARG VERSION=2.0.2
-ARG ISTIO_VERSION=1.6.14
+ARG REPO=https://copr.fedorainfracloud.org/coprs/g/maistra/istio-2.1/repo/centos-stream-8/group_maistra-istio-2.1-centos-stream-8.repo
+ARG VERSION=2.1.0
+ARG ISTIO_VERSION=1.9.8
 
 LABEL com.redhat.component="maistra-proxyv2-container"
 LABEL name="maistra/proxyv2"
@@ -20,16 +20,14 @@ ENV ISTIO_VERSION="${ISTIO_VERSION}"
 # Environment variables indicating this proxy's version/capabilities as opaque string
 ENV ISTIO_META_ISTIO_PROXY_VERSION "${ISTIO_VERSION}"
 # Environment variable indicating the exact proxy sha - for debugging or version-specific configs
-ENV ISTIO_META_ISTIO_PROXY_SHA b2327e0e1789451b65cf4af6a98d302c4a857f07
+ENV ISTIO_META_ISTIO_PROXY_SHA acabdbce202765d5695546d8a8b9acb7373320c1
 # Environment variable indicating the exact build, for debugging
 ENV ISTIO_META_ISTIO_VERSION "${ISTIO_VERSION}"
 
-RUN curl -Ls ${REPO} -o /etc/yum.repos.d/maistra-1.1-epel-8.repo
-
-RUN mv /etc/yum.repos.d/ubi.repo /ubi.repo
+RUN curl -Ls ${REPO} -o /etc/yum.repos.d/maistra.repo
 
 RUN microdnf update -y && \
-    microdnf install -y istio-proxy-${VERSION} istio-pilot-agent-${VERSION} && \
+    microdnf install -y istio-proxy-${VERSION} istio-pilot-agent-${VERSION} openssl && \
     microdnf clean all
 
 # pilot-agent and envoy may run with effective uid 0 in order to run envoy with

diff --git a/Dockerfile.ratelimit b/Dockerfile.ratelimit
@@ -0,0 +1,25 @@
+FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
+
+ARG REPO=https://copr.fedorainfracloud.org/coprs/g/maistra/istio-2.1/repo/centos-stream-8/group_maistra-istio-2.1-centos-stream-8.repo
+ARG VERSION=2.1.0
+ARG ISTIO_VERSION=1.9.8
+
+LABEL com.redhat.component="maistra-prometheus-container"
+LABEL name="maistra/prometheus-ubi8"
+LABEL version="${VERSION}"
+LABEL istio_version="${ISTIO_VERSION}"
+LABEL summary="Red Hat Prometheus OpenShift container image"
+LABEL description="Red Hat Prometheus OpenShift container image"
+LABEL io.k8s.display-name="Red Hat Prometheus"
+LABEL io.openshift.tags="istio"
+LABEL io.openshift.expose-services="9090"
+LABEL maintainer="Istio Feedback <istio-feedback@redhat.com>"
+ENV container="oci"
+ENV ISTIO_VERSION="${ISTIO_VERSION}"
+
+RUN curl -Ls ${REPO} -o /etc/yum.repos.d/maistra.repo && \
+    microdnf update -y && \
+    microdnf install -y istio-ratelimit && \
+    microdnf clean all
+
+ENTRYPOINT [ "/usr/bin/ratelimit" ]
diff --git a/README.md b/README.md
@@ -4,15 +4,15 @@ Issues for this repository are tracked in Red Hat Jira. Please head to <https://
 
 # Dockerfiles for CentOS based images of Istio
 
-Images are on [Docker Hub](https://hub.docker.com/u/maistra/).
+Images are on [Quay.io](https://quay.io/organization/maistra).
 
 ## Building
 In order to build them locally, you can make use of the helper script `create-images.sh`, passing the desired tag:
 ```sh
 ./create-images.sh -t my-tag -b
 # -t is the tag, -b stands for "build"
 ```
-This will build all images locally with the name openshiftistio/*COMPONENT*:my-tag.
+This will build all images locally with the name maistra/*COMPONENT*:my-tag.
 
 If you don't want to follow this naming, you can always build them individually, for example:
 ```sh
@@ -26,12 +26,12 @@ Before creating images you probably want to grab the latest artifacts from their
 ### create-images.sh
 `create-images.sh` is able to do more than just, say, creating images. It supports removal (untagging), building and pushing of images.
 
-Example: if you want to build local images (`-b`) but want do remove (untag) previously existing local images (`-d`) first, and after building, you want to push (`-p`) them, run:
+Example: if you want to build local images (`-b`) but want to remove (untag) previously existing local images (`-d`) first, and after building, you want to push (`-p`) them, run:
 ```sh
 ./create-images.sh -t my-tag -b -d -p
 ```
 Run `./create-images.sh` to see all the options.
 
 ## Versions
 
-Versions are tracked in a branch for each release name. For example, the Maistra 0.11 release tracks the maistra-0.11 branch.
+Versions are tracked in a branch for each release name. For example, the maistra-2.1 branch tracks the 2.1 release.