Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
edc07956
Unverified
Commit
edc07956
authored
Jan 19, 2023
by
Brooks Newberry
Committed by
GitHub
Jan 19, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update to v1.23.16+k3s1 (#6776)
parent
7d45f1fb
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
36 additions
and
32 deletions
+36
-32
integration.yaml
.github/workflows/integration.yaml
+1
-1
unitcoverage.yaml
.github/workflows/unitcoverage.yaml
+1
-1
Dockerfile.dapper
Dockerfile.dapper
+3
-3
Dockerfile.manifest
Dockerfile.manifest
+1
-1
Dockerfile.test.dapper
Dockerfile.test.dapper
+1
-1
Dockerfile.test.mod.dapper
Dockerfile.test.mod.dapper
+1
-1
go.mod
go.mod
+0
-0
go.sum
go.sum
+0
-0
zz_generated_bindata.go
pkg/deploy/zz_generated_bindata.go
+7
-5
register.go
pkg/generated/clientset/versioned/fake/register.go
+7
-7
register.go
pkg/generated/clientset/versioned/scheme/register.go
+7
-7
zz_generated_bindata.go
pkg/static/zz_generated_bindata.go
+7
-5
No files found.
.github/workflows/integration.yaml
View file @
edc07956
...
@@ -31,7 +31,7 @@ jobs:
...
@@ -31,7 +31,7 @@ jobs:
-
name
:
Install Go
-
name
:
Install Go
uses
:
actions/setup-go@v2
uses
:
actions/setup-go@v2
with
:
with
:
go-version
:
'
1.1
7.13
'
go-version
:
'
1.1
9.5
'
-
name
:
Checkout
-
name
:
Checkout
uses
:
actions/checkout@v2
uses
:
actions/checkout@v2
with
:
with
:
...
...
.github/workflows/unitcoverage.yaml
View file @
edc07956
...
@@ -33,7 +33,7 @@ jobs:
...
@@ -33,7 +33,7 @@ jobs:
-
name
:
Install Go
-
name
:
Install Go
uses
:
actions/setup-go@v2
uses
:
actions/setup-go@v2
with
:
with
:
go-version
:
'
1.1
7.13
'
go-version
:
'
1.1
9.5
'
-
name
:
Checkout
-
name
:
Checkout
uses
:
actions/checkout@v2
uses
:
actions/checkout@v2
with
:
with
:
...
...
Dockerfile.dapper
View file @
edc07956
ARG GOLANG=golang:1.1
7.13-alpine3.16
ARG GOLANG=golang:1.1
9.5-alpine3.17
FROM ${GOLANG}
FROM ${GOLANG}
ARG http_proxy=$http_proxy
ARG http_proxy=$http_proxy
...
@@ -32,8 +32,8 @@ RUN if [ "$(go env GOARCH)" = "arm64" ]; then
...
@@ -32,8 +32,8 @@ RUN if [ "$(go env GOARCH)" = "arm64" ]; then
tar -zxvf trivy_0.25.3_Linux-64bit.tar.gz && \
tar -zxvf trivy_0.25.3_Linux-64bit.tar.gz && \
mv trivy /usr/local/bin; \
mv trivy /usr/local/bin; \
fi
fi
# this works for both go 1.15 and 1.16
RUN GOPROXY=direct go
get
golang.org/x/tools/cmd/goimports@gopls/v0.7.0
RUN GOPROXY=direct go
install
golang.org/x/tools/cmd/goimports@gopls/v0.7.0
RUN rm -rf /go/src /go/pkg
RUN rm -rf /go/src /go/pkg
RUN if [ "$(go env GOARCH)" = "amd64" ]; then \
RUN if [ "$(go env GOARCH)" = "amd64" ]; then \
...
...
Dockerfile.manifest
View file @
edc07956
ARG GOLANG=golang:1.1
7.13
-alpine3.17
ARG GOLANG=golang:1.1
9.5
-alpine3.17
FROM ${GOLANG}
FROM ${GOLANG}
COPY --from=plugins/manifest:1.2.3 /bin/* /bin/
COPY --from=plugins/manifest:1.2.3 /bin/* /bin/
...
...
Dockerfile.test.dapper
View file @
edc07956
ARG GOLANG=golang:1.19.
4
-alpine3.17
ARG GOLANG=golang:1.19.
5
-alpine3.17
FROM ${GOLANG}
FROM ${GOLANG}
RUN apk -U --no-cache add bash git gcc musl-dev docker curl jq coreutils python3 openssl py3-pip procps findutils
RUN apk -U --no-cache add bash git gcc musl-dev docker curl jq coreutils python3 openssl py3-pip procps findutils
...
...
Dockerfile.test.mod.dapper
View file @
edc07956
ARG GOLANG=golang:1.1
7.13-alpine3.16
ARG GOLANG=golang:1.1
9.5-alpine3.17
FROM ${GOLANG}
FROM ${GOLANG}
RUN apk -U --no-cache add bash jq
RUN apk -U --no-cache add bash jq
...
...
go.mod
View file @
edc07956
This diff is collapsed.
Click to expand it.
go.sum
View file @
edc07956
This diff is collapsed.
Click to expand it.
pkg/deploy/zz_generated_bindata.go
View file @
edc07956
...
@@ -401,11 +401,13 @@ var _bindata = map[string]func() (*asset, error){
...
@@ -401,11 +401,13 @@ var _bindata = map[string]func() (*asset, error){
// directory embedded in the file by go-bindata.
// directory embedded in the file by go-bindata.
// For example if you run go-bindata on data/... and data contains the
// For example if you run go-bindata on data/... and data contains the
// following hierarchy:
// following hierarchy:
// data/
//
// foo.txt
// data/
// img/
// foo.txt
// a.png
// img/
// b.png
// a.png
// b.png
//
// then AssetDir("data") would return []string{"foo.txt", "img"}
// then AssetDir("data") would return []string{"foo.txt", "img"}
// AssetDir("data/img") would return []string{"a.png", "b.png"}
// AssetDir("data/img") would return []string{"a.png", "b.png"}
// AssetDir("foo.txt") and AssetDir("notexist") would return an error
// AssetDir("foo.txt") and AssetDir("notexist") would return an error
...
...
pkg/generated/clientset/versioned/fake/register.go
View file @
edc07956
...
@@ -37,14 +37,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{
...
@@ -37,14 +37,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{
// AddToScheme adds all types of this clientset into the given scheme. This allows composition
// AddToScheme adds all types of this clientset into the given scheme. This allows composition
// of clientsets, like in:
// of clientsets, like in:
//
//
//
import (
//
import (
//
"k8s.io/client-go/kubernetes"
//
"k8s.io/client-go/kubernetes"
//
clientsetscheme "k8s.io/client-go/kubernetes/scheme"
//
clientsetscheme "k8s.io/client-go/kubernetes/scheme"
//
aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
//
aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
//
)
//
)
//
//
//
kclientset, _ := kubernetes.NewForConfig(c)
//
kclientset, _ := kubernetes.NewForConfig(c)
//
_ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
//
_ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
//
//
// After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
// After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
// correctly.
// correctly.
...
...
pkg/generated/clientset/versioned/scheme/register.go
View file @
edc07956
...
@@ -37,14 +37,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{
...
@@ -37,14 +37,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{
// AddToScheme adds all types of this clientset into the given scheme. This allows composition
// AddToScheme adds all types of this clientset into the given scheme. This allows composition
// of clientsets, like in:
// of clientsets, like in:
//
//
//
import (
//
import (
//
"k8s.io/client-go/kubernetes"
//
"k8s.io/client-go/kubernetes"
//
clientsetscheme "k8s.io/client-go/kubernetes/scheme"
//
clientsetscheme "k8s.io/client-go/kubernetes/scheme"
//
aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
//
aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
//
)
//
)
//
//
//
kclientset, _ := kubernetes.NewForConfig(c)
//
kclientset, _ := kubernetes.NewForConfig(c)
//
_ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
//
_ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
//
//
// After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
// After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
// correctly.
// correctly.
...
...
pkg/static/zz_generated_bindata.go
View file @
edc07956
...
@@ -181,11 +181,13 @@ var _bindata = map[string]func() (*asset, error){
...
@@ -181,11 +181,13 @@ var _bindata = map[string]func() (*asset, error){
// directory embedded in the file by go-bindata.
// directory embedded in the file by go-bindata.
// For example if you run go-bindata on data/... and data contains the
// For example if you run go-bindata on data/... and data contains the
// following hierarchy:
// following hierarchy:
// data/
//
// foo.txt
// data/
// img/
// foo.txt
// a.png
// img/
// b.png
// a.png
// b.png
//
// then AssetDir("data") would return []string{"foo.txt", "img"}
// then AssetDir("data") would return []string{"foo.txt", "img"}
// AssetDir("data/img") would return []string{"a.png", "b.png"}
// AssetDir("data/img") would return []string{"a.png", "b.png"}
// AssetDir("foo.txt") and AssetDir("notexist") would return an error
// AssetDir("foo.txt") and AssetDir("notexist") would return an error
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment