From a8bc77a0df3c0b51bbfaa553504f8616797c18fa Mon Sep 17 00:00:00 2001 From: Umesh Kumhar Date: Sat, 17 Sep 2022 13:05:39 +0530 Subject: [PATCH 1/4] gke infra --- infra/gke/development.values | 19 ++++ infra/gke/run.sh | 97 ++++++++++++++++ infra/gke/terraform/main.tf | 94 +++++++++++++++ infra/gke/terraform/variables.tf | 107 ++++++++++++++++++ .../okd-cluster}/3.11/readme.md | 0 .../okd-cluster}/3.11/script/okd-create.sh | 0 .../okd-cluster}/3.11/script/okd-delete.sh | 0 .../okd-cluster}/3.11/script/variables.sh | 0 .../okd-cluster}/3.11/terraform/LICENSE | 0 .../okd-cluster}/3.11/terraform/backend.tf | 0 .../okd-cluster}/3.11/terraform/compute.tf | 0 .../okd-cluster}/3.11/terraform/dns.tf | 0 .../okd-cluster}/3.11/terraform/iam.tf | 0 .../okd-cluster}/3.11/terraform/inventory.tf | 0 .../okd-cluster}/3.11/terraform/main.tf | 0 .../modules/gcp_tf_network/README.md | 0 .../terraform/modules/gcp_tf_network/main.tf | 0 .../modules/gcp_tf_network/outputs.tf | 0 .../modules/gcp_tf_network/variables.tf | 0 .../okd-cluster}/3.11/terraform/network.tf | 0 .../okd-template/ansible-hosts.template.txt | 0 .../okd-cluster}/3.11/terraform/output.tf | 0 .../okd-cluster}/3.11/terraform/project.tf | 0 .../okd-cluster}/3.11/terraform/providers.tf | 0 .../3.11/terraform/terraform.tfvars.sample | 0 .../okd-cluster}/3.11/terraform/variables.tf | 0 .../4.x/01-projectsetup/README.md | 0 .../okd-cluster}/4.x/01-projectsetup/main.tf | 0 .../4.x/01-projectsetup/output.tf | 0 .../template/install-config-template.yaml | 0 .../4.x/01-projectsetup/variables.tf | 0 .../4.x/02-appdeployment/README.md | 0 .../kubernetes-manifests/accounts-db.yaml | 0 .../kubernetes-manifests/balance-reader.yaml | 0 .../kubernetes-manifests/config.yaml | 0 .../kubernetes-manifests/contacts.yaml | 0 .../kubernetes-manifests/frontend.yaml | 0 .../kubernetes-manifests/jwt/README.md | 0 .../kubernetes-manifests/jwt/jwt-secret.yaml | 0 .../kubernetes-manifests/ledger-db.yaml | 0 .../kubernetes-manifests/ledger-writer.yaml | 0 .../kubernetes-manifests/loadgenerator.yaml | 0 .../transaction-history.yaml | 0 .../kubernetes-manifests/userservice.yaml | 0 .../hello-python/deployment.tf | 0 .../02-appdeployment/hello-python/output.tf | 0 .../02-appdeployment/hello-python/provider.tf | 0 .../hello-python/provider.tf.template | 0 .../02-appdeployment/hello-python/service.tf | 0 .../okd-cluster}/4.x/README.md | 0 .../okd-cluster}/4.x/destroy.sh | 0 .../okd-cluster}/4.x/install.sh | 0 {okd-cluster => infra/okd-cluster}/README.md | 0 53 files changed, 317 insertions(+) create mode 100644 infra/gke/development.values create mode 100755 infra/gke/run.sh create mode 100644 infra/gke/terraform/main.tf create mode 100644 infra/gke/terraform/variables.tf rename {okd-cluster => infra/okd-cluster}/3.11/readme.md (100%) rename {okd-cluster => infra/okd-cluster}/3.11/script/okd-create.sh (100%) rename {okd-cluster => infra/okd-cluster}/3.11/script/okd-delete.sh (100%) rename {okd-cluster => infra/okd-cluster}/3.11/script/variables.sh (100%) rename {okd-cluster => infra/okd-cluster}/3.11/terraform/LICENSE (100%) rename {okd-cluster => infra/okd-cluster}/3.11/terraform/backend.tf (100%) rename {okd-cluster => infra/okd-cluster}/3.11/terraform/compute.tf (100%) rename {okd-cluster => infra/okd-cluster}/3.11/terraform/dns.tf (100%) rename {okd-cluster => infra/okd-cluster}/3.11/terraform/iam.tf (100%) rename {okd-cluster => infra/okd-cluster}/3.11/terraform/inventory.tf (100%) rename {okd-cluster => infra/okd-cluster}/3.11/terraform/main.tf (100%) rename {okd-cluster => infra/okd-cluster}/3.11/terraform/modules/gcp_tf_network/README.md (100%) rename {okd-cluster => infra/okd-cluster}/3.11/terraform/modules/gcp_tf_network/main.tf (100%) rename {okd-cluster => infra/okd-cluster}/3.11/terraform/modules/gcp_tf_network/outputs.tf (100%) rename {okd-cluster => infra/okd-cluster}/3.11/terraform/modules/gcp_tf_network/variables.tf (100%) rename {okd-cluster => infra/okd-cluster}/3.11/terraform/network.tf (100%) rename {okd-cluster => infra/okd-cluster}/3.11/terraform/okd-template/ansible-hosts.template.txt (100%) rename {okd-cluster => infra/okd-cluster}/3.11/terraform/output.tf (100%) rename {okd-cluster => infra/okd-cluster}/3.11/terraform/project.tf (100%) rename {okd-cluster => infra/okd-cluster}/3.11/terraform/providers.tf (100%) rename {okd-cluster => infra/okd-cluster}/3.11/terraform/terraform.tfvars.sample (100%) rename {okd-cluster => infra/okd-cluster}/3.11/terraform/variables.tf (100%) rename {okd-cluster => infra/okd-cluster}/4.x/01-projectsetup/README.md (100%) rename {okd-cluster => infra/okd-cluster}/4.x/01-projectsetup/main.tf (100%) rename {okd-cluster => infra/okd-cluster}/4.x/01-projectsetup/output.tf (100%) rename {okd-cluster => infra/okd-cluster}/4.x/01-projectsetup/template/install-config-template.yaml (100%) rename {okd-cluster => infra/okd-cluster}/4.x/01-projectsetup/variables.tf (100%) rename {okd-cluster => infra/okd-cluster}/4.x/02-appdeployment/README.md (100%) rename {okd-cluster => infra/okd-cluster}/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/accounts-db.yaml (100%) rename {okd-cluster => infra/okd-cluster}/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/balance-reader.yaml (100%) rename {okd-cluster => infra/okd-cluster}/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/config.yaml (100%) rename {okd-cluster => infra/okd-cluster}/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/contacts.yaml (100%) rename {okd-cluster => infra/okd-cluster}/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/frontend.yaml (100%) rename {okd-cluster => infra/okd-cluster}/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/jwt/README.md (100%) rename {okd-cluster => infra/okd-cluster}/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/jwt/jwt-secret.yaml (100%) rename {okd-cluster => infra/okd-cluster}/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/ledger-db.yaml (100%) rename {okd-cluster => infra/okd-cluster}/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/ledger-writer.yaml (100%) rename {okd-cluster => infra/okd-cluster}/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/loadgenerator.yaml (100%) rename {okd-cluster => infra/okd-cluster}/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/transaction-history.yaml (100%) rename {okd-cluster => infra/okd-cluster}/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/userservice.yaml (100%) rename {okd-cluster => infra/okd-cluster}/4.x/02-appdeployment/hello-python/deployment.tf (100%) rename {okd-cluster => infra/okd-cluster}/4.x/02-appdeployment/hello-python/output.tf (100%) rename {okd-cluster => infra/okd-cluster}/4.x/02-appdeployment/hello-python/provider.tf (100%) rename {okd-cluster => infra/okd-cluster}/4.x/02-appdeployment/hello-python/provider.tf.template (100%) rename {okd-cluster => infra/okd-cluster}/4.x/02-appdeployment/hello-python/service.tf (100%) rename {okd-cluster => infra/okd-cluster}/4.x/README.md (100%) rename {okd-cluster => infra/okd-cluster}/4.x/destroy.sh (100%) rename {okd-cluster => infra/okd-cluster}/4.x/install.sh (100%) rename {okd-cluster => infra/okd-cluster}/README.md (100%) diff --git a/infra/gke/development.values b/infra/gke/development.values new file mode 100644 index 00000000..a2390160 --- /dev/null +++ b/infra/gke/development.values @@ -0,0 +1,19 @@ +billing_account_id="xxxxxxx" +parent="organizations/111111111" +project_id="okd-development-123" +project_create="true" + +region="us-central1" +vpc_network_name="test" +vpc_subnetwork_name = "test-sn" +vpc_subnetwork_cidr="10.0.0.0/24" +vpc_create="true" + +gke_cluster_name="pipeline" +gke_location="us-central1-b" +gke_pods_secondary_cidr="172.16.0.0/20" +gke_services_secondary_cidr="192.168.0.0/24" + +gke_nodepool_name="nodepool" +gke_nodepool_count=2 + diff --git a/infra/gke/run.sh b/infra/gke/run.sh new file mode 100755 index 00000000..aac5170d --- /dev/null +++ b/infra/gke/run.sh @@ -0,0 +1,97 @@ +#! /bin/bash + +######################## Optional Vairables(modification not required) ############################ +CWD_PATH="$(pwd)" +VALUES_FILE_NAME="development.values" +VALUES_FILE_PATH="$CWD_PATH/$VALUES_FILE_NAME" +##################################################################### +function usage() +{ + echo "\n" + echo "The script is used to perform multiple operations on cluster that includes setup and destroy with the help of values file." + echo "It takes option arguments and process them in given order! " + echo "" + echo "USAGE: " + echo "./run.sh" + echo "\t-h --help" + echo "\t--values=development.values (default)" + echo "\t--setup" + echo "\t--destroy" + echo "" + echo "Example:" + echo "sh run.sh --values test.values --setup --destroy" +} + +function loadvars() +{ + echo "Loading values file: ${VALUES_FILE_PATH}" + set -o allexport + source "$VALUES_FILE_PATH" + set +o allexport +} + +function destroy() +{ + echo "############################################################" + echo "Initiating the destroy process...." + echo "############################################################" + + terraform -chdir=terraform destroy -var-file "$VALUES_FILE_PATH" -auto-approve +} + +function setup() +{ + echo "############################################################" + echo "Initiating the setup process...." + echo "############################################################" + + # Creates pre-reqs for the cluster + terraform -chdir=terraform init + terraform -chdir=terraform plan -var-file "$VALUES_FILE_PATH" + terraform -chdir=terraform apply -var-file "$VALUES_FILE_PATH" -auto-approve + + echo "############################################################" + echo "Waiting for 60 seconds for resources to be ready..." + echo "############################################################" + sleep 60 + + ## export kubeconfig on local + gcloud container clusters get-credentials ${gke_cluster_name} --zone ${gke_location} +} + + + +## we want at least one parameter +if [ $# -eq 0 ]; then + usage >&2 + exit 1 +fi + +## handle shell options here +while [ "$1" != "" ]; do + PARAM=`echo $1 | awk -F= '{print $1}'` + VALUE=`echo $1 | awk -F= '{print $2}'` + case $PARAM in + -h | --help) + usage + exit + ;; + --values) + VALUES_FILE_NAME=$VALUE + VALUES_FILE_PATH="$CWD_PATH/$VALUES_FILE_NAME" + loadvars + ;; + --setup) + setup + ;; + --destroy) + destroy + ;; + *) + echo "ERROR: unknown parameter \"$PARAM\"" + usage + exit 1 + ;; + esac + shift +done diff --git a/infra/gke/terraform/main.tf b/infra/gke/terraform/main.tf new file mode 100644 index 00000000..dcfdfc44 --- /dev/null +++ b/infra/gke/terraform/main.tf @@ -0,0 +1,94 @@ + + + +module "project" { + source = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/project" + billing_account = var.billing_account_id + name = var.project_id + parent = var.parent + prefix = null + project_create = var.project_create + services = [ + "compute.googleapis.com", + "cloudapis.googleapis.com", + "cloudresourcemanager.googleapis.com", + "container.googleapis.com", + "iamcredentials.googleapis.com", + "iam.googleapis.com", + "servicemanagement.googleapis.com", + "serviceusage.googleapis.com", + "storage-api.googleapis.com", + "storage-component.googleapis.com", + ] + policy_boolean = { + "constraints/iam.disableServiceAccountKeyCreation" = false + "constraints/compute.skipDefaultNetworkCreation" = true + } + policy_list = { + "constraints/compute.restrictLoadBalancerCreationForTypes" = { + inherit_from_parent = null + suggested_value = null + status = true + values = [] + }, + "constraints/compute.vmExternalIpAccess" = { + inherit_from_parent = null + suggested_value = null + status = true + values = [] + }, + "constraints/compute.restrictCloudNATUsage" = { + inherit_from_parent = null + suggested_value = null + status = true + values = ["under:projects/${var.project_id}"] + }, + } + service_config = { + disable_on_destroy = false + disable_dependent_services = false + } +} + +module "vpc" { + source = "github.com/GoogleCloudPlatform/cloud-foundation-fabric/modules/net-vpc" + project_id = module.project.project_id + name = var.vpc_network_name + vpc_create = var.vpc_create + subnets = [ + { + ip_cidr_range = var.vpc_subnetwork_cidr + name = var.vpc_subnetwork_name + region = var.region + secondary_ip_range = { + pods = var.gke_pods_secondary_cidr + services = var.gke_services_secondary_cidr + } + } + ] +} + +module "gke" { + source = "github.com/GoogleCloudPlatform/cloud-foundation-fabric/modules/gke-cluster" + project_id = module.project.project_id + name = var.gke_cluster_name + location = var.gke_location + network = module.vpc.self_link + subnetwork = module.vpc.subnet_self_links["${var.region}/${var.vpc_subnetwork_name}"] + secondary_range_pods = "pods" + secondary_range_services = "services" + default_max_pods_per_node = 32 + labels = { + environment = "development" + } +} + +module "gke-nodepool" { + source = "github.com/GoogleCloudPlatform/cloud-foundation-fabric/modules/gke-nodepool" + project_id = module.project.project_id + cluster_name = module.gke.name + location = module.gke.location + name = var.gke_nodepool_name + node_count = var.gke_nodepool_count + node_service_account_create = true +} diff --git a/infra/gke/terraform/variables.tf b/infra/gke/terraform/variables.tf new file mode 100644 index 00000000..34be5004 --- /dev/null +++ b/infra/gke/terraform/variables.tf @@ -0,0 +1,107 @@ +variable "project_id" { + description = "The GCP project you want to enable APIs and create your project." + type = string + default = "" +} + +variable "project_create" { + description = "This flag will help to either create a new project or use a project that already exists." + type = bool + default = false +} + +variable "vpc_create" { + description = "This flag will help to either create a new vpc or use a vpc that already exists." + type = bool + default = false +} + +variable "region" { + type = string + default = "us-central1" + description = "Region where the cluster and its resources will be created." +} + +variable "billing_account_id" { + type = string + description = "Billing account id to be associated with the project." +} + +variable "parent" { + type = string + description = "parent orgId under which the project exists(or will be created)." +} + +variable "enable_apis" { + description = "Whether to actually enable the APIs. If false, this module is a no-op." + default = true + type = bool +} + +variable "disable_services_on_destroy" { + description = "Whether project services will be disabled when the resources are destroyed. https://www.terraform.io/docs/providers/google/r/google_project_service.html#disable_on_destroy" + default = false + type = bool +} + +variable "disable_dependent_services" { + description = "Whether services that are enabled and which depend on this service should also be disabled when this service is destroyed. https://www.terraform.io/docs/providers/google/r/google_project_service.html#disable_dependent_services" + default = false + type = bool +} + +variable "vpc_network_name" { + description = "The vpc network name that needs to be used." + type = string + default = "" +} + +variable "vpc_subnetwork_name" { + description = "The vpc subnetwork name that needs to be used." + type = string + default = "" +} + +variable "vpc_subnetwork_cidr" { + description = "The vpc subnetwork cidr that needs to be used." + type = string + default = "" +} + +variable "gke_pods_secondary_cidr" { + description = "The vpc subnetwork secondary range cidr that needs to be used for pods in gke." + type = string + default = "" +} + +variable "gke_services_secondary_cidr" { + description = "The vpc subnetwork secondary range cidr that needs to be used for services in gke." + type = string + default = "" +} + +variable "gke_cluster_name" { + description = "The gke cluster name that needs to be used." + type = string + default = "" +} + + +variable "gke_location" { + description = "The gke network location that needs to be used." + type = string + default = "" +} + +variable "gke_nodepool_name" { + description = "The gke nodepool name that will be used." + type = string + default = "default-nodepool" +} + +variable "gke_nodepool_count" { + description = "The gke nodepool node count." + type = number + default = 1 +} + diff --git a/okd-cluster/3.11/readme.md b/infra/okd-cluster/3.11/readme.md similarity index 100% rename from okd-cluster/3.11/readme.md rename to infra/okd-cluster/3.11/readme.md diff --git a/okd-cluster/3.11/script/okd-create.sh b/infra/okd-cluster/3.11/script/okd-create.sh similarity index 100% rename from okd-cluster/3.11/script/okd-create.sh rename to infra/okd-cluster/3.11/script/okd-create.sh diff --git a/okd-cluster/3.11/script/okd-delete.sh b/infra/okd-cluster/3.11/script/okd-delete.sh similarity index 100% rename from okd-cluster/3.11/script/okd-delete.sh rename to infra/okd-cluster/3.11/script/okd-delete.sh diff --git a/okd-cluster/3.11/script/variables.sh b/infra/okd-cluster/3.11/script/variables.sh similarity index 100% rename from okd-cluster/3.11/script/variables.sh rename to infra/okd-cluster/3.11/script/variables.sh diff --git a/okd-cluster/3.11/terraform/LICENSE b/infra/okd-cluster/3.11/terraform/LICENSE similarity index 100% rename from okd-cluster/3.11/terraform/LICENSE rename to infra/okd-cluster/3.11/terraform/LICENSE diff --git a/okd-cluster/3.11/terraform/backend.tf b/infra/okd-cluster/3.11/terraform/backend.tf similarity index 100% rename from okd-cluster/3.11/terraform/backend.tf rename to infra/okd-cluster/3.11/terraform/backend.tf diff --git a/okd-cluster/3.11/terraform/compute.tf b/infra/okd-cluster/3.11/terraform/compute.tf similarity index 100% rename from okd-cluster/3.11/terraform/compute.tf rename to infra/okd-cluster/3.11/terraform/compute.tf diff --git a/okd-cluster/3.11/terraform/dns.tf b/infra/okd-cluster/3.11/terraform/dns.tf similarity index 100% rename from okd-cluster/3.11/terraform/dns.tf rename to infra/okd-cluster/3.11/terraform/dns.tf diff --git a/okd-cluster/3.11/terraform/iam.tf b/infra/okd-cluster/3.11/terraform/iam.tf similarity index 100% rename from okd-cluster/3.11/terraform/iam.tf rename to infra/okd-cluster/3.11/terraform/iam.tf diff --git a/okd-cluster/3.11/terraform/inventory.tf b/infra/okd-cluster/3.11/terraform/inventory.tf similarity index 100% rename from okd-cluster/3.11/terraform/inventory.tf rename to infra/okd-cluster/3.11/terraform/inventory.tf diff --git a/okd-cluster/3.11/terraform/main.tf b/infra/okd-cluster/3.11/terraform/main.tf similarity index 100% rename from okd-cluster/3.11/terraform/main.tf rename to infra/okd-cluster/3.11/terraform/main.tf diff --git a/okd-cluster/3.11/terraform/modules/gcp_tf_network/README.md b/infra/okd-cluster/3.11/terraform/modules/gcp_tf_network/README.md similarity index 100% rename from okd-cluster/3.11/terraform/modules/gcp_tf_network/README.md rename to infra/okd-cluster/3.11/terraform/modules/gcp_tf_network/README.md diff --git a/okd-cluster/3.11/terraform/modules/gcp_tf_network/main.tf b/infra/okd-cluster/3.11/terraform/modules/gcp_tf_network/main.tf similarity index 100% rename from okd-cluster/3.11/terraform/modules/gcp_tf_network/main.tf rename to infra/okd-cluster/3.11/terraform/modules/gcp_tf_network/main.tf diff --git a/okd-cluster/3.11/terraform/modules/gcp_tf_network/outputs.tf b/infra/okd-cluster/3.11/terraform/modules/gcp_tf_network/outputs.tf similarity index 100% rename from okd-cluster/3.11/terraform/modules/gcp_tf_network/outputs.tf rename to infra/okd-cluster/3.11/terraform/modules/gcp_tf_network/outputs.tf diff --git a/okd-cluster/3.11/terraform/modules/gcp_tf_network/variables.tf b/infra/okd-cluster/3.11/terraform/modules/gcp_tf_network/variables.tf similarity index 100% rename from okd-cluster/3.11/terraform/modules/gcp_tf_network/variables.tf rename to infra/okd-cluster/3.11/terraform/modules/gcp_tf_network/variables.tf diff --git a/okd-cluster/3.11/terraform/network.tf b/infra/okd-cluster/3.11/terraform/network.tf similarity index 100% rename from okd-cluster/3.11/terraform/network.tf rename to infra/okd-cluster/3.11/terraform/network.tf diff --git a/okd-cluster/3.11/terraform/okd-template/ansible-hosts.template.txt b/infra/okd-cluster/3.11/terraform/okd-template/ansible-hosts.template.txt similarity index 100% rename from okd-cluster/3.11/terraform/okd-template/ansible-hosts.template.txt rename to infra/okd-cluster/3.11/terraform/okd-template/ansible-hosts.template.txt diff --git a/okd-cluster/3.11/terraform/output.tf b/infra/okd-cluster/3.11/terraform/output.tf similarity index 100% rename from okd-cluster/3.11/terraform/output.tf rename to infra/okd-cluster/3.11/terraform/output.tf diff --git a/okd-cluster/3.11/terraform/project.tf b/infra/okd-cluster/3.11/terraform/project.tf similarity index 100% rename from okd-cluster/3.11/terraform/project.tf rename to infra/okd-cluster/3.11/terraform/project.tf diff --git a/okd-cluster/3.11/terraform/providers.tf b/infra/okd-cluster/3.11/terraform/providers.tf similarity index 100% rename from okd-cluster/3.11/terraform/providers.tf rename to infra/okd-cluster/3.11/terraform/providers.tf diff --git a/okd-cluster/3.11/terraform/terraform.tfvars.sample b/infra/okd-cluster/3.11/terraform/terraform.tfvars.sample similarity index 100% rename from okd-cluster/3.11/terraform/terraform.tfvars.sample rename to infra/okd-cluster/3.11/terraform/terraform.tfvars.sample diff --git a/okd-cluster/3.11/terraform/variables.tf b/infra/okd-cluster/3.11/terraform/variables.tf similarity index 100% rename from okd-cluster/3.11/terraform/variables.tf rename to infra/okd-cluster/3.11/terraform/variables.tf diff --git a/okd-cluster/4.x/01-projectsetup/README.md b/infra/okd-cluster/4.x/01-projectsetup/README.md similarity index 100% rename from okd-cluster/4.x/01-projectsetup/README.md rename to infra/okd-cluster/4.x/01-projectsetup/README.md diff --git a/okd-cluster/4.x/01-projectsetup/main.tf b/infra/okd-cluster/4.x/01-projectsetup/main.tf similarity index 100% rename from okd-cluster/4.x/01-projectsetup/main.tf rename to infra/okd-cluster/4.x/01-projectsetup/main.tf diff --git a/okd-cluster/4.x/01-projectsetup/output.tf b/infra/okd-cluster/4.x/01-projectsetup/output.tf similarity index 100% rename from okd-cluster/4.x/01-projectsetup/output.tf rename to infra/okd-cluster/4.x/01-projectsetup/output.tf diff --git a/okd-cluster/4.x/01-projectsetup/template/install-config-template.yaml b/infra/okd-cluster/4.x/01-projectsetup/template/install-config-template.yaml similarity index 100% rename from okd-cluster/4.x/01-projectsetup/template/install-config-template.yaml rename to infra/okd-cluster/4.x/01-projectsetup/template/install-config-template.yaml diff --git a/okd-cluster/4.x/01-projectsetup/variables.tf b/infra/okd-cluster/4.x/01-projectsetup/variables.tf similarity index 100% rename from okd-cluster/4.x/01-projectsetup/variables.tf rename to infra/okd-cluster/4.x/01-projectsetup/variables.tf diff --git a/okd-cluster/4.x/02-appdeployment/README.md b/infra/okd-cluster/4.x/02-appdeployment/README.md similarity index 100% rename from okd-cluster/4.x/02-appdeployment/README.md rename to infra/okd-cluster/4.x/02-appdeployment/README.md diff --git a/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/accounts-db.yaml b/infra/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/accounts-db.yaml similarity index 100% rename from okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/accounts-db.yaml rename to infra/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/accounts-db.yaml diff --git a/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/balance-reader.yaml b/infra/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/balance-reader.yaml similarity index 100% rename from okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/balance-reader.yaml rename to infra/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/balance-reader.yaml diff --git a/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/config.yaml b/infra/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/config.yaml similarity index 100% rename from okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/config.yaml rename to infra/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/config.yaml diff --git a/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/contacts.yaml b/infra/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/contacts.yaml similarity index 100% rename from okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/contacts.yaml rename to infra/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/contacts.yaml diff --git a/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/frontend.yaml b/infra/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/frontend.yaml similarity index 100% rename from okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/frontend.yaml rename to infra/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/frontend.yaml diff --git a/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/jwt/README.md b/infra/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/jwt/README.md similarity index 100% rename from okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/jwt/README.md rename to infra/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/jwt/README.md diff --git a/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/jwt/jwt-secret.yaml b/infra/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/jwt/jwt-secret.yaml similarity index 100% rename from okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/jwt/jwt-secret.yaml rename to infra/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/jwt/jwt-secret.yaml diff --git a/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/ledger-db.yaml b/infra/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/ledger-db.yaml similarity index 100% rename from okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/ledger-db.yaml rename to infra/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/ledger-db.yaml diff --git a/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/ledger-writer.yaml b/infra/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/ledger-writer.yaml similarity index 100% rename from okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/ledger-writer.yaml rename to infra/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/ledger-writer.yaml diff --git a/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/loadgenerator.yaml b/infra/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/loadgenerator.yaml similarity index 100% rename from okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/loadgenerator.yaml rename to infra/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/loadgenerator.yaml diff --git a/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/transaction-history.yaml b/infra/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/transaction-history.yaml similarity index 100% rename from okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/transaction-history.yaml rename to infra/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/transaction-history.yaml diff --git a/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/userservice.yaml b/infra/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/userservice.yaml similarity index 100% rename from okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/userservice.yaml rename to infra/okd-cluster/4.x/02-appdeployment/bank-of-anthos/kubernetes-manifests/userservice.yaml diff --git a/okd-cluster/4.x/02-appdeployment/hello-python/deployment.tf b/infra/okd-cluster/4.x/02-appdeployment/hello-python/deployment.tf similarity index 100% rename from okd-cluster/4.x/02-appdeployment/hello-python/deployment.tf rename to infra/okd-cluster/4.x/02-appdeployment/hello-python/deployment.tf diff --git a/okd-cluster/4.x/02-appdeployment/hello-python/output.tf b/infra/okd-cluster/4.x/02-appdeployment/hello-python/output.tf similarity index 100% rename from okd-cluster/4.x/02-appdeployment/hello-python/output.tf rename to infra/okd-cluster/4.x/02-appdeployment/hello-python/output.tf diff --git a/okd-cluster/4.x/02-appdeployment/hello-python/provider.tf b/infra/okd-cluster/4.x/02-appdeployment/hello-python/provider.tf similarity index 100% rename from okd-cluster/4.x/02-appdeployment/hello-python/provider.tf rename to infra/okd-cluster/4.x/02-appdeployment/hello-python/provider.tf diff --git a/okd-cluster/4.x/02-appdeployment/hello-python/provider.tf.template b/infra/okd-cluster/4.x/02-appdeployment/hello-python/provider.tf.template similarity index 100% rename from okd-cluster/4.x/02-appdeployment/hello-python/provider.tf.template rename to infra/okd-cluster/4.x/02-appdeployment/hello-python/provider.tf.template diff --git a/okd-cluster/4.x/02-appdeployment/hello-python/service.tf b/infra/okd-cluster/4.x/02-appdeployment/hello-python/service.tf similarity index 100% rename from okd-cluster/4.x/02-appdeployment/hello-python/service.tf rename to infra/okd-cluster/4.x/02-appdeployment/hello-python/service.tf diff --git a/okd-cluster/4.x/README.md b/infra/okd-cluster/4.x/README.md similarity index 100% rename from okd-cluster/4.x/README.md rename to infra/okd-cluster/4.x/README.md diff --git a/okd-cluster/4.x/destroy.sh b/infra/okd-cluster/4.x/destroy.sh similarity index 100% rename from okd-cluster/4.x/destroy.sh rename to infra/okd-cluster/4.x/destroy.sh diff --git a/okd-cluster/4.x/install.sh b/infra/okd-cluster/4.x/install.sh similarity index 100% rename from okd-cluster/4.x/install.sh rename to infra/okd-cluster/4.x/install.sh diff --git a/okd-cluster/README.md b/infra/okd-cluster/README.md similarity index 100% rename from okd-cluster/README.md rename to infra/okd-cluster/README.md From 48c99d7256fd62a6393901287516c6fb83b1345b Mon Sep 17 00:00:00 2001 From: umeshkumhar Date: Fri, 7 Oct 2022 14:12:44 +0530 Subject: [PATCH 2/4] added github actions --- .github/workflows/golang-ci.yml | 41 ++++++++ .github/workflows/npm-ci.yml | 35 +++++++ shifter/.golangci.yaml | 173 ++++++++++++++++++++++++++++++++ shifter/Makefile | 3 + 4 files changed, 252 insertions(+) create mode 100644 .github/workflows/golang-ci.yml create mode 100644 .github/workflows/npm-ci.yml create mode 100644 shifter/.golangci.yaml diff --git a/.github/workflows/golang-ci.yml b/.github/workflows/golang-ci.yml new file mode 100644 index 00000000..a74e3136 --- /dev/null +++ b/.github/workflows/golang-ci.yml @@ -0,0 +1,41 @@ +name: Github Actions - Golang +on: + pull_request: + paths: + - '**.go' +permissions: + contents: read + pull-requests: read + +defaults: + run: + working-directory: ./shifter + +jobs: + golang-ci-workflow: + runs-on: ubuntu-latest + steps: + - uses: actions/setup-go@v3 + with: + go-version: '1.19' + - uses: actions/checkout@v3 + - name: Run Golangci-lint + uses: golangci/golangci-lint-action@v3 + with: + version: v1.50.0 + args: --issues-exit-code=0 -vc ./.golangci.yaml ./... + working-directory: /home/runner/work/shifter/shifter/shifter + - name: Run Gosec Security Scanner + uses: securego/gosec@master + with: + args: -no-fail -fmt=sarif -out results.sarif -verbose=text ./... + - uses: github/codeql-action/upload-sarif@v2 + with: + sarif_file: results.sarif + - name: Run Build + run: make build + + +# ## we can update once we have unit testcases inplace +# - name: Test +# run: go test diff --git a/.github/workflows/npm-ci.yml b/.github/workflows/npm-ci.yml new file mode 100644 index 00000000..ce9d5555 --- /dev/null +++ b/.github/workflows/npm-ci.yml @@ -0,0 +1,35 @@ +name: Github Actions - NPM + +on: + workflow_dispatch: + pull_request: + paths: + - '**.js' + - '**.vue' + +defaults: + run: + working-directory: ./shifter-ui + +jobs: + npm-ci-workflow: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Setup node + uses: actions/setup-node@v3 + - name: Run ESLint + uses: reviewdog/action-eslint@v1 + with: + reporter: github-check + eslint_flags: '. --ext .vue,.js,.jsx,.cjs,.mjs --ignore-path .gitignore' + workdir: './shifter-ui/' + - name: Install + run: npm install + - name: Compile + run: npm run build + + + + diff --git a/shifter/.golangci.yaml b/shifter/.golangci.yaml new file mode 100644 index 00000000..4e78386a --- /dev/null +++ b/shifter/.golangci.yaml @@ -0,0 +1,173 @@ +linters-settings: + govet: + check-shadowing: true + settings: + printf: + funcs: + - (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof + - (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf + - (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf + - (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf + golint: + min-confidence: 0 # default value + gofmt: + simplify: true + gocyclo: + min-complexity: 25 + maligned: + suggest-new: true + dupl: + threshold: 100 + goconst: + min-len: 2 + min-occurrences: 2 + depguard: + list-type: blacklist + include-go-root: false + packages: + # logging is allowed only by logutils.Log, logrus + # is allowed to use only in logutils package + - github.com/sirupsen/logrus + packages-with-error-messages: + github.com/sirupsen/logrus: "logging is allowed only by logutils.Log" + misspell: + locale: US + lll: + line-length: 140 + tab-width: 1 + unused: + check-exported: false + unparam: + check-exported: true + nakedret: + max-func-lines: 30 + prealloc: + simple: true + range-loops: true + for-loops: false + goimports: + local-prefixes: github.com/golangci/golangci-lint + gocritic: + enabled-tags: + - diagnostic + - opinionated + - performance + - style + disabled-checks: + - wrapperFunc + - ifElseChain + - octalLiteral + - regexpMust + settings: + captLocal: + paramsOnly: true + rangeValCopy: + sizeThreshold: 64 + +linters: + # please, do not use `enable-all`: it's deprecated and will be removed soon. + # inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint + disable-all: true + enable: + - deadcode + - dupl + - errcheck + - goconst + - gocritic + - gocyclo + - gofmt + - goimports + - revive + - gosec + - gosimple + - govet + - ineffassign + - lll + - misspell + - nakedret + - exportloopref + - staticcheck + - structcheck + - stylecheck + - typecheck + - unconvert + - unparam + - unused + - varcheck + +# don't enable: +# - gochecknoglobals +# - gocognit +# - godox +# - maligned +# - prealloc +# - gochecknoinits +# - depguard + +run: + concurrency: 4 + + deadline: 30m + + issues-exit-code: 1 + + tests: true + + # build-tags: + # - mytag + + skip-dirs: + - src/external_libs + - vendor + - testdata + + skip-files: + - ".*_zz_generated\\.deepcopy\\.go$" + - ".*zz_generated\\.deepcopy\\.go$" + +# output configuration options +output: + format: colored-line-number + + print-issued-lines: true + + print-linter-name: true + +issues: + exclude-rules: + - path: _test\.go + linters: + - gocyclo + - errcheck + - dupl + - gosec + - gocritic + + - linters: + - lll + source: "^//go:generate " + + - linters: + - lll + source: "^//+kubebuilder:" + + - linters: + - golint + source: "^type .*List struct \\{" + + - path: v1alpha1 + linters: + - maligned + + exclude-use-default: true + + max-issues-per-linter: 0 + + max-same-issues: 0 + +# golangci.com configuration +# https://github.com/golangci/golangci/wiki/Configuration +service: + golangci-lint-version: 1.50.x + project-path: github.com/google/shifter + \ No newline at end of file diff --git a/shifter/Makefile b/shifter/Makefile index db3ba4f5..3c1066bb 100644 --- a/shifter/Makefile +++ b/shifter/Makefile @@ -31,6 +31,9 @@ shifter_win_amd64.exe: fmt fmt: go fmt ./... +lint: + golangci-lint run -vc ./.golangci.yaml ./... + secScan: gosec -no-fail -fmt=json -out=results.json -stdout -verbose=text ./... From 058403a25802af0be06d64b641bc5b3e5887ba5a Mon Sep 17 00:00:00 2001 From: Gary Bowers Date: Tue, 3 Jan 2023 20:30:00 +0000 Subject: [PATCH 3/4] Fixing output filenames --- shifter/Makefile | 2 +- shifter/ops/convert.go | 22 ++++++++++++++++++---- shifter/ops/local.go | 18 ++++++++++++++---- 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/shifter/Makefile b/shifter/Makefile index 3c1066bb..fa8d4731 100644 --- a/shifter/Makefile +++ b/shifter/Makefile @@ -56,7 +56,7 @@ yamlMultiTest: fmt go run . convert -o yaml -i yaml ./_test/yaml/multifile/ ./out/t2_yaml_multifile/ yamlMultiOutputSingleTest: fmt - go run . convert -o yaml -i yaml ./_test/yaml/multifile/ ./out/t3_yaml_multiotput/files.yaml + go run . convert -o yaml -i yaml ./_test/yaml/multifile/ ./out/t3_yaml_multioutput/files.yaml yamlDCTest: fmt go run . convert -o yaml -i yaml ./_test/yaml/deploymentconfig.yaml ./out/t4_deploymentconfig diff --git a/shifter/ops/convert.go b/shifter/ops/convert.go index 6a988a0f..1bfdf00f 100644 --- a/shifter/ops/convert.go +++ b/shifter/ops/convert.go @@ -131,7 +131,6 @@ func (converter *Converter) ConvertFiles() error { ) switch strings.ToLower(converter.InputType) { - // Input Type == YAML case "yaml": sourceFile, err := input.Yaml(file.Content, converter.Flags) if err != nil { @@ -157,12 +156,27 @@ func (converter *Converter) ConvertFiles() error { } for k := range resources { + var fileName string + var filePath string + + if filepath.Ext(converter.OutputPath) != "" { + fileName = filepath.Clean(filepath.Base(converter.OutputPath)) + filePath = filepath.Clean(filepath.Dir(converter.OutputPath)) + } else { + filePath = converter.OutputPath + if filepath.Ext(resources[k].Name) != "" { + fileName = resources[k].Name + } else { + fileName = filepath.Join(resources[k].Name + filepath.Ext(file.Path)) + } + } + fileObj := &FileObject{ StorageType: file.StorageType, //SourcePath: (converter.OutputPath + "/" + r[k].Path + r[k].Name + filepath.Ext(file.SourcePath)), - Path: (converter.OutputPath + "/" + resources[k].Path + resources[k].Name), - Filename: file.Filename, - Ext: filepath.Ext(file.Path), + Path: filePath + resources[k].Path, + Filename: fileName, + Ext: filepath.Ext(fileName), Content: resources[k].Payload, ContentLength: file.ContentLength, } diff --git a/shifter/ops/local.go b/shifter/ops/local.go index 7d201466..e17b0176 100644 --- a/shifter/ops/local.go +++ b/shifter/ops/local.go @@ -26,17 +26,27 @@ func (fileObj *FileObject) WriteLCLFile() error { lib.CLog("debug", "Writing file object to local file system") // Check if Output Directory Exits, IF Not, Make output Directory - lib.CLog("debug", "Path: "+filepath.Dir(fileObj.Path)) - if _, err := os.Stat(filepath.Dir(fileObj.Path)); os.IsNotExist(err) { + lib.CLog("debug", "Path: "+fileObj.Path) + + if _, err := os.Stat(fileObj.Path); os.IsNotExist(err) { lib.CLog("info", "Output directory does not exist... creating") - err := os.MkdirAll(filepath.Dir(fileObj.Path), 0700) + err := os.MkdirAll(fileObj.Path, 0700) if err != nil { lib.CLog("error", "Unable to create output directory", err) return err } } - fileName := fileObj.Path + "." + fileObj.Ext + var fileName string + + if filepath.Ext(fileObj.Filename) == "" { + fileName = filepath.Join(fileObj.Filename, fileObj.Ext) + } else { + fileName = fileObj.Filename + } + + fileName = filepath.Join(fileObj.Path, fileName) + f, err := os.OpenFile(fileName, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0600) if err != nil { lib.CLog("error", "creating new file"+fileName, err) From cbe8e780932cc06e889d29ceada1a95ddeccb503 Mon Sep 17 00:00:00 2001 From: Gary Bowers Date: Thu, 19 Jan 2023 09:07:20 +0000 Subject: [PATCH 4/4] Bump golang version to 1.19.5 and various go packages --- go.mod | 3 --- shifter/Dockerfile | 2 +- shifter/go.mod | 33 ++++++++++++--------------- shifter/go.sum | 57 +++++++++++++++++++++++++++------------------- 4 files changed, 49 insertions(+), 46 deletions(-) delete mode 100644 go.mod diff --git a/go.mod b/go.mod deleted file mode 100644 index 87af86d1..00000000 --- a/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module shifter - -go 1.18 diff --git a/shifter/Dockerfile b/shifter/Dockerfile index 90ec2271..4491104a 100644 --- a/shifter/Dockerfile +++ b/shifter/Dockerfile @@ -17,7 +17,7 @@ ## ## Build Shifter Server ## -FROM golang:1.19 AS build +FROM golang:1.19.5 AS build WORKDIR /app diff --git a/shifter/go.mod b/shifter/go.mod index 59a54f3c..5991c3f9 100644 --- a/shifter/go.mod +++ b/shifter/go.mod @@ -19,8 +19,8 @@ require ( gopkg.in/yaml.v3 v3.0.1 istio.io/api v0.0.0-20220512181135-e8ec1e1d89de istio.io/client-go v1.14.0 - k8s.io/api v0.24.0 - k8s.io/apimachinery v0.24.0 + k8s.io/api v0.26.1 + k8s.io/apimachinery v0.26.1 k8s.io/client-go v0.24.0 sigs.k8s.io/yaml v1.3.0 ) @@ -31,12 +31,11 @@ require ( cloud.google.com/go/iam v0.1.1 // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect - github.com/bmatcuk/doublestar/v4 v4.0.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/emicklei/go-restful v2.9.5+incompatible // indirect + github.com/emicklei/go-restful/v3 v3.8.0 // indirect github.com/fsnotify/fsnotify v1.5.1 // indirect github.com/gin-contrib/sse v0.1.0 // indirect - github.com/go-logr/logr v1.2.0 // indirect + github.com/go-logr/logr v1.2.3 // indirect github.com/go-openapi/jsonpointer v0.19.5 // indirect github.com/go-openapi/jsonreference v0.19.5 // indirect github.com/go-openapi/swag v0.19.14 // indirect @@ -46,9 +45,8 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.2 // indirect - github.com/google/addlicense v1.0.0 // indirect github.com/google/gnostic v0.5.7-v3refs // indirect - github.com/google/go-cmp v0.5.7 // indirect + github.com/google/go-cmp v0.5.9 // indirect github.com/google/gofuzz v1.1.0 // indirect github.com/googleapis/gax-go/v2 v2.1.1 // indirect github.com/hashicorp/hcl v1.0.0 // indirect @@ -75,24 +73,23 @@ require ( github.com/ugorji/go/codec v1.1.7 // indirect go.opencensus.io v0.23.0 // indirect golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect - golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect + golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 // indirect golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect - golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect - golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect - golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect - golang.org/x/text v0.3.7 // indirect + golang.org/x/sys v0.3.0 // indirect + golang.org/x/term v0.3.0 // indirect + golang.org/x/text v0.5.0 // indirect golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44 // indirect google.golang.org/grpc v1.43.0 // indirect - google.golang.org/protobuf v1.27.1 // indirect + google.golang.org/protobuf v1.28.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.66.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - k8s.io/klog/v2 v2.60.1 // indirect - k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect - k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect - sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect + k8s.io/klog/v2 v2.80.1 // indirect + k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect + k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect + sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect ) diff --git a/shifter/go.sum b/shifter/go.sum index bf42ab9a..b972b367 100644 --- a/shifter/go.sum +++ b/shifter/go.sum @@ -74,8 +74,6 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdko github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -github.com/bmatcuk/doublestar/v4 v4.0.2 h1:X0krlUVAVmtr2cRoTqR8aDMrDqnB36ht8wpWTiQ3jsA= -github.com/bmatcuk/doublestar/v4 v4.0.2/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -104,8 +102,9 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/emicklei/go-restful/v3 v3.8.0 h1:eCZ8ulSerjdAiaNpF7GxXIE7ZCMo1moN1qX+S609eVw= +github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -137,8 +136,9 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v1.2.0 h1:QK40JKJyMdUDz+h+xvCsru/bJhvG0UxvePV0ufL/AcE= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= +github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= @@ -194,8 +194,6 @@ github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/google/addlicense v1.0.0 h1:cqvo5suPWlsk6r6o42Fs2K66xYCl2tnhVPUYoP3EnO4= -github.com/google/addlicense v1.0.0/go.mod h1:Sm/DHu7Jk+T5miFHHehdIjbi4M5+dJDRS3Cq0rncIxA= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= @@ -213,8 +211,9 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -321,17 +320,17 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +github.com/onsi/ginkgo/v2 v2.4.0 h1:+Ig9nvqgS5OBSACXNk15PLdp0U9XPYROt9CFzVdFGIs= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.23.0 h1:/oxKu9c2HVap+F3PfKort2Hw5DEU+HGlW8n+tguWsys= github.com/openshift/api v0.0.0-20220511093956-b017c00b66b6 h1:X/l9dVNbl4OWA2rsaHZpTEJMOIoscYgZlzKJ+jmmHXE= github.com/openshift/api v0.0.0-20220511093956-b017c00b66b6/go.mod h1:F/eU6jgr6Q2VhMu1mSpMmygxAELd7+BUxs3NHZ25jV4= github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= @@ -376,8 +375,8 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.4 h1:wZRexSlwd7ZXfKINDLsO4r7WBt3gTKONc6K/VesHvHM= github.com/stretchr/testify v1.7.4/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= @@ -489,8 +488,9 @@ golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 h1:Frnccbp+ok2GkUS2tC84yAq/U9Vg+0sIO7aRL3T4Xnc= +golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -519,7 +519,6 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180903190138-2b024373dcd9/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -583,12 +582,14 @@ golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220209214540-3681064d5158 h1:rm+CHSpPEEW2IsXUib1ThaHIjuBVZjxNgSKmBLFfD4c= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI= +golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -597,8 +598,9 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM= +golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -818,8 +820,9 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -834,7 +837,6 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI= gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/src-d/go-billy.v4 v4.3.0/go.mod h1:tm33zBoOwxjYHZIE+OV8bxTWFMJLrconzFMd38aARFk= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -861,11 +863,13 @@ istio.io/api v0.0.0-20220512181135-e8ec1e1d89de/go.mod h1:00myJeQGWma4Y5pboJ+MM4 istio.io/client-go v1.14.0 h1:KKXMnxXx3U2866OP8FBYlJhjKdI3yIUQnt8L6hSzDHE= istio.io/client-go v1.14.0/go.mod h1:C7K0CKQlvY84yQKkZhxQbD1riqvnsgXJm3jF5GOmzNg= k8s.io/api v0.23.0/go.mod h1:8wmDdLBHBNxtOIytwLstXt5E9PddnZb0GaMcqsvDBpg= -k8s.io/api v0.24.0 h1:J0hann2hfxWr1hinZIDefw7Q96wmCBx6SSB8IY0MdDg= k8s.io/api v0.24.0/go.mod h1:5Jl90IUrJHUJYEMANRURMiVvJ0g7Ax7r3R1bqO8zx8I= +k8s.io/api v0.26.1 h1:f+SWYiPd/GsiWwVRz+NbFyCgvv75Pk9NK6dlkZgpCRQ= +k8s.io/api v0.26.1/go.mod h1:xd/GBNgR0f707+ATNyPmQ1oyKSgndzXij81FzWGsejg= k8s.io/apimachinery v0.23.0/go.mod h1:fFCTTBKvKcwTPFzjlcxp91uPFZr+JA0FubU4fLzzFYc= -k8s.io/apimachinery v0.24.0 h1:ydFCyC/DjCvFCHK5OPMKBlxayQytB8pxy8YQInd5UyQ= k8s.io/apimachinery v0.24.0/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= +k8s.io/apimachinery v0.26.1 h1:8EZ/eGJL+hY/MYCNwhmDzVqq2lPl3N3Bo8rvweJwXUQ= +k8s.io/apimachinery v0.26.1/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74= k8s.io/client-go v0.23.0/go.mod h1:hrDnpnK1mSr65lHHcUuIZIXDgEbzc7/683c6hyG4jTA= k8s.io/client-go v0.24.0 h1:lbE4aB1gTHvYFSwm6eD3OF14NhFDKCejlnsGYlSJe5U= k8s.io/client-go v0.24.0/go.mod h1:VFPQET+cAFpYxh6Bq6f4xyMY80G6jKKktU6G0m00VDw= @@ -874,25 +878,30 @@ k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAE k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= +k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= -k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 h1:Gii5eqf+GmIEwGNKQYQClCayuJCe2/4fZUvF7VG99sU= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= +k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E= +k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20221107191617-1a15be271d1d h1:0Smp/HP1OH4Rvhe+4B8nWGERtlqAGSftbSbbmm45oFs= +k8s.io/utils v0.0.0-20221107191617-1a15be271d1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= -sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= +sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k= +sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= -sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y= sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= +sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= +sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=