Skip to content

Commit

Permalink
Merge pull request #1073 from CrowleyRajapakse/master
Browse files Browse the repository at this point in the history
Template configuration to values.yaml file
  • Loading branch information
CrowleyRajapakse authored Feb 14, 2024
2 parents f02dba4 + ff420d7 commit 5bf22c2
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 12 deletions.
20 changes: 10 additions & 10 deletions helm-charts/templates/log-conf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ metadata:
data:
config.toml: |
[controlPlane]
enabled = true
serviceURL = "https://am-service.apim-deployment.svc.cluster.local:9443/"
username = "admin"
password = "admin"
environmentLabels = ["Default"]
skipSSLVerification = true
enabled = {{ .Values.controlPlane.enabled }}
serviceURL = "{{ .Values.controlPlane.serviceURL }}"
username = "{{ .Values.controlPlane.username }}"
password = "{{ .Values.controlPlane.password }}"
environmentLabels = ["{{ .Values.controlPlane.environmentLabels }}"]
skipSSLVerification = {{ .Values.controlPlane.skipSSLVerification }}
[controlPlane.brokerConnectionParameters]
eventListeningEndpoints = ["amqp://admin:[email protected]:5672?retries='10'&connectdelay='30'"]
eventListeningEndpoints = ["{{ .Values.controlPlane.eventListeningEndpoints }}"]
[dataPlane]
enabled = true
k8ResourceEndpoint = "https://apk-test-setup-wso2-apk-config-ds-service.apk-integration-test.svc.cluster.local:9443/api/configurator/apis/generate-k8s-resources"
namespace = "apk-integration-test"
enabled = {{ .Values.dataPlane.enabled }}
k8ResourceEndpoint = "{{ .Values.dataPlane.k8ResourceEndpoint }}"
namespace = "{{ .Values.dataPlane.namespace }}"
log_config.toml: |
# The logging configuration for Adapter
Expand Down
14 changes: 12 additions & 2 deletions helm-charts/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,22 @@
# under the License.

replicaCount: 1

image:
repository: apim-apk-agent
tag: 1.0.0-SNAPSHOT
pullPolicy: IfNotPresent
service:
name: apim-apk-agent-service

resources: {}
controlPlane:
enabled: true
serviceURL: https://am-service.apim-deployment.svc.cluster.local:9443/
username: admin
password: admin
environmentLabels: Default
skipSSLVerification: true
eventListeningEndpoints: amqp://admin:admin@am-service:apim-deployment:svc:cluster:local:5672?retries='10'&connectdelay='30'
dataPlane:
enabled: true
k8ResourceEndpoint: https://apk-test-setup-wso2-apk-config-ds-service.apk-integration-test.svc.cluster.local:9443/api/configurator/apis/generate-k8s-resources
namespace: apk-integration-test

0 comments on commit 5bf22c2

Please sign in to comment.