diff --git a/Variables.mk b/Variables.mk index 2451c50e..18500543 100644 --- a/Variables.mk +++ b/Variables.mk @@ -14,6 +14,7 @@ VARLIST := OS VARLIST += WAREWULF VERSION RELEASE WAREWULF ?= warewulf VERSION ?= 4.5.x + GIT_TAG := $(shell test -e .git && git log -1 --format="%h") ifdef GIT_TAG diff --git a/cmd/update_configuration/vers43/nodes.conf b/cmd/update_configuration/vers43/nodes.conf index acbf5b96..22772050 100644 --- a/cmd/update_configuration/vers43/nodes.conf +++ b/cmd/update_configuration/vers43/nodes.conf @@ -1,4 +1,4 @@ -WW_INTERNAL: 43 +WW_INTERNAL: 45 nodeprofiles: default: comment: This profile is automatically included for each node diff --git a/docs/man/man5/warewulf.conf.5 b/docs/man/man5/warewulf.conf.5 index 4a0fdd13..9c222858 100644 --- a/docs/man/man5/warewulf.conf.5 +++ b/docs/man/man5/warewulf.conf.5 @@ -283,7 +283,7 @@ A sample configuration file for a typical deployment, with all dependent services enabled. .EX -WW_INTERNAL: 43 +WW_INTERNAL: 45 ipaddr: 10.0.0.1 network: 10.0.0.0 netmask: 255.255.0.0 diff --git a/internal/app/wwctl/root.go b/internal/app/wwctl/root.go index 7ab566f5..0b68398e 100644 --- a/internal/app/wwctl/root.go +++ b/internal/app/wwctl/root.go @@ -87,6 +87,7 @@ func rootPersistentPreRunE(cmd *cobra.Command, args []string) (err error) { } } if err != nil { + wwlog.Error("version: %s relase: %s WW_INTERNAL: %s", warewulfconf.Version, warewulfconf.Release, warewulfconf.Confversion) return } err = conf.SetDynamicDefaults() diff --git a/internal/pkg/config/buildconfig.go.in b/internal/pkg/config/buildconfig.go.in index 6f761cc1..0b1b3195 100644 --- a/internal/pkg/config/buildconfig.go.in +++ b/internal/pkg/config/buildconfig.go.in @@ -14,17 +14,13 @@ type BuildConfig struct { WWChrootdir string `default:"@WWCHROOTDIR@"` WWProvisiondir string `default:"@WWPROVISIONDIR@"` WWClientdir string `default:"@WWCLIENTDIR@"` - version string `default:"@VERSION@"` - release string `default:"@RELEASE@"` } -func (conf BuildConfig) Version() string { - return conf.version -} +const Version = "@VERSION@" +const Release = "@RELEASE@" -func (conf BuildConfig) Release() string { - return conf.release -} +// must be set .in file so that its available for tests +const Confversion = "45" type TFTPConf struct { Enabled bool `yaml:"enabled" default:"true"` diff --git a/internal/pkg/config/root_test.go b/internal/pkg/config/root_test.go index 95b4e9c4..7cf0812c 100644 --- a/internal/pkg/config/root_test.go +++ b/internal/pkg/config/root_test.go @@ -51,8 +51,6 @@ func TestDefaultRootConf(t *testing.T) { assert.NotEmpty(t, conf.Paths.WWOverlaydir) assert.NotEmpty(t, conf.Paths.WWChrootdir) assert.NotEmpty(t, conf.Paths.WWProvisiondir) - assert.NotEmpty(t, conf.Paths.Version) - assert.NotEmpty(t, conf.Paths.Release) assert.NotEmpty(t, conf.Paths.WWClientdir) } diff --git a/internal/pkg/overlay/funcmap_test.go b/internal/pkg/overlay/funcmap_test.go index 5ffef11c..3fa9f65c 100644 --- a/internal/pkg/overlay/funcmap_test.go +++ b/internal/pkg/overlay/funcmap_test.go @@ -1,9 +1,10 @@ package overlay import ( + "testing" + "github.com/stretchr/testify/assert" "github.com/warewulf/warewulf/internal/pkg/node" - "testing" ) func Test_createIgnitionJson(t *testing.T) { diff --git a/internal/pkg/testenv/testenv.go b/internal/pkg/testenv/testenv.go index 8e8e4076..76ff3810 100644 --- a/internal/pkg/testenv/testenv.go +++ b/internal/pkg/testenv/testenv.go @@ -11,8 +11,9 @@ import ( "path/filepath" "testing" + warewulfconf "github.com/warewulf/warewulf/internal/pkg/config" + "github.com/stretchr/testify/assert" - "github.com/warewulf/warewulf/internal/pkg/config" "github.com/warewulf/warewulf/internal/pkg/node" ) @@ -62,7 +63,7 @@ func New(t *testing.T) (env *TestEnv) { env.WriteFile(t, path.Join(Datadir, "warewulf/defaults.conf"), initDefaultsConf) // re-read warewulf.conf - conf := config.New() + conf := warewulfconf.New() err = conf.Read(env.GetPath(path.Join(Sysconfdir, "warewulf/warewulf.conf"))) assert.NoError(t, err) diff --git a/internal/pkg/version/version.go b/internal/pkg/version/version.go index 1db687cb..d38e9aed 100644 --- a/internal/pkg/version/version.go +++ b/internal/pkg/version/version.go @@ -11,8 +11,7 @@ import ( Return the version of wwctl */ func GetVersion() string { - conf := warewulfconf.Get() - return fmt.Sprintf("%s-%s", conf.Paths.Version(), conf.Paths.Release()) + return fmt.Sprintf("%s-%s", warewulfconf.Version, warewulfconf.Release) } /* diff --git a/userdocs/contents/configuration.rst b/userdocs/contents/configuration.rst index 9d92c174..8b737be2 100644 --- a/userdocs/contents/configuration.rst +++ b/userdocs/contents/configuration.rst @@ -14,7 +14,7 @@ Warewulf (4.4.0): .. code-block:: yaml - WW_INTERNAL: 43 + WW_INTERNAL: 45 ipaddr: 10.0.0.1 netmask: 255.255.252.0 network: 10.0.0.0 diff --git a/userdocs/contributing/development-environment-vagrant.rst b/userdocs/contributing/development-environment-vagrant.rst index 73d5a928..4a26a31b 100644 --- a/userdocs/contributing/development-environment-vagrant.rst +++ b/userdocs/contributing/development-environment-vagrant.rst @@ -190,7 +190,7 @@ Vagrantfile head.vm.provision "shell", inline: <<-SHELL cat << 'CONF' | sudo tee /etc/warewulf/warewulf.conf - WW_INTERNAL: 43 + WW_INTERNAL: 45 ipaddr: 192.168.200.254 netmask: 255.255.255.0 network: 192.168.200.0 diff --git a/userdocs/quickstart/debian12.rst b/userdocs/quickstart/debian12.rst index 2a3ff901..59ece3f9 100644 --- a/userdocs/quickstart/debian12.rst +++ b/userdocs/quickstart/debian12.rst @@ -64,7 +64,7 @@ address of your cluster's private network interface: .. code-block:: yaml - WW_INTERNAL: 43 + WW_INTERNAL: 45 ipaddr: 192.168.200.1 netmask: 255.255.255.0 network: 192.168.200.0 diff --git a/userdocs/quickstart/el8.rst b/userdocs/quickstart/el8.rst index 6eaf908c..5a9f2eb2 100644 --- a/userdocs/quickstart/el8.rst +++ b/userdocs/quickstart/el8.rst @@ -57,7 +57,7 @@ address of your cluster's private network interface: .. code-block:: yaml - WW_INTERNAL: 43 + WW_INTERNAL: 45 ipaddr: 192.168.200.1 netmask: 255.255.255.0 network: 192.168.200.0 diff --git a/userdocs/quickstart/el9.rst b/userdocs/quickstart/el9.rst index a29b27db..dddd8f3f 100644 --- a/userdocs/quickstart/el9.rst +++ b/userdocs/quickstart/el9.rst @@ -57,7 +57,7 @@ address of your cluster's private network interface: .. code-block:: yaml - WW_INTERNAL: 43 + WW_INTERNAL: 45 ipaddr: 192.168.200.1 netmask: 255.255.255.0 network: 192.168.200.0