Separate fedora credentials and fedora config

helm-charts/helm-values/di-fedora-indexer-prod.yml

@@ -9,7 +9,8 @@ k8sLimitsMemory: "1Gi"
 
 kafkaConfigs: prod-kafka-bootstrap-servers
 sftpConfigs: internal-sftp-config
-fedoraConfigs: fedora-admin-credentials
+fedoraConfigs: prod-fedora-server
+fedoraCredentials: prod-fedora-admin-credentials
 isSimple: false
 
 inputTopicName: mb-di-ingest-prod

helm-charts/helm-values/di-fedora-indexer-stage.yml

@@ -7,9 +7,10 @@ k8sRequestsMemory: "0.256Mi"
 k8sLimitsCpu: "1"
 k8sLimitsMemory: "1Gi"
 
-kafkaConfigs: stage-kafka-bootstrap-servers
+kafkaConfigs: prod-kafka-bootstrap-servers
 sftpConfigs: internal-sftp-config
-fedoraConfigs: stage-fedora-admin-credentials
+fedoraConfigs: stage-fedora-server
+fedoraCredentials: stage-fedora-admin-credentials
 isSimple: false
 
 inputTopicName: mb-di-ingest-stage

helm-charts/helm-values/di-fedora-indexer-test.yml

@@ -9,7 +9,8 @@ k8sLimitsMemory: "512Mi"
 
 kafkaConfigs: test-kafka-bootstrap-servers
 sftpConfigs: internal-sftp-config
-fedoraConfigs: test-fedora-admin-credentials
+fedoraConfigs: test-fedora-server
+fedoraCredentials: test-fedora-admin-credentials
 isSimple: false
 
 inputTopicName: mb-di-ingest-test

helm-charts/helm-values/gi-fedora-indexer-prod.yml

@@ -9,7 +9,8 @@ k8sLimitsMemory: "512Mi"
 
 kafkaConfigs: prod-kafka-bootstrap-servers
 sftpConfigs: internal-sftp-config
-fedoraConfigs: fedora-admin-credentials
+fedoraConfigs: prod-fedora-server
+fedoraCredentials: prod-fedora-admin-credentials
 isSimple: true
 
 inputTopicName: mb-gi-rdf-objects-prod

helm-charts/helm-values/gi-fedora-indexer-stage.yml

@@ -7,9 +7,10 @@ k8sRequestsMemory: "128Mi"
 k8sLimitsCpu: "1"
 k8sLimitsMemory: "512Mi"
 
-kafkaConfigs: stage-kafka-bootstrap-servers
+kafkaConfigs: prod-kafka-bootstrap-servers
 sftpConfigs: internal-sftp-config
-fedoraConfigs: stage-fedora-admin-credentials
+fedoraConfigs: stage-fedora-server
+fedoraCredentials: stage-fedora-admin-credentials
 isSimple: true
 
 inputTopicName: mb-gi-rdf-objects-stage

helm-charts/helm-values/gi-fedora-indexer-test.yml

@@ -9,7 +9,8 @@ k8sLimitsMemory: "512Mi"
 
 kafkaConfigs: test-kafka-bootstrap-servers
 sftpConfigs: internal-sftp-config
-fedoraConfigs: test-fedora-admin-credentials
+fedoraConfigs: test-fedora-server
+fedoraCredentials: test-fedora-admin-credentials
 isSimple: true
 
 inputTopicName: mb-gi-rdf-objects-test

helm-charts/templates/deployment.yaml

@@ -32,9 +32,11 @@ spec:
           - secretRef:
               name: "{{ .Values.sftpConfigs }}"
           - secretRef:
-              name: "{{ .Values.fedoraConfigs }}"
+              name: "{{ .Values.fedoraCredentials }}"
           - configMapRef:
               name: "{{ .Values.kafkaConfigs }}"
+          - configMapRef:
+              name: "{{ .Values.fedoraConfigs }}"
           - configMapRef:
               name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}-config"
       restartPolicy: Always