Upgrade skv2 and codegen (#1081)

* upgrade skv2 * codegen updates * codegen
solo-io · Nov 22, 2023 · 8561a08 · 8561a08
1 parent 05bcaa5
commit 8561a08
Show file tree

Hide file tree

Showing 14 changed files with 61 additions and 58 deletions.
diff --git a/codegen/utils.go b/codegen/utils.go
@@ -34,6 +34,7 @@ func makeGroup(
 				},
 			},
 			StrictUnmarshal: false,
+			Stored:          true,
 		}
 		if !resource.noStatus {
 			res.Status = &model.Field{Type: model.Type{
@@ -52,15 +53,17 @@ func makeGroup(
 			Group:   groupPrefix + "." + "solo.io",
 			Version: version,
 		},
-		Module:           module,
-		Resources:        resources,
-		RenderManifests:  true,
-		RenderTypes:      true,
-		RenderClients:    true,
-		RenderController: true,
-		MockgenDirective: true,
-		CustomTemplates:  customGroupTemplates,
-		ApiRoot:          apiRoot,
-		SkipSpecHash:     true,
+		Module:                    module,
+		Resources:                 resources,
+		RenderManifests:           true,
+		RenderTypes:               true,
+		RenderClients:             true,
+		RenderController:          true,
+		MockgenDirective:          true,
+		CustomTemplates:           customGroupTemplates,
+		ApiRoot:                   apiRoot,
+		SkipSpecHash:              true,
+		SkipConditionalCRDLoading: true, // we want the alpha crds always rendered
+		SkipTemplatedCRDManifest:  true, // do not make a copy of crds in templates dir
 	}
 }
diff --git a/crds/enterprise.gloo.solo.io_v1_crds.yaml → crds/enterprise.gloo.solo.io_crds.yaml b/crds/enterprise.gloo.solo.io_v1_crds.yaml → crds/enterprise.gloo.solo.io_crds.yaml
diff --git a/.../fed.enterprise.gloo.solo.io_v1_crds.yaml → crds/fed.enterprise.gloo.solo.io_crds.yaml b/.../fed.enterprise.gloo.solo.io_v1_crds.yaml → crds/fed.enterprise.gloo.solo.io_crds.yaml
diff --git a/crds/fed.gateway.solo.io_v1_crds.yaml → crds/fed.gateway.solo.io_crds.yaml b/crds/fed.gateway.solo.io_v1_crds.yaml → crds/fed.gateway.solo.io_crds.yaml
diff --git a/crds/fed.gloo.solo.io_v1_crds.yaml → crds/fed.gloo.solo.io_crds.yaml b/crds/fed.gloo.solo.io_v1_crds.yaml → crds/fed.gloo.solo.io_crds.yaml
diff --git a/.../fed.ratelimit.solo.io_v1alpha1_crds.yaml → crds/fed.ratelimit.solo.io_crds.yaml b/.../fed.ratelimit.solo.io_v1alpha1_crds.yaml → crds/fed.ratelimit.solo.io_crds.yaml
diff --git a/crds/fed.solo.io_v1_crds.yaml → crds/fed.solo.io_crds.yaml b/crds/fed.solo.io_v1_crds.yaml → crds/fed.solo.io_crds.yaml
@@ -6,14 +6,14 @@ metadata:
   labels:
     app: ""
     app.kubernetes.io/name: ""
-  name: glooinstances.fed.solo.io
+  name: failoverschemes.fed.solo.io
 spec:
   group: fed.solo.io
   names:
-    kind: GlooInstance
-    listKind: GlooInstanceList
-    plural: glooinstances
-    singular: glooinstance
+    kind: FailoverScheme
+    listKind: FailoverSchemeList
+    plural: failoverschemes
+    singular: failoverscheme
   scope: Namespaced
   versions:
   - name: v1
@@ -33,14 +33,14 @@ metadata:
   labels:
     app: ""
     app.kubernetes.io/name: ""
-  name: failoverschemes.fed.solo.io
+  name: glooinstances.fed.solo.io
 spec:
   group: fed.solo.io
   names:
-    kind: FailoverScheme
-    listKind: FailoverSchemeList
-    plural: failoverschemes
-    singular: failoverscheme
+    kind: GlooInstance
+    listKind: GlooInstanceList
+    plural: glooinstances
+    singular: glooinstance
   scope: Namespaced
   versions:
   - name: v1

diff --git a/crds/gateway.solo.io_v1_crds.yaml → crds/gateway.solo.io_crds.yaml b/crds/gateway.solo.io_v1_crds.yaml → crds/gateway.solo.io_crds.yaml
@@ -87,14 +87,14 @@ metadata:
   labels:
     app: ""
     app.kubernetes.io/name: ""
-  name: routetables.gateway.solo.io
+  name: routeoptions.gateway.solo.io
 spec:
   group: gateway.solo.io
   names:
-    kind: RouteTable
-    listKind: RouteTableList
-    plural: routetables
-    singular: routetable
+    kind: RouteOption
+    listKind: RouteOptionList
+    plural: routeoptions
+    singular: routeoption
   scope: Namespaced
   versions:
   - name: v1
@@ -114,14 +114,14 @@ metadata:
   labels:
     app: ""
     app.kubernetes.io/name: ""
-  name: virtualservices.gateway.solo.io
+  name: routetables.gateway.solo.io
 spec:
   group: gateway.solo.io
   names:
-    kind: VirtualService
-    listKind: VirtualServiceList
-    plural: virtualservices
-    singular: virtualservice
+    kind: RouteTable
+    listKind: RouteTableList
+    plural: routetables
+    singular: routetable
   scope: Namespaced
   versions:
   - name: v1
@@ -168,14 +168,14 @@ metadata:
   labels:
     app: ""
     app.kubernetes.io/name: ""
-  name: routeoptions.gateway.solo.io
+  name: virtualservices.gateway.solo.io
 spec:
   group: gateway.solo.io
   names:
-    kind: RouteOption
-    listKind: RouteOptionList
-    plural: routeoptions
-    singular: routeoption
+    kind: VirtualService
+    listKind: VirtualServiceList
+    plural: virtualservices
+    singular: virtualservice
   scope: Namespaced
   versions:
   - name: v1

diff --git a/crds/gloo.solo.io_v1_crds.yaml → crds/gloo.solo.io_crds.yaml b/crds/gloo.solo.io_v1_crds.yaml → crds/gloo.solo.io_crds.yaml
@@ -6,14 +6,14 @@ metadata:
   labels:
     app: ""
     app.kubernetes.io/name: ""
-  name: settings.gloo.solo.io
+  name: proxies.gloo.solo.io
 spec:
   group: gloo.solo.io
   names:
-    kind: Settings
-    listKind: SettingsList
-    plural: settings
-    singular: settings
+    kind: Proxy
+    listKind: ProxyList
+    plural: proxies
+    singular: proxy
   scope: Namespaced
   versions:
   - name: v1
@@ -33,14 +33,14 @@ metadata:
   labels:
     app: ""
     app.kubernetes.io/name: ""
-  name: upstreams.gloo.solo.io
+  name: settings.gloo.solo.io
 spec:
   group: gloo.solo.io
   names:
-    kind: Upstream
-    listKind: UpstreamList
-    plural: upstreams
-    singular: upstream
+    kind: Settings
+    listKind: SettingsList
+    plural: settings
+    singular: settings
   scope: Namespaced
   versions:
   - name: v1
@@ -60,14 +60,14 @@ metadata:
   labels:
     app: ""
     app.kubernetes.io/name: ""
-  name: upstreamgroups.gloo.solo.io
+  name: upstreams.gloo.solo.io
 spec:
   group: gloo.solo.io
   names:
-    kind: UpstreamGroup
-    listKind: UpstreamGroupList
-    plural: upstreamgroups
-    singular: upstreamgroup
+    kind: Upstream
+    listKind: UpstreamList
+    plural: upstreams
+    singular: upstream
   scope: Namespaced
   versions:
   - name: v1
@@ -87,14 +87,14 @@ metadata:
   labels:
     app: ""
     app.kubernetes.io/name: ""
-  name: proxies.gloo.solo.io
+  name: upstreamgroups.gloo.solo.io
 spec:
   group: gloo.solo.io
   names:
-    kind: Proxy
-    listKind: ProxyList
-    plural: proxies
-    singular: proxy
+    kind: UpstreamGroup
+    listKind: UpstreamGroupList
+    plural: upstreamgroups
+    singular: upstreamgroup
   scope: Namespaced
   versions:
   - name: v1

diff --git a/crds/graphql.gloo.solo.io_v1beta1_crds.yaml → crds/graphql.gloo.solo.io_crds.yaml b/crds/graphql.gloo.solo.io_v1beta1_crds.yaml → crds/graphql.gloo.solo.io_crds.yaml
diff --git a/crds/multicluster.solo.io_v1alpha1_crds.yaml → crds/multicluster.solo.io_crds.yaml b/crds/multicluster.solo.io_v1alpha1_crds.yaml → crds/multicluster.solo.io_crds.yaml
diff --git a/crds/ratelimit.solo.io_v1alpha1_crds.yaml → crds/ratelimit.solo.io_crds.yaml b/crds/ratelimit.solo.io_v1alpha1_crds.yaml → crds/ratelimit.solo.io_crds.yaml
diff --git a/go.mod b/go.mod
@@ -29,7 +29,7 @@ require (
 	github.com/rotisserie/eris v0.4.0
 	github.com/solo-io/go-utils v0.24.6
 	github.com/solo-io/protoc-gen-ext v0.0.18
-	github.com/solo-io/skv2 v0.32.0
+	github.com/solo-io/skv2 v0.34.10
 	github.com/solo-io/solo-kit v0.33.0
 	golang.org/x/tools v0.10.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d

diff --git a/go.sum b/go.sum
@@ -772,8 +772,8 @@ github.com/solo-io/k8s-utils v0.5.0 h1:+izXpnmPIKzq9w9rsNXSfPlj876gX8J7Bjw+vEk+R
 github.com/solo-io/k8s-utils v0.5.0/go.mod h1:jp+stgh/5+NyVsbNqxzxw3xvmH97TYKruit9KtBszBI=
 github.com/solo-io/protoc-gen-ext v0.0.18 h1:zSAL8NzWpJUGYoA5IyjHiKASNyHjR0uxBQ7eQS94i3A=
 github.com/solo-io/protoc-gen-ext v0.0.18/go.mod h1:iGyCvmKmhJNXs5MgBcYFBF0om7LDnCVD2WwhOZGnqeA=
-github.com/solo-io/skv2 v0.32.0 h1:3I/KHo7iWdlbDUNeZk1qK3XB2YTRss4TFEVr5BpeCpY=
-github.com/solo-io/skv2 v0.32.0/go.mod h1:B3+k873oVsOpCQdCH0AgNLCLPabXoghUUSbeBeeqwa0=
+github.com/solo-io/skv2 v0.34.10 h1:SUrCMLr2fdXwJR6uVEwKJ6dse9iiqg7bMzejzWRYT0w=
+github.com/solo-io/skv2 v0.34.10/go.mod h1:O5akjsqc88aSQUNqRY5o6/O9q7y11KVHqikeg26echw=
 github.com/solo-io/solo-kit v0.33.0 h1:O4vjrFx4+I6jvzpMvF3AaoCVZHlyADru2uQLYN0XPBc=
 github.com/solo-io/solo-kit v0.33.0/go.mod h1:A07lC2OWBo01qxYr8qX71OQ0zEeLQwRKtAS953fQIqY=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=