Merge branch 'GoogleCloudPlatform:master' into add-poco-test

.gitattributes

@@ -1,4 +1,5 @@
 mockgcp/generated/** linguist-generated=true
 pkg/clients/generated/** linguist-generated=true
+**/*.generated.go linguist-generated=true
 
 **/go.sum linguist-generated=true

.github/license-lint-config.yml

@@ -18,6 +18,7 @@ unrestricted_licenses:
   - BSD-3-Clause
   - BSD-2-Clause
   - 0BSD
+  - CC-BY-3.0
 
 reciprocal_licenses:
   - MPL-2.0

.github/workflows/lint.yaml

@@ -32,7 +32,7 @@ jobs:
   lint:
     name: lint
     runs-on: ubuntu-22.04
-    timeout-minutes: 7
+    timeout-minutes: 12
     steps:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v3
@@ -47,3 +47,4 @@ jobs:
         uses: golangci/[email protected]
         with:
           version: v1.59.1 # should match the version in Makefile
+          args: --timeout=10m

.github/workflows/presubmit-compositions.yaml

@@ -30,7 +30,7 @@ jobs:
   lint:
     name: lint
     runs-on: ubuntu-22.04
-    timeout-minutes: 7
+    timeout-minutes: 12
     steps:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v4
@@ -46,7 +46,7 @@ jobs:
         with:
           working-directory: ./experiments/compositions/composition
           version: v1.59.1 # should match the version in Makefile
-          args: --timeout=5m
+          args: --timeout=10m
   verify-goimports:
     runs-on: ubuntu-latest
     steps:

.github/workflows/presubmit.yaml

@@ -62,7 +62,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: '!cancelled()'
         with:
-          name: unitest_result
+          name: unittest_result
           path: unittest_result.json
           retention-days: 5
   tests-e2e-samples:
@@ -79,9 +79,9 @@ jobs:
         env:
           ARTIFACTS: /tmp/artifacts
       - name: "Upload artifacts"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: artifacts
+          name: artifacts-tests-e2e-samples
           path: /tmp/artifacts/
   tests-e2e-fixtures:
     runs-on: ubuntu-latest
@@ -97,9 +97,9 @@ jobs:
         env:
           ARTIFACTS: /tmp/artifacts
       - name: "Upload artifacts"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: artifacts
+          name: artifacts-tests-e2e-fixtures
           path: /tmp/artifacts/
   tests-e2e-fixtures-compute:
     runs-on: ubuntu-latest
@@ -115,9 +115,9 @@ jobs:
         env:
           ARTIFACTS: /tmp/artifacts
       - name: "Upload artifacts"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: artifacts
+          name: artifacts-tests-e2e-fixtures-compute
           path: /tmp/artifacts/
   tests-e2e-fixtures-gkehub:
     runs-on: ubuntu-latest
@@ -133,13 +133,31 @@ jobs:
         env:
           ARTIFACTS: /tmp/artifacts
       - name: "Upload artifacts"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
+        with:
+          name: artifacts-tests-e2e-fixtures-gkehub
+          path: /tmp/artifacts/
+  tests-e2e-fixtures-sql:
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: 'go.mod'
+      - name: "Run mock fixtures tests for sql service"
+        run: |
+          ./scripts/github-actions/tests-e2e-fixtures-sql
+        env:
+          ARTIFACTS: /tmp/artifacts
+      - name: "Upload artifacts"
+        uses: actions/upload-artifact@v4
         with:
-          name: artifacts
+          name: artifacts-tests-e2e-fixtures-sql
           path: /tmp/artifacts/
   pause-tests:
     runs-on: ubuntu-22.04
-    timeout-minutes: 60
+    timeout-minutes: 90
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
@@ -194,6 +212,17 @@ jobs:
           dev/tasks/build-images
     env:
       PROJECT_ID: cnrm-test
