Skip to content

Commit

Permalink
Merge branch 'master' into actions/check-for-update-quarkus
Browse files Browse the repository at this point in the history
  • Loading branch information
yurake authored Apr 3, 2023
2 parents 844be23 + e04fb6b commit 2d8888b
Show file tree
Hide file tree
Showing 96 changed files with 115 additions and 115 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/check-for-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
minikube-version:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.4.0
- uses: actions/checkout@v3.5.0
- name: check minikube version
working-directory: ./.github/workflows
run: |
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
kubernetes-version:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.4.0
- uses: actions/checkout@v3.5.0
- name: check kubernetes version
working-directory: ./.github/workflows
run: |
Expand Down Expand Up @@ -125,7 +125,7 @@ jobs:
chaos-mesh-version:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.4.0
- uses: actions/checkout@v3.5.0
- name: check current chaos-mesh version
working-directory: ./.github/workflows
run: |
Expand Down Expand Up @@ -175,7 +175,7 @@ jobs:
quarkus-version:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.4.0
- uses: actions/checkout@v3.5.0
- name: check current quarkus version
run: |
echo "SOURCE_VERSION=$(grep "Quarkus Version" README.md | cut -d '-' -f 2)" >> $GITHUB_ENV
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cis-dockerfile-benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
validation:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.4.0
- uses: actions/checkout@v3.5.0
- name: Sysdig CIS Dockerfile Benchmark
uses: sysdiglabs/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codacy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
steps:
# Checkout the repository to the GitHub Actions runner
- name: Checkout code
uses: actions/checkout@v3.4.0
uses: actions/checkout@v3.5.0

# Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
- name: Run Codacy Analysis CLI
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3.4.0
uses: actions/checkout@v3.5.0

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cypress-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v3.4.0
uses: actions/checkout@v3.5.0
- uses: bahmutov/npm-install@v1
with:
working-directory: kubernetes/monitoring/test/cypress
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 'Checkout Repository'
uses: actions/checkout@v3.4.0
uses: actions/checkout@v3.5.0
- name: 'Dependency Review'
uses: actions/dependency-review-action@v3
2 changes: 1 addition & 1 deletion .github/workflows/devskim.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
security-events: write
steps:
- name: Checkout code
uses: actions/checkout@v3.4.0
uses: actions/checkout@v3.5.0

