Merge branch 'main' into update-vers

cmd/template_lagoonservices_test.go

@@ -350,6 +350,21 @@ func TestTemplateLagoonServices(t *testing.T) {
 			templatePath: "testoutput",
 			want:         "internal/testdata/complex/service-templates/service4",
 		},
+		{
+			name: "test10 basic deployment native cronjobs disabled",
+			args: testdata.GetSeedData(
+				testdata.TestData{
+					ProjectName:     "example-project",
+					EnvironmentName: "main",
+					Branch:          "main",
+					LagoonYAML:      "internal/testdata/basic/lagoon-cronjob-native-disable.yml",
+					ImageReferences: map[string]string{
+						"node": "harbor.example/example-project/main/node@sha256:b2001babafaa8128fe89aa8fd11832cade59931d14c3de5b3ca32e2a010fbaa8",
+					},
+				}, true),
+			templatePath: "testoutput",
+			want:         "internal/testdata/basic/service-templates/service8",
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

internal/generator/services.go

@@ -420,7 +420,8 @@ func composeToServiceValues(
 					if err != nil {
 						return ServiceValues{}, fmt.Errorf("unable to convert crontab for cronjob %s: %v", cronjob.Name, err)
 					}
-					if inpod {
+					// if the cronjob is inpod, or the cronjob has an inpod flag override
+					if inpod || (cronjob.InPod != nil && *cronjob.InPod) {
 						inpodcronjobs = append(inpodcronjobs, cronjob)
 					} else {
 						// make the cronjob name kubernetes compliant

internal/lagoon/lagoon.go

@@ -33,6 +33,7 @@ type Cronjob struct {
 	Service  string `json:"service"`
 	Schedule string `json:"schedule"`
 	Command  string `json:"command"`
+	InPod    *bool  `json:"inPod"`
 }
 
 type Override struct {

internal/lagoon/lagoon_test.go

@@ -441,6 +441,38 @@ func TestUnmarshalLagoonYAML(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "test-cronjobs-inpod-only",
+			args: args{
+				file: "test-resources/lagoon-yaml/test10/lagoon.yml",
+				l:    &YAML{},
+			},
+			want: &YAML{
+				DockerComposeYAML: "docker-compose.yml",
+				Environments: Environments{
+					"main": Environment{
+						Routes: []map[string][]Route{
+							{
+								"nginx": {
+									{
+										Name: "a.example.com",
+									},
+								},
+							},
+						},
+						Cronjobs: []Cronjob{
+							{
+								Name:     "drush cron",
+								Command:  "drush cron",
+								Service:  "cli",
+								Schedule: "*/30 * * * *",
+								InPod:    helpers.BoolPtr(true),
+							},
+						},
+					},
+				},
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

internal/lagoon/test-resources/lagoon-yaml/test10/lagoon.yml

@@ -0,0 +1,16 @@
+---
+docker-compose-yaml: docker-compose.yml
+
+project: content-example-com
+
+environments:
+  main:
+    cronjobs:
+      - name: drush cron
+        schedule: "*/30 * * * *"
+        command: 'drush cron'
+        service: cli
+        inPod: true
+    routes:
+    -   nginx:
+        - a.example.com

internal/testdata/basic/lagoon-cronjob-native-disable.yml

@@ -0,0 +1,21 @@
+docker-compose-yaml: internal/testdata/basic/docker-compose.yml
+
+environment_variables:
+  git_sha: "true"
+
+environments:
+  main:
+    routes:
+      - node:
+          - example.com
+    cronjobs:
+      - name: drush cron
+        schedule: "*/15 * * * *"
+        command: drush cron
+        service: node
+        inPod: true # not required as the interval is suited to in pod already
+      - name: drush cron2
+        schedule: "*/30 * * * *"
+        command: drush cron
+        service: node
+        inPod: true

internal/testdata/basic/service-templates/service8/deployment-node.yaml

@@ -0,0 +1,92 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    lagoon.sh/branch: main
+    lagoon.sh/version: v2.7.x
+  creationTimestamp: null
+  labels:
+    app.kubernetes.io/instance: node
+    app.kubernetes.io/managed-by: build-deploy-tool
+    app.kubernetes.io/name: basic
+    lagoon.sh/buildType: branch
+    lagoon.sh/environment: main
+    lagoon.sh/environmentType: production
+    lagoon.sh/project: example-project
+    lagoon.sh/service: node
+    lagoon.sh/service-type: basic
+    lagoon.sh/template: basic-0.1.0
+  name: node
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/instance: node
+      app.kubernetes.io/name: basic
+  strategy: {}
+  template:
+    metadata:
+      annotations:
+        lagoon.sh/branch: main
+        lagoon.sh/configMapSha: abcdefg1234567890
+        lagoon.sh/version: v2.7.x
+      creationTimestamp: null
+      labels:
+        app.kubernetes.io/instance: node
+        app.kubernetes.io/managed-by: build-deploy-tool
+        app.kubernetes.io/name: basic
+        lagoon.sh/buildType: branch
+        lagoon.sh/environment: main
+        lagoon.sh/environmentType: production
+        lagoon.sh/project: example-project
+        lagoon.sh/service: node
+        lagoon.sh/service-type: basic
+        lagoon.sh/template: basic-0.1.0
+    spec:
+      containers:
+      - env:
+        - name: LAGOON_GIT_SHA
+          value: abcdefg123456
+        - name: CRONJOBS
+          value: |
+            3,18,33,48 * * * * drush cron
+            18,48 * * * * drush cron
+        - name: SERVICE_NAME
+          value: node
+        envFrom:
+        - configMapRef:
+            name: lagoon-env
+        image: harbor.example/example-project/main/node@sha256:b2001babafaa8128fe89aa8fd11832cade59931d14c3de5b3ca32e2a010fbaa8
+        imagePullPolicy: Always
+        livenessProbe:
+          initialDelaySeconds: 60
+          tcpSocket:
+            port: 1234
+          timeoutSeconds: 10
+        name: basic
+        ports:
+        - containerPort: 1234
+          name: tcp-1234
+          protocol: TCP
+        - containerPort: 8191
+          name: tcp-8191
+          protocol: TCP
+        - containerPort: 9001
+          name: udp-9001
+          protocol: UDP
+        readinessProbe:
+          initialDelaySeconds: 1
+          tcpSocket:
+            port: 1234
+          timeoutSeconds: 1
+        resources:
+          requests:
+            cpu: 10m
+            memory: 10Mi
+        securityContext: {}
+      enableServiceLinks: false
+      imagePullSecrets:
+      - name: lagoon-internal-registry-secret
+      priorityClassName: lagoon-priority-production
+status: {}

internal/testdata/basic/service-templates/service8/service-node.yaml

@@ -0,0 +1,39 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    lagoon.sh/branch: main
+    lagoon.sh/version: v2.7.x
+  creationTimestamp: null
+  labels:
+    app.kubernetes.io/instance: node
+    app.kubernetes.io/managed-by: build-deploy-tool
+    app.kubernetes.io/name: basic
+    lagoon.sh/buildType: branch
+    lagoon.sh/environment: main
+    lagoon.sh/environmentType: production
+    lagoon.sh/project: example-project
+    lagoon.sh/service: node
+    lagoon.sh/service-type: basic
+    lagoon.sh/template: basic-0.1.0
+  name: node
+spec:
+  ports:
+  - name: tcp-1234
+    port: 1234
+    protocol: TCP
+    targetPort: tcp-1234
+  - name: tcp-8191
+    port: 8191
+    protocol: TCP
+    targetPort: tcp-8191
+  - name: udp-9001
+    port: 9001
+    protocol: UDP
+    targetPort: udp-9001
+  selector:
+    app.kubernetes.io/instance: node
+    app.kubernetes.io/name: basic
+status:
+  loadBalancer: {}

legacy/build-deploy-docker-compose.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-set +x
 # get the buildname from the pod, $HOSTNAME contains this in the running pod, so we can use this
 # set it to something usable here
 export LAGOON_BUILD_NAME=$HOSTNAME
@@ -200,7 +199,7 @@ if kubectl -n ${NAMESPACE} get configmap docker-compose-yaml &> /dev/null; then
   kubectl -n ${NAMESPACE} create configmap docker-compose-yaml --from-file=pre-deploy=${DOCKER_COMPOSE_YAML}
 fi
 
-set +ex
+set +e
 currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
 patchBuildStep "${buildStartTime}" "${buildStartTime}" "${currentStepEnd}" "${NAMESPACE}" "initialSetup" "Initial Environment Setup" "false"
 previousStepEnd=${currentStepEnd}
@@ -307,9 +306,8 @@ https://docs.lagoon.sh/using-lagoon-the-basics/lagoon-yml/
 ##############################################"
   exit 1
 fi
-set -ex
+set -e
 
-set +x
 # Validate .lagoon.yml only, no overrides. lagoon-linter still has checks that
 # aren't in build-deploy-tool.
 if ! lagoon-linter; then
@@ -344,7 +342,6 @@ currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
 patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "lagoonYmlValidation" ".lagoon.yml Validation" "false"
 previousStepEnd=${currentStepEnd}
 beginBuildStep "Configure Variables" "configuringVariables"
-
 DEPLOY_TYPE=$(cat .lagoon.yml | shyaml get-value environments.${BRANCH//./\\.}.deploy-type default)
 
 # Load all Services that are defined
@@ -845,7 +842,6 @@ if [ -n "$(cat .lagoon.yml | shyaml keys fastly.api-secrets.$FASTLY_API_SECRETS_
 
     # run the script to create the secrets
     . /kubectl-build-deploy/scripts/exec-fastly-api-secrets.sh
-    set +x
 
     let FASTLY_API_SECRETS_COUNTER=FASTLY_API_SECRETS_COUNTER+1
   done
@@ -884,7 +880,6 @@ if [ ! -z "$LAGOON_FASTLY_API_SECRETS" ]; then
     FASTLY_API_PLATFORMTLS_CONFIGURATION=${LAGOON_FASTLY_API_SECRET_SPLIT[2]}
     # run the script to create the secrets
     . /kubectl-build-deploy/scripts/exec-fastly-api-secrets.sh
-    set +x
   done
 fi
 
@@ -990,7 +985,6 @@ if [ -n "$(ls -A $LAGOON_DBAAS_YAML_FOLDER/ 2>/dev/null)" ]; then
   kubectl apply -n ${NAMESPACE} -f $LAGOON_DBAAS_YAML_FOLDER/
 fi
 
-set +x
 currentStepEnd="$(date +"%Y-%m-%d %H:%M:%S")"
 patchBuildStep "${buildStartTime}" "${previousStepEnd}" "${currentStepEnd}" "${NAMESPACE}" "serviceConfiguration2Complete" "Service Configuration Phase 2" "false"
 previousStepEnd=${currentStepEnd}
@@ -1279,21 +1273,18 @@ do
         # remove the image from images to pull
         unset IMAGES_PULL[$SERVICE_NAME]
         . /kubectl-build-deploy/scripts/exec-kubectl-mariadb-dbaas.sh
-        set +x
         ;;
 
     postgres-dbaas)
         # remove the image from images to pull
         unset IMAGES_PULL[$SERVICE_NAME]
         . /kubectl-build-deploy/scripts/exec-kubectl-postgres-dbaas.sh
-        set +x
         ;;
 
     mongodb-dbaas)
         # remove the image from images to pull
         unset IMAGES_PULL[$SERVICE_NAME]
         . /kubectl-build-deploy/scripts/exec-kubectl-mongodb-dbaas.sh
-        set +x
         ;;
 
     *)
@@ -1555,7 +1546,6 @@ do
 
   elif [ ! $SERVICE_ROLLOUT_TYPE == "false" ]; then
     . /kubectl-build-deploy/scripts/exec-monitor-deploy.sh
-    set +x
   fi
 done
 

legacy/build-deploy.sh

@@ -1,26 +1,21 @@
 #!/bin/bash
-set -x
 set -eo pipefail
 set -o noglob
 
-set +x # reduce noise in build logs
 # print out the build-deploy-tool version information
 echo "##############################################"
 build-deploy-tool version
 echo "##############################################"
-set -x
 
 REGISTRY=$REGISTRY
 NAMESPACE=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)
 LAGOON_VERSION=$(cat /lagoon/version)
 
-set +x # reduce noise in build logs
 if [ ! -z "$LAGOON_PROJECT_VARIABLES" ]; then
   INTERNAL_REGISTRY_URL=$(jq --argjson data "$LAGOON_PROJECT_VARIABLES" -n -r '$data | .[] | select(.scope == "internal_container_registry") | select(.name == "INTERNAL_REGISTRY_URL") | .value' | sed -e 's#^http://##' | sed -e 's#^https://##')
   INTERNAL_REGISTRY_USERNAME=$(jq --argjson data "$LAGOON_PROJECT_VARIABLES" -n -r '$data | .[] | select(.scope == "internal_container_registry") | select(.name == "INTERNAL_REGISTRY_USERNAME") | .value')
   INTERNAL_REGISTRY_PASSWORD=$(jq --argjson data "$LAGOON_PROJECT_VARIABLES" -n -r '$data | .[] | select(.scope == "internal_container_registry") | select(.name == "INTERNAL_REGISTRY_PASSWORD") | .value')
 fi
-set -x
 
 echo -e "##############################################\nBEGIN Checkout Repository\n##############################################"
 if [ "$BUILD_TYPE" == "pullrequest" ]; then
@@ -40,7 +35,6 @@ fi
 echo -e "##############################################\nBEGIN Kubernetes Setup\n##############################################"
 sleep 0.5s
 
-set +x # reduce noise in build logs
 if [[ -f "/var/run/secrets/kubernetes.io/serviceaccount/token" ]]; then
   DEPLOYER_TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)
 else
@@ -72,5 +66,4 @@ if [ ! -z ${INTERNAL_REGISTRY_URL} ] ; then
 fi
 
 echo -e "\n\n##############################################\nStart Build Process\n##############################################"
-set -x
 .  /kubectl-build-deploy/build-deploy-docker-compose.sh

legacy/scripts/exec-kubectl-mariadb-dbaas.sh

@@ -21,7 +21,7 @@ else
     exit 1
 fi
 done
-set +x
+
 # Grab the details from the consumer spec
 DB_HOST=$(kubectl -n ${NAMESPACE} get mariadbconsumer/${SERVICE_NAME} -o yaml | shyaml get-value spec.consumer.services.primary)
 DB_USER=$(kubectl -n ${NAMESPACE} get mariadbconsumer/${SERVICE_NAME} -o yaml | shyaml get-value spec.consumer.username)
@@ -45,5 +45,3 @@ if DB_READREPLICA_HOSTS=$(kubectl -n ${NAMESPACE} get mariadbconsumer/${SERVICE_
         configmap lagoon-env \
         -p "{\"data\":{\"${SERVICE_NAME_UPPERCASE}_READREPLICA_HOSTS\":\"${DB_READREPLICA_HOSTS}\"}}"
 fi
-
-set -x