Bulk apply#353

Draft

thokra-nav wants to merge 12 commits intomainfrom

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 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 3 times, most recently from 7ec52db to 4d5d88b Compare

March 16, 2026 11:20

thokra-nav and others added 8 commits

March 16, 2026 14:14


          Initial work on bulk apply using rest endpoint

f88a497

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


          cluster -> environment

8402dc1


          Use latest tester


          Move activitylog to correct resources, when applicable

9333bb0


          Refactor apply activity log to support unknown resource types

37c860a

- Move resource activity log types to activitylog package
- Add fallback transformer for unknown resource kinds
- Unify changed field representation and string conversion
- Update GraphQL schema and resolvers for new types
- Require pre-shared key for team API in integration tests
- Update apply endpoint to use path parameters for team and environment


          Consolidate context setup

85ef823


          Rename activitylog for k8s types

d5bc7a0

Fix environment name field


          Use modern Go

8695f53

thokra-nav and others added 4 commits

March 16, 2026 14:14


          change activity log resource type name

1fa7ce6


          Add more resources

6c5604c


          Add Github claims when applied using gh workflow

376091f

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


          Move migration

9d329ce

thokra-nav force-pushed the bulk_apply branch from 4d5d88b to 9d329ce Compare

March 16, 2026 13:15

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

Labels

graphql-review-required