Merge branch 'master' into hosseini92-patch-rabbitmq-external-access-…

…instructions
GoogleCloudPlatform · Aug 17, 2023 · a3f258c · a3f258c
2 parents aa263e4 + 7f64378
commit a3f258c
Show file tree

Hide file tree

Showing 21 changed files with 124 additions and 272 deletions.
diff --git a/docker/airflow/2/debian11/2.5/Dockerfile b/docker/airflow/2/debian11/2.5/Dockerfile
@@ -35,6 +35,7 @@ ENV DEV_APT_DEPS="\
      lsb-release \
      nodejs \
      openssh-client \
+     pkg-config \
      postgresql-client \
      python3 \
      python3-pip \
@@ -150,6 +151,7 @@ ENV RUNTIME_APT_DEPS="\
        lsb-release \
        netcat \
        openssh-client \
+       pkg-config \
        postgresql-client \
        python2 \
        python3 \

diff --git a/docker/airflow/2/debian11/2.6/Dockerfile b/docker/airflow/2/debian11/2.6/Dockerfile
@@ -1,4 +1,4 @@
-ARG AIRFLOW_VERSION="2.6.1"
+ARG AIRFLOW_VERSION="2.6.3"
 ARG AIRFLOW_EXTRAS="amazon,async,celery,cncf.kubernetes,dask,docker,elasticsearch,ftp,google,google_auth,grpc,hashicorp,http,ldap,microsoft.azure,mysql,odbc,pandas,postgres,redis,sendgrid,sftp,slack,ssh,statsd,virtualenv"
 
 ARG AIRFLOW_HOME=/opt/airflow
@@ -35,6 +35,7 @@ ENV DEV_APT_DEPS="\
      lsb-release \
      nodejs \
      openssh-client \
+     pkg-config \
      postgresql-client \
      python3 \
      python3-pip \
@@ -150,6 +151,7 @@ ENV RUNTIME_APT_DEPS="\
        lsb-release \
        netcat \
        openssh-client \
+       pkg-config \
        postgresql-client \
        python2 \
        python3 \
@@ -221,7 +223,7 @@ WORKDIR ${AIRFLOW_HOME}
 EXPOSE 8080
 USER ${AIRFLOW_UID}
 
-ENV C2D_RELEASE 2.6.1
+ENV C2D_RELEASE 2.6.3
 
 ENTRYPOINT ["/usr/bin/dumb-init", "--", "/entrypoint"]
 CMD [""]
diff --git a/docker/airflow/templates/Dockerfile.template b/docker/airflow/templates/Dockerfile.template
@@ -38,6 +38,7 @@ ENV DEV_APT_DEPS="\
      lsb-release \
      nodejs \
      openssh-client \
+     pkg-config \
      postgresql-client \
      python3 \
      python3-pip \
@@ -153,6 +154,7 @@ ENV RUNTIME_APT_DEPS="\
        lsb-release \
        netcat \
        openssh-client \
+       pkg-config \
        postgresql-client \
        python2 \
        python3 \

diff --git a/docker/airflow/versions.yaml b/docker/airflow/versions.yaml
@@ -20,15 +20,15 @@ versions:
   from: marketplace.gcr.io/google/c2d-debian11
   packages:
     airflow:
-      version: 2.6.1
+      version: 2.6.3
     pip:
       version: 22.3.1
   repo: airflow2
   tags:
-  - 2.6.1-debian11
+  - 2.6.3-debian11
   - 2.6-debian11
   - 2-debian11
-  - 2.6.1
+  - 2.6.3
   - '2.6'
   - '2'
   - latest
@@ -45,4 +45,3 @@ versions:
   - 2.5-debian11
   - 2.5.3
   - '2.5'
-
diff --git a/docker/prometheus-operator/0/0.65/Dockerfile b/docker/prometheus-operator/0/0.65/Dockerfile
@@ -3,39 +3,41 @@ FROM alpine/git:1.0.7 as git
 
 ENV PROMETHEUS_OPERATOR_VERSION=v0.65.2
 
