Skip to content

Commit 61732c2

Browse files
committed
Resolve issue with image pull secret sub
1 parent 1f8705f commit 61732c2

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

kubernetes/create-domain-job.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ function createYamlFiles {
278278
cp ${jobInput} ${jobOutput}
279279
sed -i -e "s:%NAMESPACE%:$namespace:g" ${jobOutput}
280280
sed -i -e "s:%SECRET_NAME%:${secretName}:g" ${jobOutput}
281-
sed -i -e "s:%DOCKER_STORE_REGISTRY_SECRET%:${imagePullSecretName}:g" ${jobOutput}
281+
sed -i -e "s:%DOCKER_REGISTRY_SECRET%:${imagePullSecretName}:g" ${jobOutput}
282282
sed -i -e "s:%IMAGE_PULL_SECRET_PREFIX%:${imagePullSecretPrefix}:g" ${jobOutput}
283283
sed -i -e "s:%PERSISTENT_VOLUME_CLAIM%:${persistenceVolumeClaimName}:g" ${jobOutput}
284284
sed -i -e "s:%CREATE_DOMAIN_SCRIPT%:${createDomainScript}:g" ${jobOutput}

kubernetes/create-weblogic-operator.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ function createYamlFiles {
310310
sed -i -e "s|%ACCOUNT_NAME%|$serviceAccount|g" ${oprOutput}
311311
sed -i -e "s|%IMAGE%|$image|g" ${oprOutput}
312312
sed -i -e "s|%IMAGE_PULL_POLICY%|$imagePullPolicy|g" ${oprOutput}
313-
sed -i -e "s|%DOCKER_STORE_REGISTRY_SECRET%|${imagePullSecretName}|g" ${oprOutput}
313+
sed -i -e "s|%DOCKER_REGISTRY_SECRET%|${imagePullSecretName}|g" ${oprOutput}
314314
sed -i -e "s|%IMAGE_PULL_SECRET_PREFIX%|${imagePullSecretPrefix}|g" ${oprOutput}
315315
sed -i -e "s|%EXTERNAL_OPERATOR_SERVICE_PREFIX%|$externalOperatorServicePrefix|g" ${oprOutput}
316316
sed -i -e "s|%EXTERNAL_REST_HTTPS_PORT%|$externalRestHttpsPort|g" ${oprOutput}

kubernetes/internal/domain-job-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,4 +525,4 @@ spec:
525525
secret:
526526
secretName: %SECRET_NAME%
527527
%IMAGE_PULL_SECRET_PREFIX%imagePullSecrets:
528-
%IMAGE_PULL_SECRET_PREFIX%- name: %DOCKER_STORE_REGISTRY_SECRET%
528+
%IMAGE_PULL_SECRET_PREFIX%- name: %DOCKER_REGISTRY_SECRET%

kubernetes/internal/weblogic-operator-template.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,8 @@ spec:
112112
%ELK_INTEGRATION_PREFIX%- name: log-dir
113113
%ELK_INTEGRATION_PREFIX% emptyDir:
114114
%ELK_INTEGRATION_PREFIX% medium: Memory
115-
# Update the imagePullSecrets with the name of your Kubernetes secret containing
116-
# your credentials for the Docker Store/Oracle Container Registry.
117-
#### artifactory credentials during internal development phase
118-
imagePullSecrets:
119-
- name: wlsldi-secret
115+
%IMAGE_PULL_SECRET_PREFIX%imagePullSecrets:
116+
%IMAGE_PULL_SECRET_PREFIX%- name: %DOCKER_REGISTRY_SECRET%
120117

121118
---
122119
%EXTERNAL_OPERATOR_SERVICE_PREFIX%apiVersion: v1

0 commit comments

Comments
 (0)