Bulk apply#353

Merged

thokra-nav merged 28 commits intomainfrom

Apr 9, 2026

Contributor

thokra-nav commented Mar 11, 2026

No description provided.

nais-team-app bot added the graphql-review-required label

thokra-nav commented

View reviewed changes

internal/apply/apply.go Outdated Show resolved Hide resolved

thokra-nav commented

View reviewed changes

internal/apply/activitylog.go Outdated Show resolved Hide resolved

thokra-nav commented

View reviewed changes

internal/apply/apply.go Outdated Show resolved Hide resolved

thokra-nav commented

View reviewed changes

internal/apply/apply.go Outdated Show resolved Hide resolved

thokra-nav commented

View reviewed changes

internal/apply/apply.go Outdated Show resolved Hide resolved

thokra-nav commented

View reviewed changes

internal/apply/apply.go Outdated Show resolved Hide resolved

thokra-nav commented

View reviewed changes

internal/apply/apply.go Outdated Show resolved Hide resolved

thokra-nav commented

View reviewed changes

internal/apply/apply.go Outdated Show resolved Hide resolved

thokra-nav commented

View reviewed changes

internal/apply/apply.go Outdated Show resolved Hide resolved

thokra-nav commented

View reviewed changes

internal/graph/schema/apply.graphqls Outdated Show resolved Hide resolved

thokra-nav commented

View reviewed changes

internal/graph/apply.resolvers.go Outdated Show resolved Hide resolved

thokra-nav commented

View reviewed changes

internal/rest/rest.go

               }
-              func MakeRouter(ctx context.Context, pool *pgxpool.Pool, log logrus.FieldLogger, middlewares ...func(http.Handler) http.Handler) *chi.Mux {
+              func MakeRouter(ctx context.Context, cfg Config) *chi.Mux {

Contributor Author

thokra-nav Mar 11, 2026

Det er kanskje unødvendig å kjøre 2 http servere som begge eksponerer paths på ingressen. Vurdere om vi kan samle både http serveren i denne pakka og den som allerede eksisterer i http.go (den som /graphql) i en senere PR

thokra-nav commented

View reviewed changes

internal/rest/rest.go Show resolved Hide resolved

thokra-nav commented

View reviewed changes

internal/rest/rest.go Outdated Show resolved Hide resolved

thokra-nav commented

View reviewed changes

internal/apply/apply.go Outdated Show resolved Hide resolved

thokra-nav commented

View reviewed changes

internal/apply/client.go Outdated Show resolved Hide resolved

thokra-nav commented

View reviewed changes

internal/apply/diff.go

Comment on lines +14 to +28

+              var ignoredTopLevelFields = map[string]bool{
+              	"status": true,
+              }
+              // ignoredMetadataFields are metadata fields managed by the API server.
+              var ignoredMetadataFields = map[string]bool{
+              	"resourceVersion":            true,
+              	"uid":                        true,
+              	"generation":                 true,
+              	"creationTimestamp":          true,
+              	"managedFields":              true,
+              	"selfLink":                   true,
+              	"deletionTimestamp":          true,
+              	"deletionGracePeriodSeconds": true,
+              }

Contributor Author

thokra-nav Mar 12, 2026

Vi bør kanskje ta en ekstra titt på dette. Vi kan kanskje også generelt ignorere endringer til .metadata?
Men av de ressursene som eksisterer i dag så er det noen som ikke har defaulting webhook, så kan være vi må justere litt på hvordan vi gjør diff

thokra-nav commented

View reviewed changes

internal/apply/whitelist.go Show resolved Hide resolved

thokra-nav force-pushed the bulk_apply branch 4 times, most recently from 4d5d88b to 9d329ce Compare

March 16, 2026 13:15

sechmann force-pushed the bulk_apply branch 2 times, most recently from d9b9eab to cbe3638 Compare

March 18, 2026 12:34

thokra-nav force-pushed the bulk_apply branch from 0c8b190 to fff8237 Compare

March 19, 2026 14:01

sechmann force-pushed the bulk_apply branch from 153dfef to cc70248 Compare

March 20, 2026 12:51

thokra-nav and others added 3 commits

April 9, 2026 13:31


          Initial work on bulk apply using rest endpoint

Co-authored-by: Vegar Sechmann Molvig <vegar.sechmann.molvig@nav.no>


          cluster -> environment

afaf417


          Use latest tester

5c1ae38

thokra-nav and others added 22 commits

April 9, 2026 13:33


          Consolidate context setup

3565e80


          Rename activitylog for k8s types

0ab578c

Fix environment name field


          Use modern Go

33cd98f


          change activity log resource type name

9cbd13d


          Add more resources

2a9302a


          Add Github claims when applied using gh workflow

cc14989

Co-authored-by: Vegar Sechmann Molvig <vegar.sechmann.molvig@nav.no>


          Move migration

419cb5a


          build(mise): use EmmyLuaCodeStyle from toolchain

7f3bc3d

Use the mise-installed CodeFormat binary in the Lua fmt task instead of downloading a formatter at runtime.


          refactor(apply): make endpoint handler stateful

ec703e7

Convert apply to a struct-based HTTP handler, perform team authorization before request parsing, and restore environmentName in per-resource results. NOTE: tests are currently not passing in this branch.


          refactor(apply): inject dynamic client factory for environment clients

d3b5ea1

Move team impersonation client creation into kubernetes config and allow rest/apply wiring to override the dynamic client in integration tests. This keeps production behavior while making authorization outcomes deterministic in tests.


          fix: bump migration id

052ed5d


          fix: use exported ActivityLogEntryResourceTypeJob constant

7ce8bbf


          fix: re-add and rename managementWatcherMgr


          refactor: simplify dynamic client override for apply

577f03a


          fix: costupdater test use localhost

d70a37c


          refactor: make GitHub OIDC middleware injectable to avoid network cal…

d83bf72

…ls in tests

GitHubOIDC now accepts an issuer parameter, returns an error instead of
silently degrading, and is passed as an optional field in rest.Config.
Integration tests simply leave the field nil to skip the middleware.


          Add /api/v1/ path to ingress and support dynamic client factory in API

f01eab6

server

Co-authored-by: Vegar Sechmann Molvig <vegar.sechmann.molvig@nav.no>


          Log enabled middlewares

bdd700c

Custom error message for psk auth

Co-authored-by: Vegar Sechmann Molvig <vegar.sechmann.molvig@nav.no>


          Require team membership

64c471b


          Ignore activity log when no changes

86c82fe


          Remove middleware that's not needed

56739c3

Co-authored-by: Vegar Sechmann Molvig <vegar.sechmann.molvig@nav.no>


          fix migration index

744b2be

thokra-nav force-pushed the bulk_apply branch from bf0c7ae to 744b2be Compare

April 9, 2026 11:38

christeredvartsen approved these changes

View reviewed changes

Member

christeredvartsen left a comment

nais-team-app bot removed the graphql-review-required label

thokra-nav marked this pull request as ready for review

April 9, 2026 11:45

thokra-nav requested a review from a team as a code owner

April 9, 2026 11:45


          Change name

7476e13

thokra-nav merged commit 514af93 into main

10 checks passed

thokra-nav deleted the bulk_apply branch

April 9, 2026 11:58

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet