feat(runjob): add support for cloud_sql_instance

config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_runjobs.run.cnrm.cloud.google.com.yaml

@@ -589,6 +589,49 @@ spec:
                         description: A list of Volumes to make available to containers.
                         items:
                           properties:
+                            cloudSqlInstance:
+                              description: For Cloud SQL volumes, contains the specific
+                                instances that should be mounted. Visit https://cloud.google.com/sql/docs/mysql/connect-run
+                                for more information on how to connect Cloud SQL and
+                                Cloud Run.
+                              properties:
+                                instanceRefs:
+                                  items:
+                                    description: 'The Cloud SQL instance connection
+                                      names, as can be found in https://console.cloud.google.com/sql/instances.
+                                      Visit https://cloud.google.com/sql/docs/mysql/connect-run
+                                      for more information on how to connect Cloud
+                                      SQL and Cloud Run. Format: {project}:{location}:{instance}'
+                                    oneOf:
+                                    - not:
+                                        required:
+                                        - external
+                                      required:
+                                      - name
+                                    - not:
+                                        anyOf:
+                                        - required:
+                                          - name
+                                        - required:
+                                          - namespace
+                                      required:
+                                      - external
+                                    properties:
+                                      external:
+                                        description: 'Allowed value: The `connectionName`
+                                          field of a `SQLInstance` resource.'
+                                        type: string
+                                      name:
+                                        description: 'Name of the referent. More info:
+                                          https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                        type: string
+                                      namespace:
+                                        description: 'Namespace of the referent. More
+                                          info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                                        type: string
+                                    type: object
+                                  type: array
+                              type: object
                             emptyDir:
                               description: Ephemeral storage used as a shared volume.
                               properties:

config/samples/resources/runjob/job-with-sql/run_v1beta1_runjob.yaml

@@ -0,0 +1,38 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: run.cnrm.cloud.google.com/v1beta1
+kind: RunJob
+metadata:
+  name: runjob-sample-sql
+spec:
+  launchStage: "GA"
+  location: "us-central1"
+  projectRef:
+    external: ${PROJECT_ID?}
+  template:
+    template:
+      containers:
+        - image: "us-docker.pkg.dev/cloudrun/container/hello"
+          volumeMounts:
+            - name: "cloudsql"
+              mountPath: "/cloudsql"
+      volumes:
+        - name: "cloudsql"
+          cloudSqlInstance:
+            instanceRefs:
+              - name: runjob-dep-sql
+  lifecycle:
+    ignore_changes:
+    - launch_stage

config/samples/resources/runjob/job-with-sql/sql_v1beta1_sqlinstance.yaml

@@ -0,0 +1,23 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: sql.cnrm.cloud.google.com/v1beta1
+kind: SQLInstance
+metadata:
+  name: runjob-dep-sql
+spec:
+  region: us-central1
+  databaseVersion: MYSQL_5_7
+  settings:
+    tier: db-n1-standard-1

config/servicemappings/run.yaml

@@ -30,7 +30,6 @@ spec:
       - observed_generation
       - labels
       - template.labels
-      - template.template.volumes.cloud_sql_instance
     iamConfig:
       policyName: google_cloud_run_v2_job_iam_policy
       policyMemberName: google_cloud_run_v2_job_iam_member
@@ -84,6 +83,15 @@ spec:
         kind: IAMServiceAccount
         version: v1beta1
         group: iam.cnrm.cloud.google.com
+    - tfField: template.template.volumes.cloud_sql_instance.instances
+      description: |-
+        The Cloud SQL instance connection names, as can be found in https://console.cloud.google.com/sql/instances. Visit https://cloud.google.com/sql/docs/mysql/connect-run for more information on how to connect Cloud SQL and Cloud Run. Format: {project}:{location}:{instance}
+      key: instanceRefs
+      targetField: connection_name
+      gvk:
+        kind: SQLInstance
+        version: v1beta1
+        group: sql.cnrm.cloud.google.com
     - tfField: template.template.volumes.secret.secret
       description: |-
         The name of the secret in Cloud Secret Manager. Format: {secret} if the secret is in the same project. projects/{project}/secrets/{secret} if the secret is in a different project.

crds/run_v1beta1_runjob.yaml

@@ -602,6 +602,49 @@ spec:
                         description: A list of Volumes to make available to containers.
                         items:
                           properties:
+                            cloudSqlInstance:
+                              description: For Cloud SQL volumes, contains the specific
+                                instances that should be mounted. Visit https://cloud.google.com/sql/docs/mysql/connect-run
+                                for more information on how to connect Cloud SQL and Cloud
+                                Run.
+                              properties:
+                                instances:
+                                  items:
+                                    description: 'The Cloud SQL instance connection names,
+                                      as can be found in https://console.cloud.google.com/sql/instances.
+                                      Visit https://cloud.google.com/sql/docs/mysql/connect-run
+                                      for more information on how to connect Cloud SQL
+                                      and Cloud Run. Format: {project}:{location}:{instance}'
+                                    oneOf:
+                                    - not:
+                                        required:
+                                        - external
+                                      required:
+                                      - name
+                                    - not:
+                                        anyOf:
+                                        - required:
+                                          - name
+                                        - required:
+                                          - namespace
+                                      required:
+                                      - external
+                                    properties:
+                                      external:
+                                        description: 'Allowed value: The `connectionName`
+                                          field of a `SQLInstance` resource.'
+                                        type: string
+                                      name:
+                                        description: 'Name of the referent. More info:
+                                          https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                        type: string
+                                      namespace:
+                                        description: 'Namespace of the referent. More
+                                          info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                                        type: string
+                                    type: object
+                                  type: array
+                              type: object
                             emptyDir:
                               description: Ephemeral storage used as a shared volume.
                               properties:

pkg/test/resourcefixture/testdata/basic/run/v1beta1/runjob/runjobsql/create.yaml

@@ -0,0 +1,35 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: run.cnrm.cloud.google.com/v1beta1
+kind: RunJob
+metadata:
+  name: runjob-${uniqueId}
+spec:
+  launchStage: "GA"
+  location: "us-central1"
+  projectRef:
+    external: "${projectId}"
+  template:
+    template:
+      volumes:
+        - name: "cloudsql"
+          cloudSqlInstance:
+            instanceRefs:
+              - name: sqlinstance-1-${uniqueId}
+      containers:
+      - image: "us-docker.pkg.dev/cloudrun/container/hello"
+        volumeMounts:
+          - name: "cloudsql"
+            mountPath: "/cloudsql"

pkg/test/resourcefixture/testdata/basic/run/v1beta1/runjob/runjobsql/dependencies.yaml

@@ -0,0 +1,33 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: sql.cnrm.cloud.google.com/v1beta1
+kind: SQLInstance
+metadata:
+  name: sqlinstance-1-${uniqueId}
+spec:
+  region: us-central1
+  databaseVersion: MYSQL_5_7
+  settings:
+    tier: db-n1-standard-1
+---
+apiVersion: sql.cnrm.cloud.google.com/v1beta1
+kind: SQLInstance
+metadata:
+  name: sqlinstance-2-${uniqueId}
+spec:
+  region: us-central1
+  databaseVersion: MYSQL_5_7
+  settings:
+    tier: db-n1-standard-1

pkg/test/resourcefixture/testdata/basic/run/v1beta1/runjob/runjobsql/update.yaml

@@ -0,0 +1,37 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: run.cnrm.cloud.google.com/v1beta1
+kind: RunJob
+metadata:
+  name: runjob-${uniqueId}
+spec:
+  launchStage: "GA"
+  location: "us-central1"
+  projectRef:
+    external: "${projectId}"
+  template:
+    template:
+      volumes:
+        - name: "cloudsql"
+          cloudSqlInstance:
+            instanceRefs:
+              - name: sqlinstance-1-${uniqueId}
+              - name: sqlinstance-2-${uniqueId}
+      containers:
+      - name: "container-name"
+        image: "us-docker.pkg.dev/cloudrun/container/hello"
+        volumeMounts:
+          - name: "cloudsql"
+            mountPath: "/cloudsql-new-path"