-RUN git clone https://github.com/coreos/prometheus-operator.git /src/prometheus-operator/ \
+RUN git clone https://github.com/prometheus-operator/prometheus-operator.git /src/prometheus-operator/ \
     && cd /src/prometheus-operator/ \
     && git checkout $PROMETHEUS_OPERATOR_VERSION
 
 FROM golang:1.20 as builder
 
-COPY --from=git /src/prometheus-operator /go/src/github.com/coreos/prometheus-operator
+COPY --from=git /src/prometheus-operator /go/src/github.com/prometheus-operator/prometheus-operator
 
-WORKDIR /go/src/github.com/coreos/prometheus-operator
+WORKDIR /go/src/github.com/prometheus-operator/prometheus-operator
 
 ENV GO111MODULE=on
 
 RUN set -x && \
-    apt-get update && apt-get install -qq -y govendor openssl
+    apt-get update && apt-get install -qq -y openssl
 
 RUN git config --global http.sslverify false \
-    && go get -u github.com/kardianos/govendor \
-    && govendor license +vendor > NOTICES \
     && GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags="-s \
-    -X github.com/coreos/prometheus-operator/pkg/version.Version=0.65.2" \
+    -X github.com/prometheus-operator/prometheus-operator/pkg/version.Version=0.65.2" \
     -o operator cmd/operator/main.go
 
+# Download licenses
+RUN go install github.com/google/go-licenses@latest \
+    && go mod download \
+    && go-licenses report github.com/prometheus-operator/prometheus-operator/cmd/operator/ > all-licenses
+
 # Result Image
 FROM marketplace.gcr.io/google/c2d-debian11
 
 ENV C2D_RELEASE=0.65.2
 
 # Binaries
-COPY --from=builder /go/src/github.com/coreos/prometheus-operator/operator /bin
+COPY --from=builder /go/src/github.com/prometheus-operator/prometheus-operator/operator /bin
 
-# License and Notices
-COPY --from=builder /go/src/github.com/coreos/prometheus-operator/NOTICES /usr/share/prometheus-operator/NOTICES
-COPY --from=builder /go/src/github.com/coreos/prometheus-operator/LICENSE /usr/share/prometheus-operator/LICENSE
+# All Licenses
+COPY --from=builder /go/src/github.com/prometheus-operator/prometheus-operator/all-licenses /usr/share/prometheus-operator/LICENSE
 
 # User 'nobody' has uid `65534'
 USER 65534

diff --git a/docker/prometheus-operator/0/0.67/Dockerfile b/docker/prometheus-operator/0/0.67/Dockerfile
@@ -0,0 +1,45 @@
+# Clone git repo
+FROM alpine/git:1.0.7 as git
+
+ENV PROMETHEUS_OPERATOR_VERSION=v0.67.0
+
+RUN git clone https://github.com/prometheus-operator/prometheus-operator.git /src/prometheus-operator/ \
+    && cd /src/prometheus-operator/ \
+    && git checkout $PROMETHEUS_OPERATOR_VERSION
+
+FROM golang:1.20 as builder
+
+COPY --from=git /src/prometheus-operator /go/src/github.com/prometheus-operator/prometheus-operator
+
+WORKDIR /go/src/github.com/prometheus-operator/prometheus-operator
+
+ENV GO111MODULE=on
+
+RUN set -x && \
+    apt-get update && apt-get install -qq -y openssl
+
+RUN git config --global http.sslverify false \
+    && GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags="-s \
+    -X github.com/prometheus-operator/prometheus-operator/pkg/version.Version=0.67.0" \
+    -o operator cmd/operator/main.go
+
+# Download licenses
+RUN go install github.com/google/go-licenses@latest \
+    && go mod download \
+    && go-licenses report github.com/prometheus-operator/prometheus-operator/cmd/operator/ > all-licenses
+
+# Result Image
+FROM marketplace.gcr.io/google/c2d-debian11
+
+ENV C2D_RELEASE=0.67.0
+
+# Binaries
+COPY --from=builder /go/src/github.com/prometheus-operator/prometheus-operator/operator /bin
+
+# All Licenses
+COPY --from=builder /go/src/github.com/prometheus-operator/prometheus-operator/all-licenses /usr/share/prometheus-operator/LICENSE
+
+# User 'nobody' has uid `65534'
+USER 65534
+
+ENTRYPOINT ["/bin/operator"]
diff --git a/docker/prometheus-operator/templates/Dockerfile.template b/docker/prometheus-operator/templates/Dockerfile.template
@@ -5,39 +5,41 @@ FROM alpine/git:1.0.7 as git
 
 ENV PROMETHEUS_OPERATOR_VERSION=v{{ $prometheus_operator.Version }}
 
