Skip to content

Commit

Permalink
fix breaking examples (#5024)
Browse files Browse the repository at this point in the history
* fix examples?springboot with no kustomization.yaml

* fix examples/loadHttp with legacy patch syntax
  • Loading branch information
koba1t authored May 24, 2023
1 parent 035924b commit e1c530e
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 13 deletions.
17 changes: 8 additions & 9 deletions examples/loadHttp/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ resources:
- https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/examples/wordpress/wordpress/deployment.yaml
- https://github.com/knative/serving/releases/download/v0.12.0/serving.yaml # redirects to s3
patches:
- https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/examples/wordpress/patch.yaml
patchesStrategicMerge:
- |-
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: custom-metrics-auth-reader
namespace: kube-system
$patch: delete
- path: https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/examples/wordpress/patch.yaml
- patch: |-
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: custom-metrics-auth-reader
namespace: kube-system
$patch: delete
5 changes: 5 additions & 0 deletions examples/springboot/base/application.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
app.name=Staging Kinflate Demo
spring.jpa.hibernate.ddl-auto=update
spring.datasource.url=jdbc:mysql://<production_db_ip>:3306/db_example
spring.datasource.username=root
spring.datasource.password=admin
8 changes: 8 additions & 0 deletions examples/springboot/base/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
resources:
- deployment.yaml
- service.yaml
configMapGenerator:
- name: demo-configmap
# behavior: merge
files:
- application.properties
8 changes: 4 additions & 4 deletions examples/springboot/overlays/production/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
resources:
- ../../base
patchesStrategicMerge:
- patch.yaml
- healthcheck_patch.yaml
- memorylimit_patch.yaml
patches:
- path: patch.yaml
- path: healthcheck_patch.yaml
- path: memorylimit_patch.yaml
namePrefix: production-

0 comments on commit e1c530e

Please sign in to comment.