Skip to content

Commit

Permalink
feat: Image Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
ArthurVardevanyan committed Feb 17, 2024
1 parent f79c3fc commit bb4e51c
Showing 14 changed files with 56 additions and 39 deletions.
3 changes: 1 addition & 2 deletions .tekton/apache-php-image.yaml
Original file line number Diff line number Diff line change
@@ -6,8 +6,7 @@ metadata:
annotations:
pipelinesascode.tekton.dev/max-keep-runs: "1"
pipelinesascode.tekton.dev/on-cel-expression: |
target_branch == "main" && "containers/apache-php/containerfile".pathChanged()
# event == "pull_request" &&
event == "pull_request" && target_branch == "main" && "containers/apache-php/containerfile".pathChanged()
pipelinesascode.tekton.dev/target-namespace: "homelab"
pipelinesascode.tekton.dev/task: "https://raw.githubusercontent.com/ArthurVardevanyan/HomeLab/main/tekton/tasks/git-clone/0.9.1/git-clone.yaml"
pipelinesascode.tekton.dev/task-1: "https://raw.githubusercontent.com/ArthurVardevanyan/HomeLab/main/tekton/tasks/buildah/0.5.1/buildah.yaml"
3 changes: 1 addition & 2 deletions .tekton/toolbox-image.yaml
Original file line number Diff line number Diff line change
@@ -6,8 +6,7 @@ metadata:
annotations:
pipelinesascode.tekton.dev/max-keep-runs: "1"
pipelinesascode.tekton.dev/on-cel-expression: |
target_branch == "main" && "containers/toolbox/containerfile".pathChanged()
# event == "pull_request" &&
event == "pull_request" && target_branch == "main" && "containers/toolbox/containerfile".pathChanged()
pipelinesascode.tekton.dev/target-namespace: "homelab"
pipelinesascode.tekton.dev/task: "https://raw.githubusercontent.com/ArthurVardevanyan/HomeLab/main/tekton/tasks/git-clone/0.9.1/git-clone.yaml"
pipelinesascode.tekton.dev/task-1: "https://raw.githubusercontent.com/ArthurVardevanyan/HomeLab/main/tekton/tasks/buildah/0.5.1/buildah.yaml"
3 changes: 1 addition & 2 deletions .tekton/udi-image.yaml
Original file line number Diff line number Diff line change
@@ -6,8 +6,7 @@ metadata:
annotations:
pipelinesascode.tekton.dev/max-keep-runs: "1"
pipelinesascode.tekton.dev/on-cel-expression: |
target_branch == "main" && "containers/udi/containerfile".pathChanged()
# event == "pull_request" &&
event == "pull_request" && target_branch == "main" && "containers/udi/containerfile".pathChanged()
pipelinesascode.tekton.dev/target-namespace: "homelab"
pipelinesascode.tekton.dev/task: "https://raw.githubusercontent.com/ArthurVardevanyan/HomeLab/main/tekton/tasks/git-clone/0.9.1/git-clone.yaml"
pipelinesascode.tekton.dev/task-1: "https://raw.githubusercontent.com/ArthurVardevanyan/HomeLab/main/tekton/tasks/buildah/0.5.1/buildah.yaml"
6 changes: 3 additions & 3 deletions ansible/playbooks/desktop/hashicorp.yaml
Original file line number Diff line number Diff line change
@@ -3,10 +3,10 @@
become: true
user: arthur
tasks:
- name: Add MariaDB Repo
- name: Add hashicorp Repo
ansible.builtin.yum_repository:
name: MariaDB
description: MariaDB YUM repo
name: hashicorp.repo
description: hashicorp.repo
baseurl: https://rpm.releases.hashicorp.com/fedora/hashicorp.repo
- name: Install Terraform & Vault
yum:
2 changes: 1 addition & 1 deletion ansible/playbooks/desktop/mariadb.yaml
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
ansible.builtin.yum_repository:
name: MariaDB
description: MariaDB YUM repo
baseurl: https://rpm.mariadb.org/10.11/fedora/38/$basearch
baseurl: https://rpm.mariadb.org/10.11/fedora39-amd64
gpgkey: https://rpm.mariadb.org/RPM-GPG-KEY-MariaDB
- name: install MariaDB-client
yum:
37 changes: 28 additions & 9 deletions containers/toolbox/containerfile
Original file line number Diff line number Diff line change
@@ -1,31 +1,50 @@
FROM registry.access.redhat.com/ubi9-minimal:9.3-1361.1699548032
FROM registry.access.redhat.com/ubi9-minimal:9.3-1552

COPY ./containers/toolbox/repos /etc/yum.repos.d/
#COPY ./repos /etc/yum.repos.d/

