diff --git a/minikube/backend.yaml b/minikube/backend.yaml index 47b54751d9f282c9f459976791070b7439f6fb26..964098f43b7d11f815de164a9293942ab17c5bda 100644 --- a/minikube/backend.yaml +++ b/minikube/backend.yaml @@ -25,12 +25,11 @@ spec: - name: MONGO_PASSWORD value: tododbadminpassword - name: MONGO_HOST - value: mongodb-service + value: mongodb-service.todo.svc.cluster.local - name: MONGO_PORT value: "27017" - name: MONGO_DB value: todo - --- apiVersion: v1 kind: Service diff --git a/minikube/mongodb.yaml b/minikube/mongodb.yaml index 729850471505c0da78cec357ae74839573d23d2a..86bb2a26ec24847edc5934e53f6150af0b1bd1b4 100644 --- a/minikube/mongodb.yaml +++ b/minikube/mongodb.yaml @@ -44,8 +44,8 @@ apiVersion: v1 kind: Service metadata: name: mongodb-service + namespace: todo spec: - clusterIP: None ports: - protocol: TCP port: 27017 @@ -63,10 +63,10 @@ data: init-mongo.js: | db = db.getSiblingDB('todo'); db.createUser({ - user: 'tododbuser', - pwd: 'tododbadminpassword', + user: 'tododbuser', + pwd: 'tododbadminpassword', roles: [ - { role: 'userAdminAnyDatabase', db: 'todo' }, - { role: 'readWriteAnyDatabase', db: 'todo' } + { role: 'readWrite', db: 'todo' }, + { role: 'dbAdmin', db: 'todo' } ] - }); + }); \ No newline at end of file diff --git a/src/main/resources/application-instance-2.properties b/src/main/resources/application-instance-2.properties deleted file mode 100644 index 410b9548d1c49c8ac7c43adc7d56277886d3cb0d..0000000000000000000000000000000000000000 --- a/src/main/resources/application-instance-2.properties +++ /dev/null @@ -1,6 +0,0 @@ -spring.application.name=todo -server.port=9877 -spring.data.mongodb.uri=mongodb://${MONGO_USER}:${MONGO_PASSWORD}@${MONGO_HOST}:${MONGO_PORT}/${MONGO_DB}?authSource=admin - -# pattern matching für controller -spring.mvc.pathmatch.matching-strategy=ant_path_matcher diff --git a/src/main/resources/application-instance-1.properties b/src/main/resources/application.properties similarity index 77% rename from src/main/resources/application-instance-1.properties rename to src/main/resources/application.properties index dbfca428536c9ffbc90cd1ce79be57f824d1ff75..3f02de25c8508ef2f8c54cb57034a0302b50fcc0 100644 --- a/src/main/resources/application-instance-1.properties +++ b/src/main/resources/application.properties @@ -1,6 +1,6 @@ spring.application.name=todo server.port=9876 -spring.data.mongodb.uri=mongodb://${MONGO_USER}:${MONGO_PASSWORD}@${MONGO_HOST}:${MONGO_PORT}/${MONGO_DB}?authSource=admin +spring.data.mongodb.uri=mongodb://${MONGO_USER}:${MONGO_PASSWORD}@${MONGO_HOST}:${MONGO_PORT}/${MONGO_DB}?authSource=todo # pattern matching für controller spring.mvc.pathmatch.matching-strategy=ant_path_matcher