From d3c47364a9fd38803b3c69d689e4f26f296ce516 Mon Sep 17 00:00:00 2001 From: Eric Ho Date: Thu, 25 May 2023 20:05:31 +0800 Subject: [PATCH 1/2] google-cloud-cli - add gke-gcloud-auth-plugin option --- src/google-cloud-cli/devcontainer-feature.json | 5 +++++ src/google-cloud-cli/install.sh | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/google-cloud-cli/devcontainer-feature.json b/src/google-cloud-cli/devcontainer-feature.json index 76b1b16..2eec52f 100644 --- a/src/google-cloud-cli/devcontainer-feature.json +++ b/src/google-cloud-cli/devcontainer-feature.json @@ -12,6 +12,11 @@ ], "default": "latest", "description": "Select or enter a gcloud CLI version" + }, + "installGkeGcloudAuthPlugin": { + "type": "boolean", + "default": true, + "description": "Install 'gke-gcloud-auth-plugin' plugin?" } }, "installsAfter": [ diff --git a/src/google-cloud-cli/install.sh b/src/google-cloud-cli/install.sh index b1c3041..dfdb1a0 100644 --- a/src/google-cloud-cli/install.sh +++ b/src/google-cloud-cli/install.sh @@ -6,6 +6,7 @@ set -e rm -rf /var/lib/apt/lists/* GCLOUD_VERSION=${VERSION:-"latest"} +INSTALL_GKEGCLOUDAUTH_PLUGIN="${INSTALL_GKEGCLOUDAUTH_PLUGIN:-"false"}" if [ "$(id -u)" -ne 0 ]; then echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.' @@ -87,6 +88,12 @@ install_using_apt() { rm -f /etc/apt/sources.list.d/google-cloud-sdk.list return 1 fi + + # Install gke-gcloud-auth-plugin if needed + if [ "${INSTALL_GKEGCLOUDAUTH_PLUGIN}" = "true" ]; then + echo "(*) Installing 'gke-gcloud-auth-plugin' plugin..." + check_packages google-cloud-sdk-gke-gcloud-auth-plugin + fi } echo "(*) Installing google-cloud CLI..." @@ -98,4 +105,4 @@ install_using_apt # Clean up rm -rf /var/lib/apt/lists/* -echo "Done!" \ No newline at end of file +echo "Done!" From f46c06377f5528d3104d2cc686e5762d32197ec8 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 25 May 2023 12:07:56 +0000 Subject: [PATCH 2/2] Automated documentation update [skip ci] --- src/act/README.md | 4 +--- src/aztfy/README.md | 4 +--- src/conftest/README.md | 4 +--- src/flyctl/README.md | 4 +--- src/google-cloud-cli/README.md | 5 ++--- src/hadolint/README.md | 4 +--- src/k6/README.md | 4 +--- src/k9s/README.md | 4 +--- src/mizu/README.md | 4 +--- src/opa/README.md | 4 +--- src/oras/README.md | 4 +--- src/stern/README.md | 4 +--- src/terraform-docs/README.md | 4 +--- src/terraformer/README.md | 4 +--- src/tfsec/README.md | 4 +--- src/trivy/README.md | 4 +--- 16 files changed, 17 insertions(+), 48 deletions(-) diff --git a/src/act/README.md b/src/act/README.md index 1b57f5b..135b72a 100644 --- a/src/act/README.md +++ b/src/act/README.md @@ -7,9 +7,7 @@ Install [act](https://github.com/nektos/act) - run github action locally ```json "features": { - "ghcr.io/dhoeric/features/act:1": { - "version": "latest" - } + "ghcr.io/dhoeric/features/act:1": {} } ``` diff --git a/src/aztfy/README.md b/src/aztfy/README.md index 72ca717..1b6d334 100644 --- a/src/aztfy/README.md +++ b/src/aztfy/README.md @@ -7,9 +7,7 @@ Install [aztfy](https://github.com/Azure/aztfy) ```json "features": { - "ghcr.io/dhoeric/features/aztfy:1": { - "version": "latest" - } + "ghcr.io/dhoeric/features/aztfy:1": {} } ``` diff --git a/src/conftest/README.md b/src/conftest/README.md index 5806f08..10a6779 100644 --- a/src/conftest/README.md +++ b/src/conftest/README.md @@ -7,9 +7,7 @@ Install [conftest](https://www.conftest.dev/) ```json "features": { - "ghcr.io/dhoeric/features/conftest:1": { - "version": "latest" - } + "ghcr.io/dhoeric/features/conftest:1": {} } ``` diff --git a/src/flyctl/README.md b/src/flyctl/README.md index 459ec33..20f4482 100644 --- a/src/flyctl/README.md +++ b/src/flyctl/README.md @@ -7,9 +7,7 @@ Install [flyctl](https://github.com/superfly/flyctl) - Command line tools for [f ```json "features": { - "ghcr.io/dhoeric/features/flyctl:1": { - "version": "latest" - } + "ghcr.io/dhoeric/features/flyctl:1": {} } ``` diff --git a/src/google-cloud-cli/README.md b/src/google-cloud-cli/README.md index b182d0d..6ce9279 100644 --- a/src/google-cloud-cli/README.md +++ b/src/google-cloud-cli/README.md @@ -7,9 +7,7 @@ Install google-cloud-cli ```json "features": { - "ghcr.io/dhoeric/features/google-cloud-cli:1": { - "version": "latest" - } + "ghcr.io/dhoeric/features/google-cloud-cli:1": {} } ``` @@ -18,6 +16,7 @@ Install google-cloud-cli | Options Id | Description | Type | Default Value | |-----|-----|-----|-----| | version | Select or enter a gcloud CLI version | string | latest | +| installGkeGcloudAuthPlugin | Install 'gke-gcloud-auth-plugin' plugin? | boolean | true | diff --git a/src/hadolint/README.md b/src/hadolint/README.md index 4fc4ec3..3d33a5e 100644 --- a/src/hadolint/README.md +++ b/src/hadolint/README.md @@ -7,9 +7,7 @@ Install [hadolint](https://github.com/hadolint/hadolint) ```json "features": { - "ghcr.io/dhoeric/features/hadolint:1": { - "version": "latest" - } + "ghcr.io/dhoeric/features/hadolint:1": {} } ``` diff --git a/src/k6/README.md b/src/k6/README.md index 392a88d..f286ec8 100644 --- a/src/k6/README.md +++ b/src/k6/README.md @@ -7,9 +7,7 @@ Install [k6](https://k6.io/) ```json "features": { - "ghcr.io/dhoeric/features/k6:1": { - "version": "latest" - } + "ghcr.io/dhoeric/features/k6:1": {} } ``` diff --git a/src/k9s/README.md b/src/k9s/README.md index 4da4d32..30a80b4 100644 --- a/src/k9s/README.md +++ b/src/k9s/README.md @@ -7,9 +7,7 @@ Install [k9s](https://k9scli.io/) ```json "features": { - "ghcr.io/dhoeric/features/k9s:1": { - "version": "latest" - } + "ghcr.io/dhoeric/features/k9s:1": {} } ``` diff --git a/src/mizu/README.md b/src/mizu/README.md index 0f5cd5c..6d5d876 100644 --- a/src/mizu/README.md +++ b/src/mizu/README.md @@ -7,9 +7,7 @@ Install [mizu](https://github.com/up9inc/mizu) ```json "features": { - "ghcr.io/dhoeric/features/mizu:1": { - "version": "latest" - } + "ghcr.io/dhoeric/features/mizu:1": {} } ``` diff --git a/src/opa/README.md b/src/opa/README.md index af83a7d..eb727c3 100644 --- a/src/opa/README.md +++ b/src/opa/README.md @@ -7,9 +7,7 @@ Install [Open Policy Agent (opa)](https://www.openpolicyagent.org/docs/latest/#r ```json "features": { - "ghcr.io/dhoeric/features/opa:1": { - "version": "latest" - } + "ghcr.io/dhoeric/features/opa:1": {} } ``` diff --git a/src/oras/README.md b/src/oras/README.md index c5472ed..b6bf10f 100644 --- a/src/oras/README.md +++ b/src/oras/README.md @@ -7,9 +7,7 @@ Install [oras](https://oras.land/cli/) - OCI Registry As Storage ```json "features": { - "ghcr.io/dhoeric/features/oras:1": { - "version": "latest" - } + "ghcr.io/dhoeric/features/oras:1": {} } ``` diff --git a/src/stern/README.md b/src/stern/README.md index 615eafe..4edf673 100644 --- a/src/stern/README.md +++ b/src/stern/README.md @@ -7,9 +7,7 @@ Install [stern](https://github.com/stern/stern) - Multi pod and container log ta ```json "features": { - "ghcr.io/dhoeric/features/stern:1": { - "version": "latest" - } + "ghcr.io/dhoeric/features/stern:1": {} } ``` diff --git a/src/terraform-docs/README.md b/src/terraform-docs/README.md index cfe5055..6d7766f 100644 --- a/src/terraform-docs/README.md +++ b/src/terraform-docs/README.md @@ -7,9 +7,7 @@ Install [terraform-docs](https://terraform-docs.io/) ```json "features": { - "ghcr.io/dhoeric/features/terraform-docs:1": { - "version": "latest" - } + "ghcr.io/dhoeric/features/terraform-docs:1": {} } ``` diff --git a/src/terraformer/README.md b/src/terraformer/README.md index bfcff05..864beda 100644 --- a/src/terraformer/README.md +++ b/src/terraformer/README.md @@ -7,9 +7,7 @@ Install [terraformer](https://github.com/GoogleCloudPlatform/terraformer) ```json "features": { - "ghcr.io/dhoeric/features/terraformer:1": { - "version": "latest" - } + "ghcr.io/dhoeric/features/terraformer:1": {} } ``` diff --git a/src/tfsec/README.md b/src/tfsec/README.md index eae3159..caa7be3 100644 --- a/src/tfsec/README.md +++ b/src/tfsec/README.md @@ -7,9 +7,7 @@ Install [tfsec](https://aquasecurity.github.io/tfsec/) ```json "features": { - "ghcr.io/dhoeric/features/tfsec:1": { - "version": "latest" - } + "ghcr.io/dhoeric/features/tfsec:1": {} } ``` diff --git a/src/trivy/README.md b/src/trivy/README.md index bd6a472..67cf39d 100644 --- a/src/trivy/README.md +++ b/src/trivy/README.md @@ -7,9 +7,7 @@ Install [trivy](https://trivy.dev/) ```json "features": { - "ghcr.io/dhoeric/features/trivy:1": { - "version": "latest" - } + "ghcr.io/dhoeric/features/trivy:1": {} } ```