From 2e8f887dc233af8fcf129d72d29e7d484ceaed94 Mon Sep 17 00:00:00 2001
From: Jindrich Skupa <jindrich.skupa@gmail.com>
Date: Thu, 26 Aug 2021 17:18:54 +0200
Subject: [PATCH 1/3] Add kubedog into image to track resource status
---
.gitlab-ci.yml | 2 ++
Dockerfile | 3 +++
2 files changed, 5 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c304896..78aafa9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,7 @@ build:
KUBERNETES_VERSION: 1.21.0
HELM_VERSION: 3.5.4
SENTRY_CLI_VERSION: 1.64.1
+ KUBEDOG_VERSION: 0.5.1
before_script:
- mkdir -p $DOCKER_CONFIG
- echo "{\"auths\":{\"https://index.docker.io/v1/\":{\"username\":\"clbbot\",\"password\":\"$DOCKER_HUB_PASSWORD\"}}}" > $DOCKER_CONFIG/config.json
@@ -23,6 +24,7 @@ build:
--build-arg KUBE_VERSION="${KUBERNETES_VERSION}" \
--build-arg HELM_VERSION="${HELM_VERSION}" \
--build-arg SENTRY_CLI_VERSION="${SENTRY_CLI_VERSION}" \
+ --build-arg KUBEDOG_VERSION="${KUBEDOG_VERSION}" \
--destination $DOCKER_IMAGE:$DOCKER_IMAGE_VERSION_REVISION \
--destination $DOCKER_IMAGE:$DOCKER_IMAGE_VERSION_PATCH \
--destination $DOCKER_IMAGE:$DOCKER_IMAGE_VERSION_MINOR
diff --git a/Dockerfile b/Dockerfile
index 4fea3e2..67d64fd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,7 @@ FROM cookielab/alpine:3.13
ARG KUBE_VERSION
ARG HELM_VERSION
ARG SENTRY_CLI_VERSION
+ARG KUBEDOG_VERSION
ADD kube-connect /usr/local/bin/kube-connect
@@ -19,6 +20,8 @@ RUN rm -rf ./linux-amd64
RUN curl -L https://downloads.sentry-cdn.com/sentry-cli/${SENTRY_CLI_VERSION}/sentry-cli-Linux-x86_64 -o ./sentry-cli
RUN mv ./sentry-cli /usr/local/bin/sentry-cli
RUN chmod +x /usr/local/bin/sentry-cli
+RUN curl -L https://storage.yandexcloud.net/kubedog/targets/releases/v${KUBEDOG_VERSION}/kubedog-linux-amd64-v${KUBEDOG_VERSION} -o /usr/local/bin/kubedog
+RUN chmod +x /usr/local/bin/kubedog
USER 1987
--
GitLab
From 5ce3afdb181be61a6699ca24487cce84611cb3e2 Mon Sep 17 00:00:00 2001
From: Jindrich Skupa <jindrich.skupa@gmail.com>
Date: Wed, 15 Sep 2021 12:40:02 +0200
Subject: [PATCH 2/3] update kubedog version
---
.gitlab-ci.yml | 2 +-
Dockerfile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 78aafa9..d649e91 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ build:
KUBERNETES_VERSION: 1.21.0
HELM_VERSION: 3.5.4
SENTRY_CLI_VERSION: 1.64.1
- KUBEDOG_VERSION: 0.5.1
+ KUBEDOG_VERSION: 0.6.1
before_script:
- mkdir -p $DOCKER_CONFIG
- echo "{\"auths\":{\"https://index.docker.io/v1/\":{\"username\":\"clbbot\",\"password\":\"$DOCKER_HUB_PASSWORD\"}}}" > $DOCKER_CONFIG/config.json
diff --git a/Dockerfile b/Dockerfile
index 67d64fd..87210e8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,7 +20,7 @@ RUN rm -rf ./linux-amd64
RUN curl -L https://downloads.sentry-cdn.com/sentry-cli/${SENTRY_CLI_VERSION}/sentry-cli-Linux-x86_64 -o ./sentry-cli
RUN mv ./sentry-cli /usr/local/bin/sentry-cli
RUN chmod +x /usr/local/bin/sentry-cli
-RUN curl -L https://storage.yandexcloud.net/kubedog/targets/releases/v${KUBEDOG_VERSION}/kubedog-linux-amd64-v${KUBEDOG_VERSION} -o /usr/local/bin/kubedog
+RUN curl -L https://tuf.kubedog.werf.io/targets/releases/${KUBEDOG_VERSION}/linux-amd64/bin/kubedog -o /usr/local/bin/kubedog
RUN chmod +x /usr/local/bin/kubedog
USER 1987
--
GitLab
From 885991c3b7910337ba007783f31609abc85bd333 Mon Sep 17 00:00:00 2001
From: Jindrich Skupa <jindrich.skupa@gmail.com>
Date: Wed, 15 Sep 2021 12:48:12 +0200
Subject: [PATCH 3/3] Add kail for kubernetes log tailing
---
.gitlab-ci.yml | 2 ++
Dockerfile | 6 ++++++
2 files changed, 8 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d649e91..0052f42 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,7 @@ build:
HELM_VERSION: 3.5.4
SENTRY_CLI_VERSION: 1.64.1
KUBEDOG_VERSION: 0.6.1
+ KAIL_VERSION: 0.15.0
before_script:
- mkdir -p $DOCKER_CONFIG
- echo "{\"auths\":{\"https://index.docker.io/v1/\":{\"username\":\"clbbot\",\"password\":\"$DOCKER_HUB_PASSWORD\"}}}" > $DOCKER_CONFIG/config.json
@@ -25,6 +26,7 @@ build:
--build-arg HELM_VERSION="${HELM_VERSION}" \
--build-arg SENTRY_CLI_VERSION="${SENTRY_CLI_VERSION}" \
--build-arg KUBEDOG_VERSION="${KUBEDOG_VERSION}" \
+ --build-arg KAIL_VERSION="${KAIL_VERSION}" \
--destination $DOCKER_IMAGE:$DOCKER_IMAGE_VERSION_REVISION \
--destination $DOCKER_IMAGE:$DOCKER_IMAGE_VERSION_PATCH \
--destination $DOCKER_IMAGE:$DOCKER_IMAGE_VERSION_MINOR
diff --git a/Dockerfile b/Dockerfile
index 87210e8..ba59cf2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,7 @@ ARG KUBE_VERSION
ARG HELM_VERSION
ARG SENTRY_CLI_VERSION
ARG KUBEDOG_VERSION
+ARG KAIL_VERSION
ADD kube-connect /usr/local/bin/kube-connect
@@ -22,6 +23,11 @@ RUN mv ./sentry-cli /usr/local/bin/sentry-cli
RUN chmod +x /usr/local/bin/sentry-cli
RUN curl -L https://tuf.kubedog.werf.io/targets/releases/${KUBEDOG_VERSION}/linux-amd64/bin/kubedog -o /usr/local/bin/kubedog
RUN chmod +x /usr/local/bin/kubedog
+RUN curl -L https://github.com/boz/kail/releases/download/v${KAIL_VERSION}/kail_${KAIL_VERSION}_linux_amd64.tar.gz -o /tmp/kail.tar.gz && \
+ tar xvzf /tmp/kail.tar.gz && \
+ mv kail /usr/local/bin/ && \
+ rm -rf /tmp/*
+RUN chmod +x /usr/local/bin/kail
USER 1987
--
GitLab