- name: Run DevSkim scanner
uses: microsoft/DevSkim-Action@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-image-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out Git repository
uses: actions/checkout@v3.4.0
uses: actions/checkout@v3.5.0

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/dockerfile-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
dockerfile_default:
[mysql, postgres, mongodb, rabbitmq, nginx, cassandra]
steps:
- uses: actions/checkout@v3.4.0
- uses: actions/checkout@v3.5.0
- name: lint ${{ matrix.dockerfile_default }}
uses: hadolint/[email protected]
with:
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
server-grpc-quarkus,
]
steps:
- uses: actions/checkout@v3.4.0
- uses: actions/checkout@v3.5.0
- name: lint ${{ matrix.dockerfile_application }}
uses: hadolint/[email protected]
with:
Expand All @@ -73,7 +73,7 @@ jobs:
matrix:
dockerfile_monitoring: [jenkins]
steps:
- uses: actions/checkout@v3.4.0
- uses: actions/checkout@v3.5.0
- name: lint ${{ matrix.dockerfile_monitoring }}
uses: hadolint/[email protected]
with:
Expand All @@ -86,7 +86,7 @@ jobs:
matrix:
dockerfile_ab: [ab]
steps:
- uses: actions/checkout@v3.4.0
- uses: actions/checkout@v3.5.0
- name: lint ${{ matrix.dockerfile_ab }}
uses: hadolint/[email protected]
with:
Expand All @@ -96,7 +96,7 @@ jobs:
dockerfile_postmannewman:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.4.0
- uses: actions/checkout@v3.5.0
- name: lint ${{ matrix.dockerfile_postmannewman }}
uses: hadolint/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/issue-label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
triage:
runs-on: ubuntu-latest
steps:
- uses: github/issue-labeler@v3.0
- uses: github/issue-labeler@v3.1
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
configuration-path: .github/issue-labeler.yml
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/java-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out Git repository
uses: actions/checkout@v3.4.0
uses: actions/checkout@v3.5.0
with:
fetch-depth: 0
- name: Setup GraalVM
Expand Down Expand Up @@ -125,7 +125,7 @@ jobs:
fail-fast: false
steps:
- name: Check out Git repository
uses: actions/checkout@v3.4.0
uses: actions/checkout@v3.5.0
with:
fetch-depth: 0
- name: Setup GraalVM
Expand Down Expand Up @@ -240,7 +240,7 @@ jobs:
fail-fast: false
steps:
- name: Check out Git repository
uses: actions/checkout@v3.4.0
uses: actions/checkout@v3.5.0
with:
fetch-depth: 0
- name: Setup GraalVM
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/k8s-security-config-watch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:
runs-on: ubuntu-latest
steps:
# checkout Master branch
- uses: actions/checkout@v3.4.0
- uses: actions/checkout@v3.5.0
with:
ref: master
path: master
# checkout PR branch
- uses: actions/checkout@v3.4.0
- uses: actions/checkout@v3.5.0
with:
path: candidate
ref: ${{ github.event.pull_request.head.sha }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/kind-chaos-mesh-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
kubectl get pods -n kube-system
helm version
kubectl version
- uses: actions/checkout@v3.4.0
- uses: actions/checkout@v3.5.0
- name: Deploy an application
run: |
kubectl apply -f kubernetes/mysql/mysql-pv.yaml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/kind-quarkus-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3.4.0
uses: actions/checkout@v3.5.0
- name: Kind Cluster
uses: helm/[email protected]
- name: apply minimal service
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/kind-yaml-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3.4.0
uses: actions/checkout@v3.5.0
- name: Kind Cluster
uses: helm/[email protected]
- name: apply all service
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/minikube-quarkus-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3.4.0
uses: actions/checkout@v3.5.0
- name: delete installed software not use
run: |
df -h /
Expand All @@ -29,10 +29,10 @@ jobs:
sudo rm -rf /opt/hostedtoolcache/Ruby
df -h /
- name: start minikube
uses: medyagh/[email protected].11
uses: medyagh/[email protected].12
with:
minikube-version: 1.29.0
kubernetes-version: 1.26.2
kubernetes-version: 1.26.3
driver: docker
container-runtime: docker
cpus: 2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/minikube-security-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3.4.0
uses: actions/checkout@v3.5.0
- name: start minikube
uses: medyagh/[email protected].11
uses: medyagh/[email protected].12
with:
minikube-version: 1.29.0
kubernetes-version: 1.26.2
kubernetes-version: 1.26.3
driver: docker
container-runtime: docker
cpus: 2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/minikube-stress-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ jobs:
fail-fast: false
steps:
- name: checkout
uses: actions/checkout@v3.4.0
uses: actions/checkout@v3.5.0
- name: start minikube
uses: medyagh/[email protected].11
uses: medyagh/[email protected].12
with:
minikube-version: 1.29.0
kubernetes-version: 1.26.2
kubernetes-version: 1.26.3
driver: docker
container-runtime: docker
cpus: 2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/minikube-yaml-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3.4.0
uses: actions/checkout@v3.5.0
- name: start minikube
uses: medyagh/[email protected].11
uses: medyagh/[email protected].12
with:
minikube-version: 1.29.0
kubernetes-version: 1.26.2
kubernetes-version: 1.26.3
driver: docker
container-runtime: docker
cpus: 2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pmd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
server-grpc-quarkus,
]
steps:
- uses: actions/checkout@v3.4.0
- uses: actions/checkout@v3.5.0
- name: Set up JDK
uses: actions/setup-java@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/shell-validator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
validation:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.4.0
- uses: actions/checkout@v3.5.0
- name: Run shellcheck
uses: ludeeus/[email protected]
- name: Run sh-checker
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snyk-infrastructure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.4.0
- uses: actions/checkout@v3.5.0
- name: Run Snyk to check for vulnerabilities
uses: snyk/actions/iac@806182742461562b67788a64410098c9d9b96adb
continue-on-error: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/yaml-validator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
validation:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.4.0
- uses: actions/checkout@v3.5.0
- name: validate yaml manifests
uses: instrumenta/kubeval-action@master
with:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ Sample web application based on k8s. Focus on connecting components, setting k8s
[![Cypress](https://img.shields.io/endpoint?url=https://dashboard.cypress.io/badge/detailed/7rgxn6/master\&style=flat\&logo=cypress)](https://dashboard.cypress.io/projects/7rgxn6/runs)

[![Support JVM Version](https://img.shields.io/badge/JVM-17-yellow.svg?style=flat\&logo=Java)](https://github.com/yurake/k8s-3tier-webapp/actions?query=workflow%3A%22Java+CI%22)
[![Support Quarkus Version](https://img.shields.io/badge/Quarkus-2.16.5-yellow.svg?style=flat\&logo=Quarkus)](https://github.com/yurake/k8s-3tier-webapp/actions?query=workflow%3A%22Java+CI%22)
[![Support Kubernetes Version](https://img.shields.io/badge/Kubernetes-1.26.2-yellow.svg?style=flat\&logo=Kubernetes)](https://github.com/yurake/k8s-3tier-webapp/actions?query=workflow%3A%22Minikube+CI%22)
[![Support Kubernetes Version](https://img.shields.io/badge/Kubernetes-1.26.3-yellow.svg?style=flat\&logo=Kubernetes)](https://github.com/yurake/k8s-3tier-webapp/actions?query=workflow%3A%22Minikube+CI%22)
[![Support Minikube Version](https://img.shields.io/badge/Minikube-1.29.0-yellow.svg?style=flat\&logo=Kubernetes)](https://github.com/yurake/k8s-3tier-webapp/actions?query=workflow%3A%22Minikube+CI%22)
[![Support kind Version](https://img.shields.io/badge/kind-2.5.1-yellow.svg?style=flat\&logo=Kubernetes)](https://github.com/yurake/k8s-3tier-webapp/actions?query=workflow%3A%22kind+CI%22)
[![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](LICENSE/)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-jvm
#
###
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085.1679482090

ARG JAVA_PACKAGE=java-17-openjdk-headless
ARG RUN_JAVA_VERSION=1.3.8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-legacy-jar
#
###
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085.1679482090

ARG JAVA_PACKAGE=java-17-openjdk-headless
ARG RUN_JAVA_VERSION=1.3.8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# docker run -i --rm -p 8080:8080 quarkus/getting-started
#
###
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085.1679482090
WORKDIR /work/
RUN chown 1001 /work \
&& chmod "g+rwX" /work \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-jvm
#
###
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085.1679482090

ARG JAVA_PACKAGE=java-17-openjdk-headless
ARG RUN_JAVA_VERSION=1.3.8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-legacy-jar
#
###
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085.1679482090

ARG JAVA_PACKAGE=java-17-openjdk-headless
ARG RUN_JAVA_VERSION=1.3.8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# docker run -i --rm -p 8080:8080 quarkus/getting-started
#
###
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085.1679482090
WORKDIR /work/
RUN chown 1001 /work \
&& chmod "g+rwX" /work \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/getting-started-jvm
#
###
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085.1679482090

ARG JAVA_PACKAGE=java-17-openjdk-headless
ARG RUN_JAVA_VERSION=1.3.8
Expand Down
Loading

0 comments on commit 2d8888b

Please sign in to comment.