Skip to content

Commit

Permalink
Merge pull request #3045 from yurake/feature
Browse files Browse the repository at this point in the history
Incorrect list-item indent: add 2 spaces #3016
  • Loading branch information
yurake authored Feb 14, 2023
2 parents 9e6df4e + 13890e2 commit ba0350d
Show file tree
Hide file tree
Showing 7 changed files with 64 additions and 64 deletions.
4 changes: 4 additions & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ engines:
checks:
MD007:
enabled: false
MD009:
enabled: false
MD013:
enabled: false
6 changes: 3 additions & 3 deletions .github/workflows/check-for-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ jobs:
working-directory: ./.github/workflows
run: |
echo "SOURCE_QUARKUS_VERSION=$(grep "kubernetes-version" minikube-quarkus-ci.yml | awk '{print $2}')" >> $GITHUB_ENV
echo "SOURCE_YAML_VERSION=$(grep "k8s-version" minikube-yaml-ci.yml | awk '{print $2}')" >> $GITHUB_ENV
echo "SOURCE_STRESS_VERSION=$(grep "k8s-version" minikube-stress-ci.yml | awk '{print $2}')" >> $GITHUB_ENV
echo "SOURCE_SECURITY_VERSION=$(grep "k8s-version" minikube-security-ci.yml | awk '{print $2}')" >> $GITHUB_ENV
echo "SOURCE_YAML_VERSION=$(grep "kubernetes-version" minikube-yaml-ci.yml | awk '{print $2}')" >> $GITHUB_ENV
echo "SOURCE_STRESS_VERSION=$(grep "kubernetes-version" minikube-stress-ci.yml | awk '{print $2}')" >> $GITHUB_ENV
echo "SOURCE_SECURITY_VERSION=$(grep "kubernetes-version" minikube-security-ci.yml | awk '{print $2}')" >> $GITHUB_ENV
echo "SOURCE_DOC_VERSION=$(grep "Kubernetes Version" ../../README.md | cut -d '-' -f 2)" >> $GITHUB_ENV
echo "TARGET_KUBERNETES_VERSION=$(curl -s https://api.github.com/repos/kubernetes/kubernetes/releases | jq -r '.[].tag_name' | grep -v '-' | sort -t'.' -k2,2n | tail -n 1 | tr -d 'v')" >> $GITHUB_ENV
- name: check current diff
Expand Down
20 changes: 8 additions & 12 deletions .github/workflows/minikube-yaml-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,18 @@ jobs:
steps:
- name: checkout
uses: actions/[email protected]
- name: setup minikube
uses: opsgang/[email protected]
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: "true"
- name: start minikube
uses: medyagh/[email protected]
with:
minikube-version: 1.29.0
k8s-version: 1.26.1
kubernetes-version: 1.26.1
driver: docker
container-runtime: docker
cpus: 2
memory: 6144
addons: ingress
- name: minikube settings
run: |
sudo apt install conntrack
minikube config set vm-driver docker
minikube config set cpus 2
minikube config set memory 6144
minikube start
minikube update-context
minikube addons enable ingress
minikube addons list
# https://minikube.sigs.k8s.io/docs/drivers/docker/#troubleshooting
sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Sample web application based on k8s. Focus on connecting components, setting k8s
[![Snyk](https://github.com/yurake/k8s-3tier-webapp/actions/workflows/snyk-infrastructure.yml/badge.svg)](https://github.com/yurake/k8s-3tier-webapp/actions/workflows/snyk-infrastructure.yml)
[![Codacy](https://github.com/yurake/k8s-3tier-webapp/actions/workflows/codacy.yml/badge.svg)](https://github.com/yurake/k8s-3tier-webapp/actions/workflows/codacy.yml)
[![pmd](https://github.com/yurake/k8s-3tier-webapp/actions/workflows/pmd.yml/badge.svg)](https://github.com/yurake/k8s-3tier-webapp/actions/workflows/pmd.yml)
[![pages-build-deployment](https://github.com/yurake/k8s-3tier-webapp/actions/workflows/pages/pages-build-deployment/badge.svg)](https://github.com/yurake/k8s-3tier-webapp/actions/workflows/pages/pages-build-deployment)\\
[![pages-build-deployment](https://github.com/yurake/k8s-3tier-webapp/actions/workflows/pages/pages-build-deployment/badge.svg)](https://github.com/yurake/k8s-3tier-webapp/actions/workflows/pages/pages-build-deployment)
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/2844382aa110487e94bba8369267476e)](https://www.codacy.com/gh/yurake/k8s-3tier-webapp/dashboard?utm_source=github.com\&utm_medium=referral\&utm_content=yurake/k8s-3tier-webapp\&utm_campaign=Badge_Grade)
[![Codacy Badge](https://app.codacy.com/project/badge/Coverage/2844382aa110487e94bba8369267476e)](https://www.codacy.com/gh/yurake/k8s-3tier-webapp/dashboard?utm_source=github.com\&utm_medium=referral\&utm_content=yurake/k8s-3tier-webapp\&utm_campaign=Badge_Coverage)
[![CodeFactor](https://www.codefactor.io/repository/github/yurake/k8s-3tier-webapp/badge)](https://www.codefactor.io/repository/github/yurake/k8s-3tier-webapp) [![Maintainability](https://api.codeclimate.com/v1/badges/64a1de96c5eb777b9db1/maintainability)](https://codeclimate.com/github/yurake/k8s-3tier-webapp/maintainability)
Expand All @@ -34,14 +34,14 @@ Sample web application based on k8s. Focus on connecting components, setting k8s
[![Codiga Code Grade](https://api.codiga.io/project/34687/status/svg)](https://app.codiga.io)
[![DeepSource Active Issues](https://deepsource.io/gh/yurake/k8s-3tier-webapp.svg/?label=active+issues\&show_trend=true\&token=Y64jIS9a54isgV4hi4_uuerZ)](https://deepsource.io/gh/yurake/k8s-3tier-webapp/?ref=repository-badge)
[![DeepSource Resluved Issues](https://deepsource.io/gh/yurake/k8s-3tier-webapp.svg/?label=resolved+issues\&show_trend=true\&token=Y64jIS9a54isgV4hi4_uuerZ)](https://deepsource.io/gh/yurake/k8s-3tier-webapp/?ref=repository-badge)
[![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)\\
[![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.2-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.1-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/)
[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fyurake%2Fk8s-3tier-webapp.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fyurake%2Fk8s-3tier-webapp?ref=badge_shield)\\
[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fyurake%2Fk8s-3tier-webapp.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fyurake%2Fk8s-3tier-webapp?ref=badge_shield)
[![AccessLint](https://img.shields.io/badge/AccessLint-enabled-blue?style=flat)](https://accesslint.com/accounts/yurake/projects/k8s-3tier-webapp)
[![Datadog](https://img.shields.io/badge/Datadog-enabled-blue?style=flat\&logo=datadog)](https://app.datadoghq.com/ci/test-services)
[![Debricked](https://img.shields.io/badge/Debricked-enabled-blue?style=flat)](https://debricked.com/app/en/repository/40176)
Expand All @@ -53,8 +53,8 @@ Sample web application based on k8s. Focus on connecting components, setting k8s
[![Repo Ranger](https://img.shields.io/badge/Repo%20Ranger-enabled-blue?style=flat)](https://reporanger.com/)
[![Socket](https://img.shields.io/badge/Socket-enabled-blue?style=flat\&logo=socketdotio)](https://socket.dev/dashboard/org/gh/yurake/repo/k8s-3tier-webapp)
[![Sonatype Lift](https://img.shields.io/badge/Sonatype%20Lift-enabled-blue?style=flat)](https://lift.sonatype.com/results/github.com/yurake/k8s-3tier-webapp)
[![What The Diff](https://img.shields.io/badge/What%20The%20Diff-enabled-blue?style=flat)](https://app.whatthediff.ai/repository/181164153)\\
[![sonarcloud](https://img.shields.io/badge/sonarcloud-enabled-orange?style=flat\&logo=sonarcloud)](https://sonarcloud.io/projects)\\
[![What The Diff](https://img.shields.io/badge/What%20The%20Diff-enabled-blue?style=flat)](https://app.whatthediff.ai/repository/181164153)
[![sonarcloud](https://img.shields.io/badge/sonarcloud-enabled-orange?style=flat\&logo=sonarcloud)](https://sonarcloud.io/projects)
More details at [sonarcloud](SONARCLOUD.md)

* * *
Expand Down
8 changes: 4 additions & 4 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Providing a modern release driven, phased life cycle, where in at least 2 minor versions could be supported at any point in time.

- This project
- Kubernetes
- Minikube
- Graalvm
- This project
- Kubernetes
- Minikube
- Graalvm
76 changes: 38 additions & 38 deletions SUMMARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,42 +4,42 @@

- [🦌 Security Policy](SECURITY.md)

- [🦌 application](application/README.md)
- [consumer-activemq-quarkus](application/consumer-activemq-quarkus.md)
- [consumer-hazelcast-quarkus](application/consumer-hazelcast-quarkus.md)
- [consumer-kafka-quarkus](application/consumer-kafka-quarkus.md)
- [consumer-rabbitmq-quarkus](application/consumer-rabbitmq-quarkus.md)
- [consumer-redis-quarkus](application/consumer-redis-quarkus.md)
- [converter-kafka-quarkus](application/converter-kafka-quarkus.md)
- [converter-rabbitmq-quarkus](application/converter-rabbitmq-quarkus.md)
- [jaxrs-activemq-quarkus](application/jaxrs-activemq-quarkus.md)
- [jaxrs-cassandra-quarkus](application/jaxrs-cassandra-quarkus.md)
- [jaxrs-grpc-quarkus](application/jaxrs-grpc-quarkus.md)
- [jaxrs-hazelcast-quarkus](application/jaxrs-hazelcast-quarkus.md)
- [jaxrs-kafka-quarkus](application/jaxrs-kafka-quarkus.md)
- [jaxrs-memcached-quarkus](application/jaxrs-memcached-quarkus.md)
- [jaxrs-mongodb-quarkus](application/jaxrs-mongodb-quarkus.md)
- [jaxrs-mysql-quarkus](application/jaxrs-mysql-quarkus.md)
- [jaxrs-rabbitmq-quarkus](application/jaxrs-rabbitmq-quarkus.md)
- [jaxrs-redis-quarkus](application/jaxrs-redis-quarkus.md)
- [parent-pom](application/parent-pom.md)
- [producer-kafka-quarkus](application/producer-kafka-quarkus.md)
- [randompublish-quarkus](application/randompublish-quarkus.md)
- [scheduled-quarkus](application/scheduled-quarkus.md)
- [server-grpc-quarkus](application/server-grpc-quarkus.md)
- [webapp-service](application/webapp-service.md)
- [jaxrs-postgres-quarkus](application/jaxrs-postgres-quarkus.md)
- [🦌 application](application/README.md)
- [consumer-activemq-quarkus](application/consumer-activemq-quarkus.md)
- [consumer-hazelcast-quarkus](application/consumer-hazelcast-quarkus.md)
- [consumer-kafka-quarkus](application/consumer-kafka-quarkus.md)
- [consumer-rabbitmq-quarkus](application/consumer-rabbitmq-quarkus.md)
- [consumer-redis-quarkus](application/consumer-redis-quarkus.md)
- [converter-kafka-quarkus](application/converter-kafka-quarkus.md)
- [converter-rabbitmq-quarkus](application/converter-rabbitmq-quarkus.md)
- [jaxrs-activemq-quarkus](application/jaxrs-activemq-quarkus.md)
- [jaxrs-cassandra-quarkus](application/jaxrs-cassandra-quarkus.md)
- [jaxrs-grpc-quarkus](application/jaxrs-grpc-quarkus.md)
- [jaxrs-hazelcast-quarkus](application/jaxrs-hazelcast-quarkus.md)
- [jaxrs-kafka-quarkus](application/jaxrs-kafka-quarkus.md)
- [jaxrs-memcached-quarkus](application/jaxrs-memcached-quarkus.md)
- [jaxrs-mongodb-quarkus](application/jaxrs-mongodb-quarkus.md)
- [jaxrs-mysql-quarkus](application/jaxrs-mysql-quarkus.md)
- [jaxrs-rabbitmq-quarkus](application/jaxrs-rabbitmq-quarkus.md)
- [jaxrs-redis-quarkus](application/jaxrs-redis-quarkus.md)
- [parent-pom](application/parent-pom.md)
- [producer-kafka-quarkus](application/producer-kafka-quarkus.md)
- [randompublish-quarkus](application/randompublish-quarkus.md)
- [scheduled-quarkus](application/scheduled-quarkus.md)
- [server-grpc-quarkus](application/server-grpc-quarkus.md)
- [webapp-service](application/webapp-service.md)
- [jaxrs-postgres-quarkus](application/jaxrs-postgres-quarkus.md)

- [🦌 kubernetes](kubernetes/README.md)
- [jaeger](kubernetes/jaeger/README.md)
- [monitoring](kubernetes/monitoring/README.md)
- [grafana](kubernetes/monitoring/grafana/README.md)
- [Setup Kubernetes CLI (kubectl)](kubernetes/monitoring/jenkins/README.md)
- [loki](kubernetes/monitoring/loki/README.md)
- [tempo](kubernetes/monitoring/tempo/README.md)
- [monitoring test](kubernetes/monitoring/test/README.md)
- [optional](kubernetes/monitoring/optional/README.md)
- [argo](kubernetes/monitoring/optional/argo/README.md)
- [tekton](kubernetes/monitoring/optional/tekton/README.md)
- [test](kubernetes/test/README.md)
- [Chaos Mesh](kubernetes/test/chaos-mesh/README.md)
- [🦌 kubernetes](kubernetes/README.md)
- [jaeger](kubernetes/jaeger/README.md)
- [monitoring](kubernetes/monitoring/README.md)
- [grafana](kubernetes/monitoring/grafana/README.md)
- [Setup Kubernetes CLI (kubectl)](kubernetes/monitoring/jenkins/README.md)
- [loki](kubernetes/monitoring/loki/README.md)
- [tempo](kubernetes/monitoring/tempo/README.md)
- [monitoring test](kubernetes/monitoring/test/README.md)
- [optional](kubernetes/monitoring/optional/README.md)
- [argo](kubernetes/monitoring/optional/argo/README.md)
- [tekton](kubernetes/monitoring/optional/tekton/README.md)
- [test](kubernetes/test/README.md)
- [Chaos Mesh](kubernetes/test/chaos-mesh/README.md)
4 changes: 2 additions & 2 deletions kubernetes/monitoring/tempo/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Choose data source type > Loki

## Change Trace Settings in Qruarkus Application

- Logging trace ids in application logs
- Logging trace ids in application logs

application.properties

Expand All @@ -30,7 +30,7 @@ application.properties
+ quarkus.log.console.format=%d{HH:mm:ss} %-5p traceId=%X{traceId}, parentId=%X{parentId}, spanId=%X{spanId}, sampled=%X{sampled} [%c{2.}] (%t) %s%e%n
```

- Change target tracing endpoint
- Change target tracing endpoint

application.properties

Expand Down

0 comments on commit ba0350d

Please sign in to comment.