-RUN git clone https://github.com/coreos/prometheus-operator.git /src/prometheus-operator/ \
+RUN git clone https://github.com/prometheus-operator/prometheus-operator.git /src/prometheus-operator/ \
     && cd /src/prometheus-operator/ \
     && git checkout $PROMETHEUS_OPERATOR_VERSION
 
 FROM golang:1.20 as builder
 
-COPY --from=git /src/prometheus-operator /go/src/github.com/coreos/prometheus-operator
+COPY --from=git /src/prometheus-operator /go/src/github.com/prometheus-operator/prometheus-operator
 
-WORKDIR /go/src/github.com/coreos/prometheus-operator
+WORKDIR /go/src/github.com/prometheus-operator/prometheus-operator
 
 ENV GO111MODULE=on
 
 RUN set -x && \
-    apt-get update && apt-get install -qq -y govendor openssl
+    apt-get update && apt-get install -qq -y openssl
 
 RUN git config --global http.sslverify false \
-    && go get -u github.com/kardianos/govendor \
-    && govendor license +vendor > NOTICES \
     && GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags="-s \
-    -X github.com/coreos/prometheus-operator/pkg/version.Version={{ $prometheus_operator.Version }}" \
+    -X github.com/prometheus-operator/prometheus-operator/pkg/version.Version={{ $prometheus_operator.Version }}" \
     -o operator cmd/operator/main.go
 
+# Download licenses
+RUN go install github.com/google/go-licenses@latest \
+    && go mod download \
+    && go-licenses report github.com/prometheus-operator/prometheus-operator/cmd/operator/ > all-licenses
+
 # Result Image
 FROM {{ .From }}
 
 ENV C2D_RELEASE={{ $prometheus_operator.Version }}
 
 # Binaries
-COPY --from=builder /go/src/github.com/coreos/prometheus-operator/operator /bin
+COPY --from=builder /go/src/github.com/prometheus-operator/prometheus-operator/operator /bin
 
-# License and Notices
-COPY --from=builder /go/src/github.com/coreos/prometheus-operator/NOTICES /usr/share/prometheus-operator/NOTICES
-COPY --from=builder /go/src/github.com/coreos/prometheus-operator/LICENSE /usr/share/prometheus-operator/LICENSE
+# All Licenses
+COPY --from=builder /go/src/github.com/prometheus-operator/prometheus-operator/all-licenses /usr/share/prometheus-operator/LICENSE
 
 # User 'nobody' has uid `65534'
 USER 65534

diff --git a/docker/prometheus-operator/versions.yaml b/docker/prometheus-operator/versions.yaml
@@ -13,16 +13,27 @@
 # limitations under the License.
 
 versions:
+  - dir: '0/0.67'
+    repo: prometheus-operator0
+    tags:
+      - '0.67.0-debian11'
+      - '0.67.0'
+      - '0.67-debian11'
+      - '0.67'
+      - '0-debian11'
+      - '0'
+      - 'latest'
+    from: marketplace.gcr.io/google/c2d-debian11
+    packages:
+      prometheus-operator:
+        version: '0.67.0'
   - dir: '0/0.65'
     repo: prometheus-operator0
     tags:
       - '0.65.2-debian11'
       - '0.65.2'
       - '0.65-debian11'
       - '0.65'
-      - '0-debian11'
-      - '0'
-      - 'latest'
     from: marketplace.gcr.io/google/c2d-debian11
     packages:
       prometheus-operator:

diff --git a/docker/spark/3/debian11/3.3/Dockerfile b/docker/spark/3/debian11/3.3/Dockerfile
diff --git a/docker/spark/3/debian11/3.3/metrics.properties b/docker/spark/3/debian11/3.3/metrics.properties