Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Rundeck 4.17.6 #8

Merged
merged 7 commits into from
Apr 26, 2024
Merged

Upgrade to Rundeck 4.17.6 #8

merged 7 commits into from
Apr 26, 2024

Conversation

chaopanubo
Copy link
Contributor

@chaopanubo chaopanubo commented Jan 18, 2024

Andrew's PR for bug fix had been merged by the code owner.

@chaopanubo chaopanubo marked this pull request as ready for review January 18, 2024 23:22
Copy link
Member

@macropin macropin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rundeck does not support JDK17. Only Java 11 is supported. Ref: https://docs.rundeck.com/docs/administration/install/system-requirements.html

@chaopanubo chaopanubo requested a review from macropin January 25, 2024 06:03
Dockerfile Outdated
Comment on lines 84 to 99
# Install k8s-sidecar
RUN set -x \
&& apt-get update \
&& apt-get -y install git python3.11-venv python3 python3-pip gcc \
&& cd /tmp \
&& git clone https://github.com/kiwigrid/k8s-sidecar.git \
&& cd k8s-sidecar \
# merged fixes
&& git checkout 392b8392c4511b0ae6f8d52beb1eda77a07ec970 \
&& cd src \
&& pip install -r requirements.txt \
&& python3 -m venv .venv && .venv/bin/pip install --no-cache-dir -U pip setuptools \
&& .venv/bin/pip install --no-cache-dir -r requirements.txt \
&& rm requirements.txt \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
&& cp -a /tmp/k8s-sidecar/src/ /sidecar \
&& rm -rf /tmp/k8s-sidecar \
;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please pin this install to a specific release. eg git checkout 1.25.3


export DEBIAN_FRONTEND=noninteractive

echo "deb http://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/openjdk-11.list
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is this script doing? Are we just installing the debian 11 (bullseye) packing on debian 12 (bookworm)? This is probably not safe.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

diff --git a/Dockerfile b/Dockerfile
index d0600dd..793c60f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,10 +12,14 @@ RUN set -x \
   ;

 # Install JDK11
-COPY install-openjdk-11.sh /
 RUN set -x \
   && mkdir /etc/ssl/certs/java/ \
-  && /install-openjdk-11.sh \
+  && wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add - \
+  && echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list \
+  && apt-get update \
+  && apt-get install --no-install-recommends --no-install-suggests -y temurin-11-jdk \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/* \
   ;

 # Install Google Cloud SDK

@macropin what do you think about using adoptium instead? I'll push this to the branch/PR if you agree.

https://adoptium.net/blog/2021/12/eclipse-temurin-linux-installers-available/

install_helm 3.9.4
install_helm 3.10.3
install_helm 3.11.2
install_helm 3.12.3

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add Helm 3.13.x (what ever the latest 3.13 is)

install-tools.sh Outdated

install_helm 3.6.3
install_helm 3.7.2
install_helm 3.8.2
install_helm 3.9.4
install_helm 3.10.3
install_helm 3.11.2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upgrade to 3.11.3

install-tools.sh Outdated

install_kubectl 1.21.3
install_kubectl 1.22.4
install_kubectl 1.23.17
install_kubectl 1.24.12
install_kubectl 1.25.8
install_kubectl 1.26.3
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upgrade to the latest 1.24.x, 1.25.x and 1.26.x releases

Add 1.27 and 1.28 latest releases

@chaopanubo chaopanubo requested review from trnubo and macropin January 30, 2024 23:16
@trnubo
Copy link
Member

trnubo commented Apr 24, 2024

Please update this PR.

We want to:

  • Stick to debian:11 upstream
  • Install AWS CLI v1 via pip instead of apt-get
  • Stick to rundeck 4.x versions
  • Check all tools are upto date
  • Include k8s 1.29
  • Include helm 3.14.x

@macropin macropin changed the title Upgrade to debian12 and rundeck4.17.4 Upgrade to debian12 and rundeck 4.17.6 Apr 26, 2024
@macropin macropin changed the title Upgrade to debian12 and rundeck 4.17.6 Upgrade to Rundeck 4.17.6 Apr 26, 2024
Copy link
Member

@macropin macropin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other than that whitespace change. LGTM

Dockerfile Outdated
&& cp -a /tmp/k8s-sidecar/src/ /sidecar \
&& rm -rf /tmp/k8s-sidecar \
;

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unnecessary whitespace

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

@chaopanubo
Copy link
Contributor Author

Other than that whitespace change. LGTM

Thank you, Andrew.

@chaopanubo chaopanubo merged commit 33a2665 into main Apr 26, 2024
1 check passed
@macropin macropin deleted the debian12 branch April 26, 2024 05:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants