update go version to 1.19 & e2e dependency version (#104)
Signed-off-by: ChrisLiu <chrisliu1995@163.com>
This commit is contained in:
parent
ddcfeb759f
commit
bd41239718
|
|
@ -10,8 +10,8 @@ on:
|
||||||
|
|
||||||
env:
|
env:
|
||||||
# Common versions
|
# Common versions
|
||||||
GO_VERSION: '1.18'
|
GO_VERSION: '1.19'
|
||||||
GOLANGCI_VERSION: 'v1.47'
|
GOLANGCI_VERSION: 'v1.51'
|
||||||
DOCKER_BUILDX_VERSION: 'v0.4.2'
|
DOCKER_BUILDX_VERSION: 'v0.4.2'
|
||||||
|
|
||||||
# Common users. We can't run a step 'if secrets.AWS_USR != ""' but we can run
|
# Common users. We can't run a step 'if secrets.AWS_USR != ""' but we can run
|
||||||
|
|
@ -43,7 +43,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
make generate
|
make generate
|
||||||
- name: Lint golang code
|
- name: Lint golang code
|
||||||
uses: golangci/golangci-lint-action@v3.2.0
|
uses: golangci/golangci-lint-action@v3.5.0
|
||||||
with:
|
with:
|
||||||
version: ${{ env.GOLANGCI_VERSION }}
|
version: ${{ env.GOLANGCI_VERSION }}
|
||||||
args: --verbose --timeout=10m
|
args: --verbose --timeout=10m
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
name: E2E-1.24
|
name: E2E-1.26
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
|
|
@ -10,10 +10,10 @@ on:
|
||||||
|
|
||||||
env:
|
env:
|
||||||
# Common versions
|
# Common versions
|
||||||
GO_VERSION: '1.18'
|
GO_VERSION: '1.19'
|
||||||
KIND_ACTION_VERSION: 'v1.3.0'
|
KIND_ACTION_VERSION: 'v1.3.0'
|
||||||
KIND_VERSION: 'v0.14.0'
|
KIND_VERSION: 'v0.14.0'
|
||||||
KIND_IMAGE: 'kindest/node:v1.24.2'
|
KIND_IMAGE: 'kindest/node:v1.26.4'
|
||||||
KIND_CLUSTER_NAME: 'ci-testing'
|
KIND_CLUSTER_NAME: 'ci-testing'
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|
@ -47,7 +47,7 @@ jobs:
|
||||||
make helm
|
make helm
|
||||||
helm repo add openkruise https://openkruise.github.io/charts/
|
helm repo add openkruise https://openkruise.github.io/charts/
|
||||||
helm repo update
|
helm repo update
|
||||||
helm install kruise openkruise/kruise --version 1.3.0 --set featureGates="PodProbeMarkerGate=true"
|
helm install kruise openkruise/kruise --version 1.5.0
|
||||||
for ((i=1;i<10;i++));
|
for ((i=1;i<10;i++));
|
||||||
do
|
do
|
||||||
set +e
|
set +e
|
||||||
4
go.mod
4
go.mod
|
|
@ -1,6 +1,6 @@
|
||||||
module github.com/openkruise/kruise-game
|
module github.com/openkruise/kruise-game
|
||||||
|
|
||||||
go 1.18
|
go 1.19
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/BurntSushi/toml v0.3.1
|
github.com/BurntSushi/toml v0.3.1
|
||||||
|
|
@ -8,6 +8,7 @@ require (
|
||||||
github.com/onsi/ginkgo v1.16.5
|
github.com/onsi/ginkgo v1.16.5
|
||||||
github.com/onsi/gomega v1.18.1
|
github.com/onsi/gomega v1.18.1
|
||||||
github.com/openkruise/kruise-api v1.3.0
|
github.com/openkruise/kruise-api v1.3.0
|
||||||
|
github.com/prometheus/client_golang v1.12.1
|
||||||
google.golang.org/grpc v1.40.0
|
google.golang.org/grpc v1.40.0
|
||||||
google.golang.org/protobuf v1.27.1
|
google.golang.org/protobuf v1.27.1
|
||||||
k8s.io/api v0.24.0
|
k8s.io/api v0.24.0
|
||||||
|
|
@ -57,7 +58,6 @@ require (
|
||||||
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
|
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
|
||||||
github.com/nxadm/tail v1.4.8 // indirect
|
github.com/nxadm/tail v1.4.8 // indirect
|
||||||
github.com/pkg/errors v0.9.1 // indirect
|
github.com/pkg/errors v0.9.1 // indirect
|
||||||
github.com/prometheus/client_golang v1.12.1 // indirect
|
|
||||||
github.com/prometheus/client_model v0.2.0 // indirect
|
github.com/prometheus/client_model v0.2.0 // indirect
|
||||||
github.com/prometheus/common v0.32.1 // indirect
|
github.com/prometheus/common v0.32.1 // indirect
|
||||||
github.com/prometheus/procfs v0.7.3 // indirect
|
github.com/prometheus/procfs v0.7.3 // indirect
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,6 @@ package atomic
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
|
||||||
"os"
|
"os"
|
||||||
"path"
|
"path"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
@ -301,7 +300,7 @@ func shouldWriteFile(path string, content []byte) (bool, error) {
|
||||||
return true, nil
|
return true, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
contentOnFs, err := ioutil.ReadFile(path)
|
contentOnFs, err := os.ReadFile(path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return false, err
|
return false, err
|
||||||
}
|
}
|
||||||
|
|
@ -353,7 +352,7 @@ func (w *Writer) pathsToRemove(payload map[string]FileProjection, oldTsDir strin
|
||||||
|
|
||||||
// newTimestampDir creates a new timestamp directory
|
// newTimestampDir creates a new timestamp directory
|
||||||
func (w *Writer) newTimestampDir() (string, error) {
|
func (w *Writer) newTimestampDir() (string, error) {
|
||||||
tsDir, err := ioutil.TempDir(w.targetDir, time.Now().UTC().Format("..2006_01_02_15_04_05."))
|
tsDir, err := os.MkdirTemp(w.targetDir, time.Now().UTC().Format("..2006_01_02_15_04_05."))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
klog.Error(err, "unable to create new temp directory")
|
klog.Error(err, "unable to create new temp directory")
|
||||||
return "", err
|
return "", err
|
||||||
|
|
@ -386,12 +385,12 @@ func (w *Writer) writePayloadToDir(payload map[string]FileProjection, dir string
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
err = ioutil.WriteFile(fullPath, content, mode)
|
err = os.WriteFile(fullPath, content, mode)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
klog.Error(err, "unable to write file", "file", fullPath, "mode", mode)
|
klog.Error(err, "unable to write file", "file", fullPath, "mode", mode)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
// Chmod is needed because ioutil.WriteFile() ends up calling
|
// Chmod is needed because os.WriteFile() ends up calling
|
||||||
// open(2) to create the file, so the final mode used is "mode &
|
// open(2) to create the file, so the final mode used is "mode &
|
||||||
// ~umask". But we want to make sure the specified mode is used
|
// ~umask". But we want to make sure the specified mode is used
|
||||||
// in the file no matter what the umask is.
|
// in the file no matter what the umask is.
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,6 @@ package writer
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
|
||||||
"os"
|
"os"
|
||||||
"path"
|
"path"
|
||||||
|
|
||||||
|
|
@ -158,19 +157,19 @@ func (f *fsCertWriter) read() (*generator.Artifacts, error) {
|
||||||
if err := ensureExist(f.Path); err != nil {
|
if err := ensureExist(f.Path); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
caKeyBytes, err := ioutil.ReadFile(path.Join(f.Path, CAKeyName))
|
caKeyBytes, err := os.ReadFile(path.Join(f.Path, CAKeyName))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
caCertBytes, err := ioutil.ReadFile(path.Join(f.Path, CACertName))
|
caCertBytes, err := os.ReadFile(path.Join(f.Path, CACertName))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
certBytes, err := ioutil.ReadFile(path.Join(f.Path, ServerCertName))
|
certBytes, err := os.ReadFile(path.Join(f.Path, ServerCertName))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
keyBytes, err := ioutil.ReadFile(path.Join(f.Path, ServerKeyName))
|
keyBytes, err := os.ReadFile(path.Join(f.Path, ServerKeyName))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue