mirrors/pinniped
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/pinniped.git synced 2026-01-06 21:47:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use a real binary version when setting up the aggregated API servers

Browse Source
This commit is contained in:
Joshua Casey
2024-08-22 12:49:52 -05:00
parent 851855d0ee
commit 94809ee396
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/concierge/apiserver/apiserver.go
View File

@@ -19,6 +19,7 @@ import (
"go.pinniped.dev/internal/clientcertissuer"
"go.pinniped.dev/internal/controllerinit"
"go.pinniped.dev/internal/plog"
"go.pinniped.dev/internal/pversion"
"go.pinniped.dev/internal/registry/credentialrequest"
"go.pinniped.dev/internal/registry/whoamirequest"
"go.pinniped.dev/internal/tokenclient"
@@ -56,14 +57,13 @@ type CompletedConfig struct {
// Complete fills in any fields not set that are required to have valid data. It's mutating the receiver.
func (c *Config) Complete() CompletedConfig {
// Be sure to set this before calling c.GenericConfig.Complete()
c.GenericConfig.EffectiveVersion = utilversion.NewEffectiveVersion(pversion.Get().String())
completedCfg := completedConfig{
c.GenericConfig.Complete(),
&c.ExtraConfig,
}
// TODO: use a real version
completedCfg.GenericConfig.EffectiveVersion = utilversion.NewEffectiveVersion("1.2.3")
return CompletedConfig{completedConfig: &completedCfg}
}

3
internal/concierge/impersonator/impersonator.go
View File

@@ -45,6 +45,7 @@ import (
"k8s.io/apiserver/pkg/server/dynamiccertificates"
"k8s.io/apiserver/pkg/server/filters"
genericoptions "k8s.io/apiserver/pkg/server/options"
utilversion "k8s.io/apiserver/pkg/util/version"
auditfake "k8s.io/apiserver/plugin/pkg/audit/fake"
"k8s.io/client-go/rest"
"k8s.io/client-go/transport"
@@ -55,6 +56,7 @@ import (
"go.pinniped.dev/internal/httputil/securityheader"
"go.pinniped.dev/internal/kubeclient"
"go.pinniped.dev/internal/plog"
"go.pinniped.dev/internal/pversion"
"go.pinniped.dev/internal/tokenclient"
"go.pinniped.dev/internal/valuelesscontext"
)
@@ -323,6 +325,7 @@ func newInternal(
recConfig(serverConfig)
}
serverConfig.EffectiveVersion = utilversion.NewEffectiveVersion(pversion.Get().String())
completedConfig := serverConfig.Complete()
impersonationProxyServer, err := completedConfig.New("impersonation-proxy", genericapiserver.NewEmptyDelegate())
if err != nil {

6
internal/supervisor/apiserver/apiserver.go
View File

@@ -22,6 +22,7 @@ import (
configv1alpha1clientset "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/typed/config/v1alpha1"
"go.pinniped.dev/internal/controllerinit"
"go.pinniped.dev/internal/plog"
"go.pinniped.dev/internal/pversion"
"go.pinniped.dev/internal/registry/clientsecretrequest"
)
@@ -56,13 +57,14 @@ type CompletedConfig struct {
// Complete fills in any fields not set that are required to have valid data. It's mutating the receiver.
func (c *Config) Complete() CompletedConfig {
// Be sure to set this before calling c.GenericConfig.Complete()
c.GenericConfig.EffectiveVersion = utilversion.NewEffectiveVersion(pversion.Get().String())
completedCfg := completedConfig{
c.GenericConfig.Complete(),
&c.ExtraConfig,
}
// TODO: use a real version
completedCfg.GenericConfig.EffectiveVersion = utilversion.NewEffectiveVersion("1.2.3")
return CompletedConfig{completedConfig: &completedCfg}
}