mockkubeapiserver: Support stringData when creating a secret #383

justinsb · 2024-04-17T02:17:14Z

This is an edge case in the kube apiserver, but there is special
handling for the stringData field of a secret, that is mapped to
base64 data.

justinsb · 2024-06-10T16:57:06Z

Hmmm .... this no longer needs a rebase (at least it shouldn't)... I'll try a retest

/retest

tomasaschan

A bit of a nit, but still: the errors could be more descriptive.

Also, wouldn't hurt to cover/document this behavior in tests :)

mockkubeapiserver/postresource.go

tomasaschan · 2024-06-10T17:18:42Z

mockkubeapiserver/postresource.go

+				if !ok {
+					return fmt.Errorf("unexpected type for v1.Secret stringData entry, got %T", vAny)
+				}
+				dataMap[k] = base64.StdEncoding.EncodeToString([]byte(v))


I'm not familiar enough with what Go will do through all of these casts; will this actually end up mutating obj? Or does it just mutate the dataMap we've created, but not actually propagate those changes back?

So the answer is yes, and the test will (hopefully!) prove it. I'll have a go at rewriting it to be more self-evidently true though, I agree there's too much happening here.

justinsb · 2024-06-14T15:07:06Z

Also, wouldn't hurt to cover/document this behavior in tests :)

A great point, I was thinking about that the other day. This change was to support testing in k8s-config-connector, so it got test coverage there, but we could easily create some simple tests directly in this repo - let me do that!

justinsb · 2024-06-15T13:50:18Z

This is escalating a bit ... looks like I need to break out a new module to avoid a circular dependency: #398

The developer experience of working without go.work is pretty bad - we have to break changes into lots of PRs. We're going to try checking in go.work instead.

This is an edge case in the kube apiserver, but there is special handling for the stringData field of a secret, that is mapped to base64 data. Co-authored-by: Tomas Aschan <[email protected]>

Not (yet) applying this everywhere to keep the changes reasonable, but for our new tests it is much easier to read.

This avoids a circular (module) dependency between mockkubeapiserver and kdp itself.

justinsb · 2024-07-02T11:57:48Z

Had a bit of trouble with the go.sum / go.mod checking (dev/format-gomod), but I finally figured out that the go.sum difference was to do with my cache; I did go clean -cache -modcache before running dev/format-gomod. I think it's still worth trying go.work (and I added a note to the dev/format-gomod script and to the GitHub action error message)

justinsb · 2024-07-03T10:46:32Z

This might be much easier if we merged a (basically empty) ktest module first - then I think we could stay away from go work sync which is the root of all the problems. Maybe that's a reasonable compromise that's worth a go.

justinsb · 2024-07-03T10:51:37Z

I tried staging the ktest module in #400. I think that would mean I could back out the go work sync logic which gave me so much trouble

justinsb · 2024-07-05T14:33:57Z

Found a repo that checks in go.work: kubernetes/kubernetes ! I think we're on solid ground :-)

yuwenma

/lgtm
/approve

This PR has so many wonderful pieces and make the code base cleaner and more readable. It is definitely more than just secret.

yuwenma · 2024-07-29T16:35:38Z

ktest/testharness/manifest.go

+	k8syaml "k8s.io/apimachinery/pkg/util/yaml"
+)
+
+func ParseObjects(ctx context.Context, manifest string) ([]*unstructured.Unstructured, error) {


2 years passed and we still have to write this. 🤣

yuwenma · 2024-07-29T16:36:40Z

mockkubeapiserver/postresource.go

+}
+
+func beforeSecretCreation(ctx context.Context, obj *unstructured.Unstructured) error {
+	// If there is any stringData, merge it into data


k8s-ci-robot · 2024-07-29T16:38:03Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justinsb, yuwenma

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:

~~OWNERS~~ [justinsb]

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

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 17, 2024

k8s-ci-robot requested review from atoato88 and tomasaschan April 17, 2024 02:17

k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 17, 2024

justinsb force-pushed the mock_kubeapiserver_support_secret_plaintext branch 2 times, most recently from 2699368 to e09355f Compare June 8, 2024 11:21

k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 8, 2024

justinsb force-pushed the mock_kubeapiserver_support_secret_plaintext branch from e09355f to 9e7a576 Compare June 8, 2024 11:24

k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 8, 2024

justinsb force-pushed the mock_kubeapiserver_support_secret_plaintext branch from 9e7a576 to 41b0c21 Compare June 10, 2024 13:57

tomasaschan reviewed Jun 10, 2024

View reviewed changes

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 11, 2024

justinsb force-pushed the mock_kubeapiserver_support_secret_plaintext branch from 6ad6bda to 7a17600 Compare June 15, 2024 01:53

k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 15, 2024

justinsb force-pushed the mock_kubeapiserver_support_secret_plaintext branch 2 times, most recently from 7c2a843 to 161f176 Compare June 15, 2024 01:57

k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 15, 2024

justinsb force-pushed the mock_kubeapiserver_support_secret_plaintext branch from 427f43b to 0f0006b Compare June 15, 2024 12:48

justinsb mentioned this pull request Jun 15, 2024

chore: Refactor test helpers into reusable ktest library #398

Closed

justinsb force-pushed the mock_kubeapiserver_support_secret_plaintext branch 7 times, most recently from 3d17dbd to bf72339 Compare July 2, 2024 11:52

justinsb and others added 4 commits July 2, 2024 07:54

Check in go.work / go.work.sum

dc6d6ba

The developer experience of working without go.work is pretty bad - we have to break changes into lots of PRs. We're going to try checking in go.work instead.

mockkubeapiserver: Support stringData when creating a secret

f504964

This is an edge case in the kube apiserver, but there is special handling for the stringData field of a secret, that is mapped to base64 data. Co-authored-by: Tomas Aschan <[email protected]>

tests: format golden output as multi-line JSON

af3d5b1

Not (yet) applying this everywhere to keep the changes reasonable, but for our new tests it is much easier to read.

chore: Refactor test helpers into reusable ktest library

6effc6e

This avoids a circular (module) dependency between mockkubeapiserver and kdp itself.

justinsb force-pushed the mock_kubeapiserver_support_secret_plaintext branch from bf72339 to 454214e Compare July 2, 2024 11:54

justinsb added 3 commits July 2, 2024 07:57

tests: print diff if changed are detected after dev/format-gomod

683da1c

tests: stop setting GOPATH in github actions

789d99c

tests: update setup-go to v5

82a46e7

justinsb force-pushed the mock_kubeapiserver_support_secret_plaintext branch from 454214e to 82a46e7 Compare July 2, 2024 11:57

justinsb mentioned this pull request Jul 3, 2024

chore: stage ktest module #400

Closed

yuwenma reviewed Jul 29, 2024

View reviewed changes

k8s-ci-robot assigned yuwenma Jul 29, 2024

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 29, 2024

k8s-ci-robot merged commit fb467ab into kubernetes-sigs:master Jul 29, 2024
6 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

mockkubeapiserver: Support stringData when creating a secret #383

mockkubeapiserver: Support stringData when creating a secret #383

justinsb commented Apr 17, 2024

justinsb commented Jun 10, 2024

tomasaschan left a comment •

edited

Loading

tomasaschan Jun 10, 2024

justinsb Jun 15, 2024

justinsb commented Jun 14, 2024 •

edited

Loading

justinsb commented Jun 15, 2024

justinsb commented Jul 2, 2024

justinsb commented Jul 3, 2024

justinsb commented Jul 3, 2024

justinsb commented Jul 5, 2024

yuwenma left a comment •

edited

Loading

yuwenma Jul 29, 2024

yuwenma Jul 29, 2024

k8s-ci-robot commented Jul 29, 2024

mockkubeapiserver: Support stringData when creating a secret #383

mockkubeapiserver: Support stringData when creating a secret #383

Conversation

justinsb commented Apr 17, 2024

justinsb commented Jun 10, 2024

tomasaschan left a comment • edited Loading

Choose a reason for hiding this comment

tomasaschan Jun 10, 2024

Choose a reason for hiding this comment

justinsb Jun 15, 2024

Choose a reason for hiding this comment

justinsb commented Jun 14, 2024 • edited Loading

justinsb commented Jun 15, 2024

justinsb commented Jul 2, 2024

justinsb commented Jul 3, 2024

justinsb commented Jul 3, 2024

justinsb commented Jul 5, 2024

yuwenma left a comment • edited Loading

Choose a reason for hiding this comment

yuwenma Jul 29, 2024

Choose a reason for hiding this comment

yuwenma Jul 29, 2024

Choose a reason for hiding this comment

k8s-ci-robot commented Jul 29, 2024

tomasaschan left a comment •

edited

Loading

justinsb commented Jun 14, 2024 •

edited

Loading

yuwenma left a comment •

edited

Loading