+  test-mappers-roundtrip:
+    runs-on: ubuntu-22.04
+    timeout-minutes: 60
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: 'go.mod'
+      - name: "dev/ci/presubmits/test-mappers-roundtrip"
+        run: |
+          dev/ci/presubmits/test-mappers-roundtrip
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
   cancel-in-progress: true

.golangci.yaml

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 run:
-  timeout: 5m
+  timeout: 10m
 issues:
   exclude-dirs:
     - third_party

CONTRIBUTING.md

@@ -35,6 +35,15 @@ You need to set up your own DEV environment before contributing to this project.
 
 We follow the typical contribution flow similar to most OSS projects on GitHub.
 
+### Configure Variables
+
+Export the `GITHUB_USERNAME` environment variable which will be used in subsequent
+steps.
+
+```
+export GITHUB_USERNAME=YOUR_USERNAME
+```
+
 ### Fork and pull
 
 We follow the
@@ -64,13 +73,13 @@ summary, you perform the follow steps to get your fork ready:
     https://docs.github.com/en/get-started/quickstart/fork-a-repo#cloning-your-forked-repository
 
     We recommend you to create the local clone under the path
-    `~/go/src/github.com/YOUR_USERNAME`. This will help to avoid a few known
+    `~/go/src/github.com/$GITHUB_USERNAME`. This will help to avoid a few known
     build frictions related to generated code.
 
     ```shell
-    mkdir -p ~/go/src/github.com/YOUR_USERNAME
-    cd ~/go/src/github.com/YOUR_USERNAME
-    git clone https://github.com/YOUR_USERNAME/k8s-config-connector   # If you use ssh key auth, this will be [email protected]:YOUR_USERNAME/k8s-config-connector.git
+    mkdir -p ~/go/src/github.com/$GITHUB_USERNAME
+    cd ~/go/src/github.com/$GITHUB_USERNAME
+    git clone https://github.com/$GITHUB_USERNAME/k8s-config-connector   # If you use ssh key auth, this will be [email protected]:$GITHUB_USERNAME/k8s-config-connector.git
     ```
 
 ### Set up your environment
@@ -96,7 +105,7 @@ repo to quickly set up a local dev environment.
 1.  Change to environment-setup directory.
 
     ```shell
-    cd ~/go/src/github.com/YOUR_USERNAME/k8s-config-connector/scripts/environment-setup
+    cd ~/go/src/github.com/$GITHUB_USERNAME/k8s-config-connector/scripts/environment-setup
     ```
 
 1.  Set up sudoless Docker.
@@ -115,7 +124,7 @@ repo to quickly set up a local dev environment.
 1.  Install Golang.
 
     ```shell
-    cd ~/go/src/github.com/YOUR_USERNAME/k8s-config-connector/scripts/environment-setup
+    cd ~/go/src/github.com/$GITHUB_USERNAME/k8s-config-connector/scripts/environment-setup
     ./golang-setup.sh
     source ~/.profile
     ```
@@ -153,7 +162,7 @@ repo to quickly set up a local dev environment.
         validate creation of this resource in the next step. So we can do:
 
         ```shell
-        cd ~/go/src/github.com/YOUR_USERNAME/k8s-config-connector
+        cd ~/go/src/github.com/$GITHUB_USERNAME/k8s-config-connector
         make manifests
         kubectl apply -f config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_artifactregistryrepositories.artifactregistry.cnrm.cloud.google.com.yaml
         ```
@@ -172,6 +181,20 @@ repo to quickly set up a local dev environment.
         make deploy-controller
         ```
 
+    1. If you want to install config connector on a brand new GKE cluster, the following command will install all CRDs, locally build, push and deploy all workloads to a standard GKE cluster.
+
+        ```shell
+        make deploy-kcc-standard
+        make install
+        ```
+    
+        For autopilot clusters, please use the following command.
+
+        ```shell
+        make deploy-kcc-autopilot
+        make install
+        ```
+
 ### Validate your environment
 
 The script `gcp-setup.sh` annotates your `default` namespace in the GKE cluster