ENV \
ARGOCD_VAULT_VERSION=1.17.0 \
OKD_VERSION=4.14.0-0.okd-2023-12-01-225814 \
OPENTOFU_VERSION=1.6.0-beta1 \
VAULT_VERSION=1.15.3 \
OKD_VERSION=4.15.0-0.okd-2024-02-10-035534 \
OPENTOFU_VERSION=1.6.1 \
VAULT_VERSION=1.15.5 \
KO_VERSION=0.15.1 \
GO_VERSION=1.21.4 \
GO_VERSION=1.22.0 \
GH_VERSION=2.44.1 \
# 0.6.3 Not Working
KUBECONFORM_VERSION=0.6.2 \
MARKDOWNLINT_VERSION=0.32.1 \
PRETTIER_VERSION=3.1.0 \
SHELL_CHECK_VERSION=0.9.0 \
MARKDOWNLINT_CLI_VERSION=0.39.0 \
PRETTIER_CLI_VERSION=3.2.5 \
HOME=/tmp \
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/go/bin \
KICK="0"

RUN rpm -ivh https://github.com/opentofu/opentofu/releases/download/v${OPENTOFU_VERSION}/tofu_${OPENTOFU_VERSION}_amd64.rpm && \
microdnf install --nodocs -y --disableplugin=subscription-manager libpmem -y &&\
microdnf install --nodocs -y --disableplugin=subscription-manager \
sshpass logrotate rsync git jq unzip MariaDB-client ansible google-cloud-cli tar procps-ng make nodejs ShellCheck -y \
sshpass logrotate rsync git jq unzip ansible google-cloud-cli tar procps-ng make nodejs ShellCheck -y && \
microdnf install --nodocs -y --disableplugin=subscription-manager MariaDB-client --disablerepo=centos-9-appstream -y \
&& ln -s /usr/bin/python3.11 /usr/local/bin/python \
&& rm -rf /var/cache/* /var/lib/rpm/* && \
rm -rf /usr/lib64/google-cloud-sdk/{platform,data,bin/anthoscli}

## gh-cli
RUN \
TEMP_DIR="$(mktemp -d)"; \
cd "${TEMP_DIR}"; \
GH_ARCH="linux_amd64"; \
GH_TGZ="gh_${GH_VERSION}_${GH_ARCH}.tar.gz"; \
GH_TGZ_URL="https://github.com/cli/cli/releases/download/v${GH_VERSION}/${GH_TGZ}"; \
GH_CHEKSUMS_URL="https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_checksums.txt"; \
curl -sSLO "${GH_TGZ_URL}"; \
curl -sSLO "${GH_CHEKSUMS_URL}"; \
sha256sum --ignore-missing -c "gh_${GH_VERSION}_checksums.txt" 2>&1 | grep OK; \
tar -zxvf "${GH_TGZ}"; \
mv "gh_${GH_VERSION}_${GH_ARCH}"/bin/gh /usr/local/bin/; \
mv "gh_${GH_VERSION}_${GH_ARCH}"/share/man/man1/* /usr/local/share/man/man1; \
cd -; \
rm -rf "${TEMP_DIR}"

RUN npm install -g markdownlint-cli@${MARKDOWNLINT_CLI_VERSION} prettier@${PRETTIER_CLI_VERSION}

RUN curl -L -o argocd-vault-plugin https://github.com/argoproj-labs/argocd-vault-plugin/releases/download/v${ARGOCD_VAULT_VERSION}/argocd-vault-plugin_${ARGOCD_VAULT_VERSION}_linux_amd64 && \
4 changes: 2 additions & 2 deletions containers/toolbox/repos/MariaDB.repo
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[mariadb]
[MariaDB]
name = MariaDB
baseurl = https://rpm.mariadb.org/10.6/rhel/$releasever/$basearch
baseurl = https://rpm.mariadb.org/10.11/rhel9-amd64
gpgkey= https://rpm.mariadb.org/RPM-GPG-KEY-MariaDB
gpgcheck=0
21 changes: 11 additions & 10 deletions containers/udi/containerfile
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
# https://github.com/devfile/developer-images
# https://registry.access.redhat.com/ubi9/ubi
FROM registry.access.redhat.com/ubi9:9.3-1361.1699548029
FROM registry.access.redhat.com/ubi9:9.3-1552

USER 0

ENV \
ARGOCD_VAULT_VERSION=1.17.0 \
OKD_VERSION=4.14.0-0.okd-2023-12-01-225814 \
OPENTOFU_VERSION=1.6.0-beta1 \
VAULT_VERSION=1.15.3 \
OKD_VERSION=4.15.0-0.okd-2024-02-10-035534 \
OPENTOFU_VERSION=1.6.1 \
VAULT_VERSION=1.15.5 \
KO_VERSION=0.15.1 \
GO_VERSION=1.21.4 \
GH_VERSION=2.39.2 \
GO_VERSION=1.22.0 \
GH_VERSION=2.44.1 \
# 0.6.3 Not Working
KUBECONFORM_VERSION=0.6.2 \
MARKDOWNLINT_VERSION=0.32.1 \
PRETTIER_VERSION=3.1.0 \
SHELL_CHECK_VERSION=0.9.0 \
MARKDOWNLINT_CLI_VERSION=0.39.0 \
PRETTIER_CLI_VERSION=3.2.5 \
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/go/bin \
HOME=/home/user \
SHELL=/bin/zsh
@@ -29,10 +28,12 @@ COPY ./containers/udi/repos /etc/yum.repos.d/
RUN dnf install --disableplugin=subscription-manager libbrotli compat-openssl11 -y

RUN rpm -ivh https://github.com/opentofu/opentofu/releases/download/v${OPENTOFU_VERSION}/tofu_${OPENTOFU_VERSION}_amd64.rpm && \
dnf install --nodocs -y --disableplugin=subscription-manager libpmem -y &&\
dnf install --disableplugin=subscription-manager \
diffutils git iproute jq less lsof man nano procps \
perl-Digest-SHA net-tools openssh-clients rsync socat sudo time vim wget zip pinentry \
sshpass logrotate unzip MariaDB-client google-cloud-cli tar procps-ng make nodejs ShellCheck -y \
sshpass logrotate unzip google-cloud-cli tar procps-ng make nodejs ShellCheck -y \
&& dnf install --nodocs -y --disableplugin=subscription-manager MariaDB-client --disablerepo=centos-9-appstream -y \
&& dnf update -y && dnf clean all \
&& ln -s /usr/bin/python3.11 /usr/local/bin/python && \
rm -rf /usr/lib64/google-cloud-sdk/{platform,data,bin/anthoscli} && \
2 changes: 1 addition & 1 deletion containers/udi/repos/MariaDB.repo
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[mariadb]
name = MariaDB
baseurl = https://rpm.mariadb.org/10.6/rhel/$releasever/$basearch
baseurl = https://rpm.mariadb.org/10.11/rhel9-amd64
gpgkey= https://rpm.mariadb.org/RPM-GPG-KEY-MariaDB
gpgcheck=0
2 changes: 1 addition & 1 deletion kubernetes/eclipse-che/base/subscription.yaml
Original file line number Diff line number Diff line change
@@ -26,4 +26,4 @@ spec:
name: eclipse-che
source: community-operators
sourceNamespace: openshift-marketplace
startingCSV: eclipse-che.v7.80.0
startingCSV: eclipse-che.v7.81.0
2 changes: 1 addition & 1 deletion kubernetes/external-secrets-operator/base/kyverno.yaml
Original file line number Diff line number Diff line change
@@ -19,4 +19,4 @@ spec:
spec:
containers:
- (image): "ghcr.io/external-secrets/external-secrets-helm-operator@sha256:8792003c97d3982ad246cf6a43103d8968cd04fd126a719bc5ee49ea6248ecb3"
image: "ghcr.io/external-secrets/external-secrets-helm-operator@sha256:fb433d368f2f91efc1f637de80d670445a76a3577a7c9835f8fc9ad8bc630376"
image: "ghcr.io/external-secrets/external-secrets-helm-operator@sha256:99d5f38d3da4a35a430baf1892f3425ef1dc86639663720914443784414adbfb"
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ spec:
image:
pullPolicy: IfNotPresent
repository: ghcr.io/external-secrets/external-secrets
tag: v0.9.11@sha256:5660a29f1bfbf3666ebd99f692cea46fb12fa209db4fa460a97fd8c00f991671
tag: v0.9.12@sha256:5f1f8d8493931953ee9b76fc83b7748d18785f455f463372cf9a88d3616bce6a
nameOverride: ""
priorityClassName: ""
prometheus:
@@ -38,7 +38,7 @@ spec:
image:
pullPolicy: IfNotPresent
repository: ghcr.io/external-secrets/external-secrets
tag: v0.9.11@sha256:5660a29f1bfbf3666ebd99f692cea46fb12fa209db4fa460a97fd8c00f991671
tag: v0.9.12@sha256:5f1f8d8493931953ee9b76fc83b7748d18785f455f463372cf9a88d3616bce6a
installCRDs: false
leaderElect: false
nameOverride: ""
@@ -65,7 +65,7 @@ spec:
image:
pullPolicy: IfNotPresent
repository: ghcr.io/external-secrets/external-secrets
tag: v0.9.11@sha256:5660a29f1bfbf3666ebd99f692cea46fb12fa209db4fa460a97fd8c00f991671
tag: v0.9.12@sha256:5f1f8d8493931953ee9b76fc83b7748d18785f455f463372cf9a88d3616bce6a
nameOverride: ""
priorityClassName: ""
prometheus:
Original file line number Diff line number Diff line change
@@ -11,4 +11,4 @@ spec:
name: external-secrets-operator
source: community-operators
sourceNamespace: openshift-marketplace
startingCSV: external-secrets-operator.v0.9.11
startingCSV: external-secrets-operator.v0.9.12
2 changes: 1 addition & 1 deletion tekton/tasks/buildah/0.5.1/buildah.yaml
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ spec:
description: Reference of the image buildah will produce.
- name: BUILDER_IMAGE
description: The location of the buildah builder image.
default: quay.io/buildah/stable:v1.32.0@sha256:0e81a2aca1c8bdcb86316162f4b1cb227f6f046e6c26d0b3012402a8d80d24b3
default: quay.io/buildah/stable:v1.34.0@sha256:99332bd46d1285227c4b15aea71358678ecdc012f6e88a01753356efb1ea49aa
- name: STORAGE_DRIVER
description: Set buildah storage driver
default: vfs #overlay

0 comments on commit bb4e51c

Please sign in to comment.