Skip to content

Commit

Permalink
Bump k8s modules to 0.25.0 and prepare for 2.7.0 release (#7316)
Browse files Browse the repository at this point in the history
* Bump k8s modules to 0.25.0

* Bump k8s modules to 0.25.0 stable

* Revert translation changes

* Revert translation changes

* 2.7.0

Co-authored-by: Marcin Maciaszczyk <[email protected]>
  • Loading branch information
shu-mutou and maciaszczykm authored Sep 16, 2022
1 parent ce5e49a commit 42deb6b
Show file tree
Hide file tree
Showing 11 changed files with 54 additions and 402 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ROOT_DIRECTORY := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
COVERAGE_DIRECTORY = $(ROOT_DIRECTORY)/coverage
GO_COVERAGE_FILE = $(ROOT_DIRECTORY)/coverage/go.txt
AIR_BINARY := $(shell which air)
CODEGEN_VERSION := v0.24.1
CODEGEN_VERSION := v0.25.0
CODEGEN_BIN := $(GOPATH)/pkg/mod/k8s.io/code-generator@$(CODEGEN_VERSION)/generate-groups.sh
GOLANGCILINT_VERSION := v1.48.0
GOLANGCILINT_BINARY := $(shell which golangci-lint)
Expand All @@ -30,7 +30,7 @@ PROD_BINARY = dist/amd64/dashboard
SERVE_DIRECTORY = .tmp/serve
SERVE_BINARY = .tmp/serve/dashboard
RELEASE_IMAGE = kubernetesui/dashboard
RELEASE_VERSION = v2.6.1
RELEASE_VERSION = v2.7.0
RELEASE_IMAGE_NAMES += $(foreach arch, $(ARCHITECTURES), $(RELEASE_IMAGE)-$(arch):$(RELEASE_VERSION))
RELEASE_IMAGE_NAMES_LATEST += $(foreach arch, $(ARCHITECTURES), $(RELEASE_IMAGE)-$(arch):latest)
HEAD_IMAGE = kubernetesdashboarddev/dashboard
Expand Down
2 changes: 1 addition & 1 deletion aio/deploy/alternative.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ spec:
type: RuntimeDefault
containers:
- name: kubernetes-dashboard
image: kubernetesui/dashboard:v2.6.1
image: kubernetesui/dashboard:v2.7.0
ports:
- containerPort: 9090
protocol: TCP
Expand Down
2 changes: 1 addition & 1 deletion aio/deploy/alternative/06_dashboard-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
type: RuntimeDefault
containers:
- name: kubernetes-dashboard
image: kubernetesui/dashboard:v2.6.1
image: kubernetesui/dashboard:v2.7.0
ports:
- containerPort: 9090
protocol: TCP
Expand Down
2 changes: 1 addition & 1 deletion aio/deploy/recommended.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ spec:
type: RuntimeDefault
containers:
- name: kubernetes-dashboard
image: kubernetesui/dashboard:v2.6.1
image: kubernetesui/dashboard:v2.7.0
imagePullPolicy: Always
ports:
- containerPort: 8443
Expand Down
2 changes: 1 addition & 1 deletion aio/deploy/recommended/06_dashboard-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
type: RuntimeDefault
containers:
- name: kubernetes-dashboard
image: kubernetesui/dashboard:v2.6.1
image: kubernetesui/dashboard:v2.7.0
imagePullPolicy: Always
ports:
- containerPort: 8443
Expand Down
2 changes: 1 addition & 1 deletion aio/scripts/conf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ HEAPSTER_PORT=8082
KIND_VERSION="v0.14.0"
K8S_VERSION="v1.24.3"
KIND_BIN=${CACHE_DIR}/kind-${KIND_VERSION}
CODEGEN_VERSION="v0.24.1"
CODEGEN_VERSION="v0.25.0"
CODEGEN_BIN=${GOPATH}/pkg/mod/k8s.io/code-generator@${CODEGEN_VERSION}/generate-groups.sh

# Setup logger.
Expand Down
6 changes: 3 additions & 3 deletions docs/user/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ kubectl create secret generic kubernetes-dashboard-certs --from-file=$HOME/certs
For Dashboard to pickup the certificates, you must pass arguments `--tls-cert-file=/tls.crt` and `--tls-key-file=/tls.key` to the container. You can edit YAML definition and deploy Dashboard in one go:

```shell
kubectl create --edit -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.6.1/aio/deploy/recommended.yaml
kubectl create --edit -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.7.0/aio/deploy/recommended.yaml
```

Under Deployment section, add arguments to pod definition, it should look as follows:
Expand All @@ -38,7 +38,7 @@ This setup is not fully secure. Certificates are not used and Dashboard is expos
To deploy Dashboard execute following command:

```shell
kubectl create -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.6.1/aio/deploy/alternative.yaml
kubectl create -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.7.0/aio/deploy/alternative.yaml
```


Expand All @@ -51,7 +51,7 @@ Besides official releases, there are also development releases, that are pushed
In most of the use cases you need to execute the following command to deploy latest development release:

```shell
kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.6.1/aio/deploy/head.yaml
kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.7.0/aio/deploy/head.yaml
```

### Update
Expand Down
27 changes: 13 additions & 14 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,26 @@ go 1.19

require (
github.com/docker/distribution v2.8.1+incompatible
github.com/emicklei/go-restful/v3 v3.7.4
github.com/emicklei/go-restful/v3 v3.8.0
github.com/golang/glog v1.0.0
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/prometheus/client_golang v1.12.2
github.com/spf13/pflag v1.0.5
golang.org/x/net v0.0.0-20220526153639-5463443f8c37
golang.org/x/net v0.0.0-20220722155237-a158d28d115b
golang.org/x/text v0.3.7
gopkg.in/igm/sockjs-go.v2 v2.1.0
gopkg.in/square/go-jose.v2 v2.6.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.24.1
k8s.io/apiextensions-apiserver v0.24.1
k8s.io/apimachinery v0.24.1
k8s.io/client-go v0.24.1
k8s.io/api v0.25.0
k8s.io/apiextensions-apiserver v0.25.0
k8s.io/apimachinery v0.25.0
k8s.io/client-go v0.25.0
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful v2.15.0+incompatible // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
Expand All @@ -33,7 +32,7 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/go-cmp v0.5.5 // indirect
github.com/google/go-cmp v0.5.6 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/imdario/mergo v0.3.13 // indirect
Expand All @@ -51,17 +50,17 @@ require (
github.com/prometheus/procfs v0.7.3 // indirect
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
golang.org/x/oauth2 v0.0.0-20220524215830-622c5d57e401 // indirect
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect
golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.60.1 // indirect
k8s.io/kube-openapi v0.0.0-20220413171646-5e7f5fdc6da6 // indirect
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
sigs.k8s.io/json v0.0.0-20220525155127-227cbc7cc124 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
k8s.io/klog/v2 v2.70.1 // indirect
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)
Loading

0 comments on commit 42deb6b

Please sign in to comment.