Skip to content

Commit

Permalink
Remove deprecated ioutil and use os instead
Browse files Browse the repository at this point in the history
Signed-off-by: Tobias Giese <tobias.giese@mercedes-benz.com>
  • Loading branch information
tobiasgiese committed Jul 27, 2022
1 parent 49ffd32 commit f6727e2
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion hack/boilerplate/boilerplate.go.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0
http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
Expand Down
10 changes: 5 additions & 5 deletions pkg/cloud/services/compute/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ type Service struct {
}

/*
NovaMinimumMicroversion is the minimum Nova microversion supported by CAPO
2.53 corresponds to OpenStack Pike
NovaMinimumMicroversion is the minimum Nova microversion supported by CAPO
2.53 corresponds to OpenStack Pike
For the canonical description of Nova microversions, see
https://docs.openstack.org/nova/latest/reference/api-microversion-history.html
For the canonical description of Nova microversions, see
https://docs.openstack.org/nova/latest/reference/api-microversion-history.html
CAPO uses server tags, which were added in microversion 2.52.
CAPO uses server tags, which were added in microversion 2.52.
*/
const NovaMinimumMicroversion = "2.53"

Expand Down
5 changes: 2 additions & 3 deletions test/e2e/shared/suite.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (
"flag"
"fmt"
"io/fs"
"io/ioutil"
"os"
"path"
"path/filepath"
Expand Down Expand Up @@ -73,10 +72,10 @@ func Node1BeforeSuite(e2eCtx *E2EContext) []byte {
return nil
}

sourceTemplate, err := ioutil.ReadFile(f)
sourceTemplate, err := os.ReadFile(f)
Expect(err).NotTo(HaveOccurred())

platformKustomization, err := ioutil.ReadFile(filepath.Join(e2eCtx.Settings.DataFolder, "ci-artifacts-platform-kustomization.yaml"))
platformKustomization, err := os.ReadFile(filepath.Join(e2eCtx.Settings.DataFolder, "ci-artifacts-platform-kustomization.yaml"))
Expect(err).NotTo(HaveOccurred())

ciTemplate, err := kubernetesversions.GenerateCIArtifactsInjectedTemplateForDebian(
Expand Down

0 comments on commit f6727e2

Please sign in to comment.