diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index afb21e42..dc53bbb5 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:52b5557b7155a80e6f1684c2376d5eef0df6d8d5c785551e1ff8cc000603b62a + digest: sha256:d4b2141d65566523dfd523f63c6e6899ab1281463bce182a9f600e74b0511875 diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml index 1a23ea42..2176b054 100644 --- a/.github/blunderbuss.yml +++ b/.github/blunderbuss.yml @@ -1,5 +1,5 @@ # Configuration for the Blunderbuss GitHub app. For more info see -# https://github.com/googleapis/repo-automation-bots/tree/master/packages/blunderbuss +# https://github.com/googleapis/repo-automation-bots/tree/main/packages/blunderbuss assign_prs_by: - labels: - samples diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 32e0ea5a..6f09d695 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -2,7 +2,7 @@ rebaseMergeAllowed: false squashMergeAllowed: true mergeCommitAllowed: false branchProtectionRules: - - pattern: master + - pattern: main isAdminEnforced: true requiredApprovingReviewCount: 1 requiresCodeOwnerReviews: true diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3becb5c0..2425d723 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request: name: ci jobs: @@ -9,14 +9,15 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [8, 11] + java: [8, 11, 17] steps: - uses: actions/checkout@v2 - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: + distribution: zulu java-version: ${{matrix.java}} - run: java -version - run: .kokoro/build.sh @@ -29,8 +30,9 @@ jobs: - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: + distribution: zulu java-version: 8 - run: java -version - run: .kokoro/build.bat @@ -40,14 +42,15 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [8, 11] + java: [8, 11, 17] steps: - uses: actions/checkout@v2 - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: + distribution: zulu java-version: ${{matrix.java}} - run: java -version - run: .kokoro/dependencies.sh @@ -58,8 +61,9 @@ jobs: - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: + distribution: zulu java-version: 8 - run: java -version - run: .kokoro/build.sh @@ -72,8 +76,9 @@ jobs: - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: + distribution: zulu java-version: 8 - run: java -version - run: .kokoro/build.sh diff --git a/.kokoro/build.sh b/.kokoro/build.sh index ab7c90a8..5330d962 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -69,6 +69,11 @@ integration) verify RETURN_CODE=$? ;; +graalvm) + # Run Unit and Integration Tests with Native Image + mvn test -Pnative -Penable-integration-tests + RETURN_CODE=$? + ;; samples) SAMPLES_DIR=samples # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise. diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 9030ba8f..9a5105d7 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -28,7 +28,28 @@ source ${scriptDir}/common.sh java -version echo $JOB_TYPE -export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" +function determineMavenOpts() { + local javaVersion=$( + # filter down to the version line, then pull out the version between quotes, + # then trim the version number down to its minimal number (removing any + # update or suffix number). + java -version 2>&1 | grep "version" \ + | sed -E 's/^.*"(.*?)".*$/\1/g' \ + | sed -E 's/^(1\.[0-9]\.0).*$/\1/g' + ) + + case $javaVersion in + "17") + # MaxPermSize is no longer supported as of jdk 17 + echo -n "-Xmx1024m" + ;; + *) + echo -n "-Xmx1024m -XX:MaxPermSize=128m" + ;; + esac +} + +export MAVEN_OPTS=$(determineMavenOpts) # this should run maven enforcer retry_with_backoff 3 10 \ diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg new file mode 100644 index 00000000..4c7225ec --- /dev/null +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -0,0 +1,33 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/graalvm" +} + +env_vars: { + key: "JOB_TYPE" + value: "graalvm" +} + +# TODO: remove this after we've migrated all tests and scripts +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "secret_manager/java-it-service-account" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" +} diff --git a/.repo-metadata.json b/.repo-metadata.json index 09e00f23..8651eeaa 100644 --- a/.repo-metadata.json +++ b/.repo-metadata.json @@ -2,7 +2,7 @@ "name": "container", "name_pretty": "Kubernetes Engine", "product_documentation": "https://cloud.google.com/kubernetes-engine/", - "client_documentation": "https://googleapis.dev/java/google-cloud-container/latest/", + "client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-container/latest/history", "issue_tracker": "https://issuetracker.google.com/savedsearches/559777", "release_level": "ga", "language": "java", diff --git a/CHANGELOG.md b/CHANGELOG.md index 70ba0eef..f09ae7b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [2.2.1](https://www.github.com/googleapis/java-container/compare/v2.2.0...v2.2.1) (2021-10-19) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.4.0 ([#593](https://www.github.com/googleapis/java-container/issues/593)) ([e576bff](https://www.github.com/googleapis/java-container/commit/e576bff3aa1c36e5e19ee7a55f0e5d4427ce20ae)) + ## [2.2.0](https://www.github.com/googleapis/java-container/compare/v2.1.1...v2.2.0) (2021-09-24) diff --git a/README.md b/README.md index 6f2f5d6c..a48453bc 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 23.0.0 + 23.1.0 pom import @@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-container - 2.1.1 + 2.2.0 ``` @@ -49,20 +49,20 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies ```Groovy -implementation platform('com.google.cloud:libraries-bom:23.0.0') +implementation platform('com.google.cloud:libraries-bom:23.1.0') implementation 'com.google.cloud:google-cloud-container' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-container:2.1.1' +implementation 'com.google.cloud:google-cloud-container:2.2.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-container" % "2.1.1" +libraryDependencies += "com.google.cloud" % "google-cloud-container" % "2.2.0" ``` ## Authentication @@ -189,7 +189,7 @@ Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5] Java is a registered trademark of Oracle and/or its affiliates. [product-docs]: https://cloud.google.com/kubernetes-engine/ -[javadocs]: https://googleapis.dev/java/google-cloud-container/latest/ +[javadocs]: https://cloud.google.com/java/docs/reference/google-cloud-container/latest/history [kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-container/java7.svg [kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-container/java7.html [kokoro-badge-image-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-container/java8.svg @@ -210,10 +210,10 @@ Java is a registered trademark of Oracle and/or its affiliates. [developer-console]: https://console.developers.google.com/ [create-project]: https://cloud.google.com/resource-manager/docs/creating-managing-projects [cloud-sdk]: https://cloud.google.com/sdk/ -[troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/master/troubleshooting/readme.md#troubleshooting -[contributing]: https://github.com/googleapis/java-container/blob/master/CONTRIBUTING.md -[code-of-conduct]: https://github.com/googleapis/java-container/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct -[license]: https://github.com/googleapis/java-container/blob/master/LICENSE +[troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/main/troubleshooting/readme.md#troubleshooting +[contributing]: https://github.com/googleapis/java-container/blob/main/CONTRIBUTING.md +[code-of-conduct]: https://github.com/googleapis/java-container/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct +[license]: https://github.com/googleapis/java-container/blob/main/LICENSE [enable-api]: https://console.cloud.google.com/flows/enableapi?apiid=container.googleapis.com [libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM diff --git a/google-cloud-container-bom/pom.xml b/google-cloud-container-bom/pom.xml index 0e00807c..25ccc79a 100644 --- a/google-cloud-container-bom/pom.xml +++ b/google-cloud-container-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-container-bom - 2.2.0 + 2.2.1 pom com.google.cloud google-cloud-shared-config - 1.0.3 + 1.1.0 Google Cloud container BOM @@ -52,27 +52,27 @@ com.google.cloud google-cloud-container - 2.2.0 + 2.2.1 com.google.api.grpc grpc-google-cloud-container-v1 - 2.2.0 + 2.2.1 com.google.api.grpc grpc-google-cloud-container-v1beta1 - 2.2.0 + 2.2.1 com.google.api.grpc proto-google-cloud-container-v1 - 2.2.0 + 2.2.1 com.google.api.grpc proto-google-cloud-container-v1beta1 - 2.2.0 + 2.2.1 diff --git a/google-cloud-container/pom.xml b/google-cloud-container/pom.xml index a786d443..cc96b160 100644 --- a/google-cloud-container/pom.xml +++ b/google-cloud-container/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-container - 2.2.0 + 2.2.1 jar Google Cloud Container https://github.com/googleapis/java-container @@ -11,7 +11,7 @@ com.google.cloud google-cloud-container-parent - 2.2.0 + 2.2.1 google-cloud-container diff --git a/grpc-google-cloud-container-v1/pom.xml b/grpc-google-cloud-container-v1/pom.xml index 5610c80e..c78a8684 100644 --- a/grpc-google-cloud-container-v1/pom.xml +++ b/grpc-google-cloud-container-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-container-v1 - 2.2.0 + 2.2.1 grpc-google-cloud-container-v1 GRPC library for grpc-google-cloud-container-v1 com.google.cloud google-cloud-container-parent - 2.2.0 + 2.2.1 diff --git a/grpc-google-cloud-container-v1beta1/pom.xml b/grpc-google-cloud-container-v1beta1/pom.xml index f319da24..27f64aeb 100644 --- a/grpc-google-cloud-container-v1beta1/pom.xml +++ b/grpc-google-cloud-container-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-container-v1beta1 - 2.2.0 + 2.2.1 grpc-google-cloud-container-v1beta1 GRPC library for google-cloud-container com.google.cloud google-cloud-container-parent - 2.2.0 + 2.2.1 diff --git a/pom.xml b/pom.xml index 6bbae73c..b2928995 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-container-parent pom - 2.2.0 + 2.2.1 Google Cloud Container Parent https://github.com/googleapis/java-container @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.0.3 + 1.1.0 @@ -61,33 +61,33 @@ com.google.api.grpc proto-google-cloud-container-v1 - 2.2.0 + 2.2.1 com.google.api.grpc proto-google-cloud-container-v1beta1 - 2.2.0 + 2.2.1 com.google.api.grpc grpc-google-cloud-container-v1beta1 - 2.2.0 + 2.2.1 com.google.api.grpc grpc-google-cloud-container-v1 - 2.2.0 + 2.2.1 com.google.cloud google-cloud-container - 2.2.0 + 2.2.1 com.google.cloud google-cloud-shared-dependencies - 2.3.0 + 2.4.0 pom import diff --git a/proto-google-cloud-container-v1/pom.xml b/proto-google-cloud-container-v1/pom.xml index 13e58980..3d9e0bad 100644 --- a/proto-google-cloud-container-v1/pom.xml +++ b/proto-google-cloud-container-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-container-v1 - 2.2.0 + 2.2.1 proto-google-cloud-container-v1 PROTO library for proto-google-cloud-container-v1 com.google.cloud google-cloud-container-parent - 2.2.0 + 2.2.1 diff --git a/proto-google-cloud-container-v1beta1/pom.xml b/proto-google-cloud-container-v1beta1/pom.xml index ef45d2f9..8c60e4a0 100644 --- a/proto-google-cloud-container-v1beta1/pom.xml +++ b/proto-google-cloud-container-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-container-v1beta1 - 2.2.0 + 2.2.1 proto-google-cloud-container-v1beta1 Proto library for google-cloud-container com.google.cloud google-cloud-container-parent - 2.2.0 + 2.2.1 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index b6ce95cd..fe8f256d 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-container - 2.1.1 + 2.2.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 9b5dafbb..781e757f 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-container - 2.1.1 + 2.2.0 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 8437357c..44e0dd8a 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 23.0.0 + 23.1.0 pom import diff --git a/versions.txt b/versions.txt index 6d86b9d4..96ab15d8 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -google-cloud-container:2.2.0:2.2.0 -grpc-google-cloud-container-v1:2.2.0:2.2.0 -grpc-google-cloud-container-v1beta1:2.2.0:2.2.0 -proto-google-cloud-container-v1:2.2.0:2.2.0 -proto-google-cloud-container-v1beta1:2.2.0:2.2.0 +google-cloud-container:2.2.1:2.2.1 +grpc-google-cloud-container-v1:2.2.1:2.2.1 +grpc-google-cloud-container-v1beta1:2.2.1:2.2.1 +proto-google-cloud-container-v1:2.2.1:2.2.1 +proto-google-cloud-container-v1beta1:2.2.1:2.2.1