diff --git a/build.gradle b/build.gradle index 0de704e..339ea21 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ plugins { - id 'org.springframework.boot' version '3.3.2' + id 'org.springframework.boot' version '3.3.3' id 'io.spring.dependency-management' version '1.1.4' - id 'com.google.cloud.tools.jib' version '3.4.2' - id "org.sonarqube" version '5.0.0.4638' + id 'com.google.cloud.tools.jib' version '3.4.3' + id "org.sonarqube" version '5.1.0.4882' id 'java' } diff --git a/gradle.properties b/gradle.properties index 20c6ff6..820d8c6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.parallel=true org.gradle.caching=true -org.gradle.configuration-cache=true +#org.gradle.configuration-cache=true diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml index 2c6423a..7a3a620 100644 --- a/manifests/base/kustomization.yaml +++ b/manifests/base/kustomization.yaml @@ -1,13 +1,15 @@ resources: - - deployment.yaml - - role.yaml - - rolebinding.yaml - - sa.yaml - - service.yaml - - configmap.yaml +- deployment.yaml +- role.yaml +- rolebinding.yaml +- sa.yaml +- service.yaml +- configmap.yaml -commonLabels: - app.kubernetes.io/instance: portti - app.kubernetes.io/name: portti - app.kubernetes.io/version: latest - app.kubernetes.io/part-of: otel-demo +labels: +- includeSelectors: true + pairs: + app.kubernetes.io/instance: portti + app.kubernetes.io/name: portti + app.kubernetes.io/part-of: otel-demo + app.kubernetes.io/version: latest diff --git a/skaffold.yaml b/skaffold.yaml index 832e68f..8813524 100644 --- a/skaffold.yaml +++ b/skaffold.yaml @@ -22,6 +22,16 @@ profiles: kustomize: paths: - manifests/overlays/local + - name: minikube + activation: + - kubeContext: minikube + build: + local: + push: true + manifests: + kustomize: + paths: + - manifests/overlays/local # - name: playground # deploy: # kustomize: diff --git a/src/main/resources/application-kubernetes.yaml b/src/main/resources/application-kubernetes.yaml index e07684c..c0a1704 100644 --- a/src/main/resources/application-kubernetes.yaml +++ b/src/main/resources/application-kubernetes.yaml @@ -5,3 +5,8 @@ spring: kubernetes: reload: enabled: true + +#management: + #otlp: + # tracing: + # endpoint: http://otel-collector.otel-demo.svc.cluster.local:4318/v1/traces \ No newline at end of file diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 8569d7c..51f7670 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -9,6 +9,9 @@ spring: discovery: locator: enabled: true + threads: + virtual: + enabled: true management: endpoints: @@ -19,9 +22,7 @@ management: health: probes: enabled: true - otlp: - tracing: - endpoint: http://otel-collector.otel-demo.svc.cluster.local:4318/v1/traces + #logging: #level: #org.springframework: DEBUG