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

Updated ubi version to latest and fixed CVEs #1535

Open
wants to merge 3 commits into
base: 0.0.25
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/get-pr-number.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
output1: ${{ steps.pr.outputs.pr_number }}
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Get PR number
id: pr
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/rm-release-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ jobs:
releasetest:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Minikube
uses: manusa/[email protected]
with:
minikube version: 'v1.16.0'
kubernetes version: 'v1.19.2'
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: kruize/autotune
path: autotune
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:

- name: Upload results
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: kruize_test_results
path: ./kruize_test_results.tar
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-on-comment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:

- name: Upload results
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: kruize_test_results
path: ./kruize_test_results.tar
Expand Down
70 changes: 5 additions & 65 deletions .github/workflows/test-on-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,75 +13,15 @@ on:
workflow_dispatch:

jobs:
# This workflow contains two jobs called "build autotune" and "build crc"
build_autotune:
# The type of runner that the job will run on
runs-on: ubuntu-20.04

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3
- name: Setup Minikube
uses: manusa/[email protected]
with:
minikube version: 'v1.16.0'
kubernetes version: 'v1.19.2'
- name: Build autotune
run: |
echo Build autotune
pr_number=${{ github.event.pull_request.number }}
echo "pr_number=${pr_number}" >> "$GITHUB_ENV"
./build.sh -i autotune_operator:pr_${pr_number}
docker images | grep autotune
- name: Check cluster info on minikube
run: |
kubectl cluster-info
kubectl get pods -n kube-system
- name: Install Prometheus on minikube
run: |
echo Install Prometheus on minikube
cd scripts
./prometheus_on_minikube.sh -as
- name: Deploy kruize in experiment mode
run: |
echo Deploy kruize in experiment mode
cp ./manifests/autotune/autotune-operator-deployment.yaml_template ./manifests/autotune/autotune-operator-deployment.yaml_template.old
sed -e "s/imagePullPolicy: Always/imagePullPolicy: IfNotPresent/g" ./manifests/autotune/autotune-operator-deployment.yaml_template.old > ./manifests/autotune/autotune-operator-deployment.yaml_template
echo "***************************************************************"
cat ./manifests/autotune/autotune-operator-deployment.yaml_template
echo "***************************************************************"

echo "PR_NUMBER = ${{ env.pr_number }}"
./deploy.sh -c minikube -i autotune_operator:pr_${{ env.pr_number }}

sleep 20
- name: Capture ffdc logs
if: always()
run: |
echo "Capturing ffdc logs"
./scripts/ffdc.sh -d ${GITHUB_WORKSPACE}
- name: Archive results
if: always()
run: |
cd ${GITHUB_WORKSPACE}
tar cvf autotune_results.tar kruize_*log.txt

- name: Upload results
if: always()
uses: actions/upload-artifact@v3
with:
name: autotune-results
path: ./autotune_results.tar
retention-days: 2


# This workflow builds the kruize image and runs an end-to-end test to validate the remote monitoring workflow
build_crc:
# The type of runner that the job will run on
runs-on: ubuntu-20.04

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: kruize/autotune
- name: Setup Minikube
Expand Down Expand Up @@ -128,7 +68,7 @@ jobs:

- name: Upload results
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: crc-results
path: ./crc_results.tar
Expand All @@ -141,7 +81,7 @@ jobs:

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Minikube
uses: manusa/[email protected]
with:
Expand Down Expand Up @@ -179,7 +119,7 @@ jobs:

- name: Upload results
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: crc-manifest-results
path: ./crc_manifest_results.tar
Expand Down
63 changes: 7 additions & 56 deletions .github/workflows/test-on-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Get PR number
run: |
echo "PR_NUMBER=${{ needs.get_pr.outputs.pr_number }}" >> $GITHUB_ENV
Expand All @@ -37,64 +37,15 @@ jobs:
./build.sh -i autotune_operator:pr_${{ env.PR_NUMBER }} -o autotune_optuna:pr_${{ env.PR_NUMBER }}
docker images | grep autotune
- name: docker login
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: quay.io
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Docker Push
run: |
docker tag autotune_operator:pr_${{ env.PR_NUMBER }} kruize/autotune_operator:pr_${{ env.PR_NUMBER }}
docker push kruize/autotune_operator:pr_${{ env.PR_NUMBER }}

deploy_autotune:
# The type of runner that the job will run on
needs: [build_job, get_pr]

runs-on: ubuntu-20.04

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3
- name: Get PR number
run: |
echo "PR_NUMBER=${{ needs.get_pr.outputs.pr_number }}" >> $GITHUB_ENV
- name: Setup Minikube
uses: manusa/[email protected]
with:
minikube version: 'v1.16.0'
kubernetes version: 'v1.19.2'
- name: Display cluster info
run: |
kubectl cluster-info
kubectl get pods -n kube-system
- name: Install Prometheus on minikube
run: |
echo Install Prometheus on minikube
cd scripts
./prometheus_on_minikube.sh -as
- name: Deploy kruize in experiment mode
run: |
echo Deploy Kruize in experiment mode
echo "PR_NUMBER = ${{ env.PR_NUMBER }}"
./deploy.sh -c minikube -i kruize/autotune_operator:pr_${{ env.PR_NUMBER }}
sleep 20
- name: Capture ffdc logs
if: always()
run: |
./scripts/ffdc.sh -d ${GITHUB_WORKSPACE}
- name: Archive results
if: always()
run: |
cd ${GITHUB_WORKSPACE}
tar cvf autotune_results.tar kruize_*log.txt

