Skip to content

Commit

Permalink
Fix jib+skaffold
Browse files Browse the repository at this point in the history
  • Loading branch information
jahpola committed Sep 9, 2024
1 parent ab08ace commit dddb2e7
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 18 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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'
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
org.gradle.parallel=true
org.gradle.caching=true
org.gradle.configuration-cache=true
#org.gradle.configuration-cache=true
24 changes: 13 additions & 11 deletions manifests/base/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -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
10 changes: 10 additions & 0 deletions skaffold.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 5 additions & 0 deletions src/main/resources/application-kubernetes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,8 @@ spring:
kubernetes:
reload:
enabled: true

#management:
#otlp:
# tracing:
# endpoint: http://otel-collector.otel-demo.svc.cluster.local:4318/v1/traces
7 changes: 4 additions & 3 deletions src/main/resources/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ spring:
discovery:
locator:
enabled: true
threads:
virtual:
enabled: true

management:
endpoints:
Expand All @@ -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
Expand Down

0 comments on commit dddb2e7

Please sign in to comment.