Merge pull request #565 from WASdev/lcj-ltpa

Set image pull policy, pull secret and security context on LTPA Job

Author: leochr

bundle/manifests/ibm-websphere-liberty.clusterserviceversion.yaml

@@ -11,7 +11,7 @@ metadata:
             "name": "websphereliberty-app-sample"
           },
           "spec": {
-            "applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:f7c7da21059eef8734cf0d43a417609aecf68bfe89d0be8e61012fade5877a01",
+            "applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:bd489232ab238c3d5b484108aa4e48dd296a5022119c251f31238c4f65a2469f",
             "expose": true,
             "license": {
               "accept": false,
@@ -62,7 +62,7 @@ metadata:
     capabilities: Auto Pilot
     categories: Application Runtime
     containerImage: icr.io/cpopen/websphere-liberty-operator:daily
-    createdAt: "2023-10-27T13:46:10Z"
+    createdAt: "2023-10-30T04:18:07Z"
     description: Deploy and manage containerized Liberty applications
     olm.skipRange: '>=1.0.0 <1.3.0'
     operators.openshift.io/infrastructure-features: '["disconnected"]'
@@ -884,7 +884,7 @@ spec:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
                 - name: RELATED_IMAGE_LIBERTY_SAMPLE_APP
-                  value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:f7c7da21059eef8734cf0d43a417609aecf68bfe89d0be8e61012fade5877a01
+                  value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:bd489232ab238c3d5b484108aa4e48dd296a5022119c251f31238c4f65a2469f
                 - name: RELATED_IMAGE_WEBSPHERE_LIBERTY_OPERATOR
                   value: icr.io/cpopen/websphere-liberty-operator:daily
                 image: icr.io/cpopen/websphere-liberty-operator:daily
@@ -1182,7 +1182,7 @@ spec:
   provider:
     name: IBM
   relatedImages:
-  - image: icr.io/appcafe/open-liberty/samples/getting-started@sha256:f7c7da21059eef8734cf0d43a417609aecf68bfe89d0be8e61012fade5877a01
+  - image: icr.io/appcafe/open-liberty/samples/getting-started@sha256:bd489232ab238c3d5b484108aa4e48dd296a5022119c251f31238c4f65a2469f
     name: liberty-sample-app
   - image: icr.io/cpopen/websphere-liberty-operator:daily
     name: websphere-liberty-operator

config/manager/manager.yaml

@@ -72,7 +72,7 @@ spec:
               fieldRef:
                 fieldPath: metadata.annotations['olm.targetNamespaces']
           - name: RELATED_IMAGE_LIBERTY_SAMPLE_APP
-            value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:f7c7da21059eef8734cf0d43a417609aecf68bfe89d0be8e61012fade5877a01
+            value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:bd489232ab238c3d5b484108aa4e48dd296a5022119c251f31238c4f65a2469f
           - name: RELATED_IMAGE_WEBSPHERE_LIBERTY_OPERATOR
             value: OPERATOR_IMAGE
         securityContext:

config/samples/liberty.websphere.ibm.com_v1_webspherelibertyapplications.yaml

@@ -7,7 +7,7 @@ spec:
     accept: false
     edition: IBM WebSphere Application Server
     productEntitlementSource: Standalone
-  applicationImage: icr.io/appcafe/open-liberty/samples/getting-started@sha256:f7c7da21059eef8734cf0d43a417609aecf68bfe89d0be8e61012fade5877a01
+  applicationImage: icr.io/appcafe/open-liberty/samples/getting-started@sha256:bd489232ab238c3d5b484108aa4e48dd296a5022119c251f31238c4f65a2469f
   expose: true
   manageTLS: true
   replicas: 1

internal/deploy/kubectl/websphereliberty-app-operator.yaml

@@ -328,7 +328,7 @@ spec:
         - name: WATCH_NAMESPACE
           value: WEBSPHERE_LIBERTY_WATCH_NAMESPACE
         - name: RELATED_IMAGE_LIBERTY_SAMPLE_APP
-          value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:f7c7da21059eef8734cf0d43a417609aecf68bfe89d0be8e61012fade5877a01
+          value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:bd489232ab238c3d5b484108aa4e48dd296a5022119c251f31238c4f65a2469f
         - name: RELATED_IMAGE_WEBSPHERE_LIBERTY_OPERATOR
           value: icr.io/cpopen/websphere-liberty-operator:daily
         image: icr.io/cpopen/websphere-liberty-operator:daily

internal/deploy/kustomize/daily/base/websphere-liberty-deployment.yaml

@@ -55,7 +55,7 @@ spec:
             fieldRef:
               fieldPath: metadata.namespace
         - name: RELATED_IMAGE_LIBERTY_SAMPLE_APP
-          value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:f7c7da21059eef8734cf0d43a417609aecf68bfe89d0be8e61012fade5877a01
+          value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:bd489232ab238c3d5b484108aa4e48dd296a5022119c251f31238c4f65a2469f
         - name: RELATED_IMAGE_WEBSPHERE_LIBERTY_OPERATOR
           value: cp.stg.icr.io/cp/websphere-liberty-operator:main
         image: cp.stg.icr.io/cp/websphere-liberty-operator:main

utils/utils.go

@@ -666,9 +666,11 @@ func CustomizeLTPAJob(job *v1.Job, la *wlv1.WebSphereLibertyApplication, ltpaSec
 	job.Spec.Template.ObjectMeta.Name = "liberty"
 	job.Spec.Template.Spec.Containers = []corev1.Container{
 		{
-			Name:    job.Spec.Template.ObjectMeta.Name,
-			Image:   la.GetApplicationImage(),
-			Command: []string{"/bin/bash", "-c"},
+			Name:            job.Spec.Template.ObjectMeta.Name,
+			Image:           la.GetApplicationImage(),
+			ImagePullPolicy: *la.GetPullPolicy(),
+			SecurityContext: rcoutils.GetSecurityContext(la),
+			Command:         []string{"/bin/bash", "-c"},
 			// Usage: /bin/create_ltpa_keys.sh <namespace> <ltpa-secret-name> <securityUtility-encoding>
 			Args: []string{ltpaKeysMountPath + "/bin/create_ltpa_keys.sh " + la.GetNamespace() + " " + ltpaSecretName + " " + ltpaKeysFileName + " " + encodingType},
 			VolumeMounts: []corev1.VolumeMount{
@@ -679,6 +681,11 @@ func CustomizeLTPAJob(job *v1.Job, la *wlv1.WebSphereLibertyApplication, ltpaSec
 			},
 		},
 	}
+	if la.GetPullSecret() != nil && *la.GetPullSecret() != "" {
+		job.Spec.Template.Spec.ImagePullSecrets = append(job.Spec.Template.Spec.ImagePullSecrets, corev1.LocalObjectReference{
+			Name: *la.GetPullSecret(),
+		})
+	}
 	job.Spec.Template.Spec.ServiceAccountName = serviceAccountName
 	job.Spec.Template.Spec.RestartPolicy = corev1.RestartPolicyOnFailure
 	var number int32