- name: Upload results
if: always()
uses: actions/upload-artifact@v3
with:
name: autotune-results
path: ./autotune_results.tar
retention-days: 2
docker tag autotune_operator:pr_${{ env.PR_NUMBER }} quay.io/kruize/autotune_operator:pr_${{ env.PR_NUMBER }}
docker push quay.io/kruize/autotune_operator:pr_${{ env.PR_NUMBER }}

deploy_crc:
# The type of runner that the job will run on
Expand All @@ -103,7 +54,7 @@ jobs:

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Get PR number
run: |
echo "PR_NUMBER=${{ needs.get_pr.outputs.pr_number }}" >> $GITHUB_ENV
Expand Down Expand Up @@ -143,7 +94,7 @@ jobs:

- name: Upload results
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: crc-results
path: ./crc_results.tar
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.autotune
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
##########################################################
# Build Docker Image
##########################################################
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4 as mvnbuild-jdk21
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5-1741599792 as mvnbuild-jdk21
ARG USER=autotune
ARG AUTOTUNE_HOME=/home/$USER

Expand Down Expand Up @@ -48,7 +48,7 @@ RUN jlink --strip-debug --compress 2 --no-header-files --no-man-pages --module-p
# Runtime Docker Image
##########################################################
# Use ubi-minimal as the base image
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5-1741599792

ARG AUTOTUNE_VERSION
ARG USER=autotune
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ spec:
done
containers:
- name: kruize
image: kruize/autotune_operator:0.0.25_rm
image: kruize/autotune_operator:0.0.25.1_rm
imagePullPolicy: Always
volumeMounts:
- name: config-volume
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ spec:
done
containers:
- name: kruize
image: kruize/autotune_operator:0.0.25_rm
image: kruize/autotune_operator:0.0.25.1_rm
imagePullPolicy: Always
volumeMounts:
- name: config-volume
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ spec:
spec:
containers:
- name: kruize
image: quay.io/kruize/autotune_operator:0.0.25_rm
image: quay.io/kruize/autotune_operator:0.0.25.1_rm
imagePullPolicy: Always
volumeMounts:
- name: config-volume
Expand Down Expand Up @@ -216,7 +216,7 @@ spec:
spec:
containers:
- name: kruizecronjob
image: quay.io/kruize/autotune_operator:0.0.25_rm
image: quay.io/kruize/autotune_operator:0.0.25.1_rm
imagePullPolicy: Always
volumeMounts:
- name: config-volume
Expand Down Expand Up @@ -342,7 +342,7 @@ spec:
spec:
containers:
- name: kruizedeletejob
image: quay.io/kruize/autotune_operator:0.0.25_rm
image: quay.io/kruize/autotune_operator:0.0.25.1_rm
imagePullPolicy: Always
volumeMounts:
- name: config-volume
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ spec:
done
containers:
- name: kruize
image: quay.io/kruize/autotune_operator:0.0.25_rm
image: quay.io/kruize/autotune_operator:0.0.25.1_rm
imagePullPolicy: Always
volumeMounts:
- name: config-volume
Expand Down Expand Up @@ -242,7 +242,7 @@ spec:
spec:
containers:
- name: kruizecronjob
image: kruize/autotune_operator:0.0.25_rm
image: kruize/autotune_operator:0.0.25.1_rm
imagePullPolicy: Always
volumeMounts:
- name: config-volume
Expand Down Expand Up @@ -368,7 +368,7 @@ spec:
spec:
containers:
- name: kruizedeletejob
image: kruize/autotune_operator:0.0.25_rm
image: kruize/autotune_operator:0.0.25.1_rm
imagePullPolicy: Always
volumeMounts:
- name: config-volume
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ spec:
done
containers:
- name: kruize
image: kruize/autotune_operator:0.0.25_rm
image: kruize/autotune_operator:0.0.25.1_rm
imagePullPolicy: Always
volumeMounts:
- name: config-volume
Expand Down Expand Up @@ -314,7 +314,7 @@ spec:
spec:
containers:
- name: kruizecronjob
image: kruize/autotune_operator:0.0.25_rm
image: kruize/autotune_operator:0.0.25.1_rm
imagePullPolicy: Always
volumeMounts:
- name: config-volume
Expand Down Expand Up @@ -355,7 +355,7 @@ spec:
spec:
containers:
- name: kruizedeletejob
image: kruize/autotune_operator:0.0.25_rm
image: kruize/autotune_operator:0.0.25.1_rm
imagePullPolicy: Always
volumeMounts:
- name: config-volume
Expand Down
Loading
Loading