Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: remove "generate-go-client" from presubmit check #3038

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ vet:
.PHONY: generate
generate:
# Don't run go generate on `pkg/clients/generated` in the normal development flow due to high latency.
# This path will be covered by `generate-go-client` target specifically.
go work vendor -o temp-vendor # So we can load DCL resources
go generate ./pkg/dcl/schema/...
rm -rf temp-vendor
Expand Down Expand Up @@ -221,11 +220,6 @@ install: manifests
deploy-controller: docker-build docker-push
kustomize build config/installbundle/releases/scopes/cluster/withworkloadidentity | sed -e 's/$${PROJECT_ID?}/${PROJECT_ID}/g'| kubectl apply -f - ${CONTEXT_FLAG}

# Generate CRD go clients
.PHONY: generate-go-client
generate-go-client:
./scripts/generate-go-crd-clients/generate-clients.sh

# Generate google3 docs
.PHONY: resource-docs
resource-docs:
Expand All @@ -244,7 +238,7 @@ ensure:

# Should run all needed commands before any PR is sent out.
.PHONY: ready-pr
ready-pr: lint manifests resource-docs generate-go-client ensure
ready-pr: lint manifests resource-docs ensure

# Upgrades dcl dependencies
.PHONY: upgrade-dcl
Expand Down
3 changes: 1 addition & 2 deletions docs/archive/README.UpdatingTerraformProvider.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ We are actively evaluating the optimal long-term strategy for managing Terraform
2. Run `git subtree pull --prefix third_party/github.com/hashicorp/terraform-provider-google-beta https://github.com/hashicorp/terraform-provider-google-beta.git v5.X.Y --squash` from the repo’s root. This will update the provider code to the specified version.
3. Git may prompt you on merge CONFLICT, carefully review and resolve the CONFLICT to complete the git merge.
4. Run `make vet` to check if the updated code compiles.
5. Run `make generate manifests resource-docs generate-go-client` to update all
5. Run `make generate manifests resource-docs` to update all
the generated files.
6. Run `python3
scripts/generate-field-diffs-tf-upgrade/generate_field_changes.py` to
Expand Down Expand Up @@ -51,7 +51,6 @@ We are actively evaluating the optimal long-term strategy for managing Terraform
IAM support and it can’t be added, make a tracking GitHub issue and
block it temporarily in the [service mapping test code](config/tests/servicemapping/servicemapping_test.go).
1. If any new directive fields are added, you might run into issues with
ResourceSkeleton’s `TestNewFromAsset` and `TestNewFromURI` tests. Any
lingering fields in the expected vs. actual resource skeleton will
indicate which fields are suspect. If it makes sense for the field to
become a directive, add it to the resource’s corresponding
Expand Down
6 changes: 0 additions & 6 deletions pkg/apis/iam/v1beta1/krm_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ package v1beta1

import "k8s.io/apimachinery/pkg/runtime/schema"

// *** PLEASE READ THE FOLLOWING COMMENT BEFORE MAKING CHANGES ***
// This ResourceReference definition is duplicated in the scripts/generate-go-crd-clients/k8s/ directory.
// If you're making modifications to this definition, please make sure to modify
// the corresponding struct in `types.go` (IAMResourceRef), so the generated
// go-clients have an accurate representation of this struct.
// ResourceReference defines a relationship to another resource
type ResourceReference struct {
Kind string `json:"kind"`
Namespace string `json:"namespace,omitempty"`
Expand Down
6 changes: 0 additions & 6 deletions pkg/apis/k8s/v1alpha1/condition_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@

package v1alpha1

// *** DISCLAIMER ***
// This file is duplicated in the scripts/generate-go-crd-clients/k8s/ directory.
// If you're making modifications to this file, please make sure to modify the
// corresponding file (`types.go`) so the generated go-clients have an accurate
// representation of this package.

import (
v1 "k8s.io/api/core/v1"
)
Expand Down
8 changes: 0 additions & 8 deletions pkg/util/repo/paths.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,6 @@ func GetG3ResourceListsGeneratedPath() string {
return filepath.Join(GetRootOrLogFatal(), "scripts", "generate-google3-docs", "resource-lists", "generated")
}

func GetClientGenerationPath() string {
return filepath.Join(GetRootOrLogFatal(), "scripts", "generate-go-crd-clients")
}

func GetTypesGeneratedApisPath() string {
return filepath.Join(GetRootOrLogFatal(), "pkg", "clients", "generated", "apis")
}
Expand All @@ -96,10 +92,6 @@ func GetBasicIntegrationTestDataPath() string {
return filepath.Join(GetRootOrLogFatal(), "pkg", "test", "resourcefixture", "testdata", "basic")
}

func GetTypesTemplatePath() string {
return filepath.Join(GetRootOrLogFatal(), "scripts", "generate-go-crd-clients")
}

func GetAutoGeneratedServiceMappingsPathOrLogFatal() string {
return filepath.Join(GetRootOrLogFatal(), "scripts", "resource-autogen", "generated", "servicemappings")
}
Expand Down
240 changes: 0 additions & 240 deletions scripts/generate-go-crd-clients/client_test.go

This file was deleted.

38 changes: 0 additions & 38 deletions scripts/generate-go-crd-clients/doc.go.tmpl

This file was deleted.

Loading
Loading