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

Add golden output of gkehub resource with IAM references #2120

Merged

Conversation

ziyue-101
Copy link
Collaborator

@ziyue-101 ziyue-101 commented Jun 24, 2024

Change description

Add golden output of gkehub resource with IAM references

Tests you have done

  • Run make ready-pr to ensure this PR is ready for review.
  • Perform necessary E2E testing for changed resources.

@ziyue-101
Copy link
Collaborator Author

ziyue-101 commented Jun 24, 2024

/assign @justinsb
/cc @haiyanmeng
Hey, Justin, this PR is the followup for #2013 as requested.

When we turn on the feature flag to use the new controller, the test should cover the code logic in the above PR.

tests/e2e/script_test.go Outdated Show resolved Hide resolved
tests/e2e/normalize.go Outdated Show resolved Hide resolved
@yuwenma
Copy link
Collaborator

yuwenma commented Jun 25, 2024

/hold for further discussing the changes around startTime

@ziyue-101 ziyue-101 force-pushed the hub_scenario_iam branch 4 times, most recently from 0e84b85 to bf7d845 Compare June 26, 2024 18:05
@ziyue-101
Copy link
Collaborator Author

ziyue-101 commented Jun 26, 2024

/hold for further discussing the changes around startTime

/unhold, Hey @yuwenma , this PR doesn't change startTime anymore

@ziyue-101 ziyue-101 changed the title Add golden output of gkehub resource with IAM reference set Add golden output of gkehub resource with IAM references Jun 26, 2024
@ziyue-101
Copy link
Collaborator Author

ziyue-101 commented Aug 23, 2024

The test failure seems to be unrelated to my change

2024-08-23T19:52:43.7491432Z {"severity":"info","timestamp":"2024-08-23T19:52:43.748Z","msg":"resource is ready","kind":"DataflowFlexTemplateJob","name":"dataflowflextemplatejob-2qqp4lrrnpetkdpeqwba"}
2024-08-23T19:52:43.7521007Z     utils.go:195: unexpected diff in /home/runner/work/k8s-config-connector/k8s-config-connector/pkg/test/resourcefixture/testdata/basic/dataflow/v1beta1/dataflowflextemplatejob/batchdataflowflextemplatejob/_generated_object_batchdataflowflextemplatejob.golden.yaml:   map[string]any{
2024-08-23T19:52:43.7524435Z           	"apiVersion": string("dataflow.cnrm.cloud.google.com/v1beta1"),
2024-08-23T19:52:43.7526103Z           	"kind":       string("DataflowFlexTemplateJob"),
2024-08-23T19:52:43.7533990Z           	"metadata":   map[string]any{"annotations": map[string]any{"cnrm.cloud.google.com/management-conflict-prevention-policy": string("none"), "cnrm.cloud.google.com/mutable-but-unreadable-fields": string(`{"spec":{"containerSpecGcsPath":"gs://dataflow-templates/2022-10`...), "cnrm.cloud.google.com/on-delete": string("cancel"), "cnrm.cloud.google.com/project-id": string("${projectId}"), ...}, "finalizers": []any{string("cnrm.cloud.google.com/finalizer"), string("cnrm.cloud.google.com/deletion-defender")}, "generation": float64(2), "labels": map[string]any{"cnrm-test": string("true")}, ...},
2024-08-23T19:52:43.7538880Z           	"spec": map[string]any{
2024-08-23T19:52:43.7539656Z           		"additionalExperiments": []any{
2024-08-23T19:52:43.7540424Z           			strings.Join({
2024-08-23T19:52:43.7541383Z         - 				"disable_runner_v2_reason=java_job_google_template",
2024-08-23T19:52:43.7542413Z         + 				"enable_always_on_exception_sampling",
2024-08-23T19:52:43.7543139Z           			}, ""),
2024-08-23T19:52:43.7543656Z           			strings.Join({
2024-08-23T19:52:43.7544456Z         - 				"enable_always_on_exception_sampling",
2024-08-23T19:52:43.7545528Z         + 				"disable_runner_v2_reason=java_job_google_template",
2024-08-23T19:52:43.7546557Z           			}, ""),
2024-08-23T19:52:43.7547043Z           		},
2024-08-23T19:52:43.7548574Z           		"containerSpecGcsPath": string("gs://dataflow-templates/2022-10-03-00_RC00/flex/File_Format_Conv"...),
2024-08-23T19:52:43.7552559Z           		"parameters":           map[string]any{"inputFileFormat": string("csv"), "inputFileSpec": string("gs://config-connector-samples/dataflowflextemplate/numbertest.csv"), "outputBucket": string("gs://storagebucket-${uniqueId}"), "outputFileFormat": string("avro"), ...},
2024-08-23T19:52:43.7555007Z           		... // 4 identical entries
2024-08-23T19:52:43.7555660Z           	},
2024-08-23T19:52:43.7559391Z           	"status": map[string]any{"conditions": []any{map[string]any{"lastTransitionTime": string("1970-01-01T00:00:00Z"), "message": string("The resource is up to date"), "reason": string("UpToDate"), "status": string("True"), ...}}, "jobId": string("${jobID}"), "observedGeneration": float64(2), "state": string("JOB_STATE_RUNNING"), ...},
2024-08-23T19:52:43.7561837Z           }

@justinsb
Copy link
Collaborator

/approve
/lgtm

@google-oss-prow google-oss-prow bot added the lgtm label Aug 23, 2024
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justinsb

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ziyue-101
Copy link
Collaborator Author

/hold cancel

@google-oss-prow google-oss-prow bot merged commit 931f3cc into GoogleCloudPlatform:master Aug 23, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants