Skip to content

Commit

Permalink
Bump up the k8s version to v1.25.10 to fix the existing Kubelet bug (#…
Browse files Browse the repository at this point in the history
…1448)

What do these changes do?
-------------------------

* Bump up the k8s version to v1.25.10.
* Delete the update permission of outside scheduler webhook.

---------

Signed-off-by: Ye Cao <[email protected]>
Signed-off-by: Tao He <[email protected]>
Co-authored-by: Tao He <[email protected]>
  • Loading branch information
dashanji and sighingnow authored Jul 4, 2023
1 parent 0a98a14 commit 6d3c35f
Show file tree
Hide file tree
Showing 16 changed files with 217 additions and 108 deletions.
51 changes: 51 additions & 0 deletions .github/free-disk-space.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
#!/usr/bin/env bash
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You 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
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.


#
# The Azure provided machines typically have the following disk allocation:
# Total space: 85GB
# Allocated: 67 GB
# Free: 17 GB
# This script frees up 28 GB of disk space by deleting unneeded packages and
# large directories.
# The Flink end to end tests download and generate more than 17 GB of files,
# causing unpredictable behavior and build failures.
#
echo "=============================================================================="
echo "Freeing up disk space on CI system"
echo "=============================================================================="

echo "Listing 100 largest packages"
dpkg-query -Wf '${Installed-Size}\t${Package}\n' | sort -n | tail -n 100
df -h
echo "Removing large packages"
sudo apt-get remove -y '^ghc-8.*'
sudo apt-get remove -y '^dotnet-.*'
sudo apt-get remove -y '^llvm-.*'
sudo apt-get remove -y 'php.*'
sudo apt-get remove -y azure-cli google-cloud-sdk hhvm google-chrome-stable firefox powershell mono-devel
sudo apt-get autoremove -y
sudo apt-get clean
df -h
echo "Removing large directories"
# deleting 15GB
rm -rf /usr/share/dotnet/
sudo rm -rf /usr/share/dotnet
sudo rm -rf /usr/local/lib/android
sudo rm -rf /opt/ghc
sudo rm -rf /opt/hostedtoolcache/CodeQL
df -h
6 changes: 5 additions & 1 deletion .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ jobs:
with:
submodules: true

- name: Free disk space
run: |
bash .github/free-disk-space.sh
- uses: dorny/paths-filter@v2
id: changes
with:
Expand Down Expand Up @@ -301,7 +305,7 @@ jobs:
rm -rf build/lib* build/bdist.*
python3 setup.py bdist_wheel
for pkg in airflow bdist dask io ml; do
for pkg in airflow bdist dask io kedro ml; do
rm -rf build/lib* build/bdist.*
python3 setup_${pkg}.py bdist_wheel
done
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/vineyard-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ jobs:
with:
submodules: true

- name: Free disk space
run: |
bash .github/free-disk-space.sh
- uses: actions/setup-go@v3
with:
go-version: 1.19
Expand Down
10 changes: 9 additions & 1 deletion charts/vineyard-operator/templates/backup-crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ spec:
uid:
type: string
type: object
x-kubernetes-map-type: atomic
x-kubernetes-map-type: granular
csi:
properties:
controllerExpandSecretRef:
Expand All @@ -275,6 +275,14 @@ spec:
type: string
fsType:
type: string
nodeExpandSecretRef:
properties:
name:
type: string
namespace:
type: string
type: object
x-kubernetes-map-type: atomic
nodePublishSecretRef:
properties:
name:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ webhooks:
- v1
operations:
- CREATE
- UPDATE
resources:
- pods
sideEffects: None
Expand Down
10 changes: 9 additions & 1 deletion charts/vineyard-operator/templates/sidecar-crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ spec:
uid:
type: string
type: object
x-kubernetes-map-type: atomic
x-kubernetes-map-type: granular
csi:
properties:
controllerExpandSecretRef:
Expand All @@ -409,6 +409,14 @@ spec:
type: string
fsType:
type: string
nodeExpandSecretRef:
properties:
name:
type: string
namespace:
type: string
type: object
x-kubernetes-map-type: atomic
nodePublishSecretRef:
properties:
name:
Expand Down
10 changes: 9 additions & 1 deletion charts/vineyard-operator/templates/vineyardd-crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ spec:
uid:
type: string
type: object
x-kubernetes-map-type: atomic
x-kubernetes-map-type: granular
csi:
properties:
controllerExpandSecretRef:
Expand All @@ -430,6 +430,14 @@ spec:
type: string
fsType:
type: string
nodeExpandSecretRef:
properties:
name:
type: string
namespace:
type: string
type: object
x-kubernetes-map-type: atomic
nodePublishSecretRef:
properties:
name:
Expand Down
10 changes: 9 additions & 1 deletion k8s/config/crd/bases/k8s.v6d.io_backups.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ spec:
uid:
type: string
type: object
x-kubernetes-map-type: atomic
x-kubernetes-map-type: granular
csi:
properties:
controllerExpandSecretRef:
Expand All @@ -263,6 +263,14 @@ spec:
type: string
fsType:
type: string
nodeExpandSecretRef:
properties:
name:
type: string
namespace:
type: string
type: object
x-kubernetes-map-type: atomic
nodePublishSecretRef:
properties:
name:
Expand Down
10 changes: 9 additions & 1 deletion k8s/config/crd/bases/k8s.v6d.io_sidecars.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ spec:
uid:
type: string
type: object
x-kubernetes-map-type: atomic
x-kubernetes-map-type: granular
csi:
properties:
controllerExpandSecretRef:
Expand All @@ -397,6 +397,14 @@ spec:
type: string
fsType:
type: string
nodeExpandSecretRef:
properties:
name:
type: string
namespace:
type: string
type: object
x-kubernetes-map-type: atomic
nodePublishSecretRef:
properties:
name:
Expand Down
10 changes: 9 additions & 1 deletion k8s/config/crd/bases/k8s.v6d.io_vineyardds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ spec:
uid:
type: string
type: object
x-kubernetes-map-type: atomic
x-kubernetes-map-type: granular
csi:
properties:
controllerExpandSecretRef:
Expand All @@ -418,6 +418,14 @@ spec:
type: string
fsType:
type: string
nodeExpandSecretRef:
properties:
name:
type: string
namespace:
type: string
type: object
x-kubernetes-map-type: atomic
nodePublishSecretRef:
properties:
name:
Expand Down
1 change: 0 additions & 1 deletion k8s/config/webhook/manifests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@ webhooks:
- v1
operations:
- CREATE
- UPDATE
resources:
- pods
sideEffects: None
Expand Down
91 changes: 45 additions & 46 deletions k8s/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ require (
github.com/ghodss/yaml v1.0.0
github.com/go-logr/logr v1.2.3
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.19.0
github.com/onsi/gomega v1.20.1
github.com/pkg/errors v0.9.1
github.com/spf13/cobra v1.4.0
github.com/spf13/pflag v1.0.5
go.uber.org/multierr v1.6.0
go.uber.org/zap v1.21.0
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
k8s.io/component-base v0.25.0
k8s.io/component-helpers v0.25.0
k8s.io/kubernetes v1.25.0
k8s.io/api v0.25.10
k8s.io/apiextensions-apiserver v0.25.10
k8s.io/apimachinery v0.25.10
k8s.io/client-go v0.25.10
k8s.io/component-base v0.25.10
k8s.io/component-helpers v0.25.10
k8s.io/kubernetes v1.25.10
sigs.k8s.io/controller-runtime v0.13.0
sigs.k8s.io/kustomize/kustomize/v4 v4.5.7
sigs.k8s.io/kustomize/kyaml v0.13.9
Expand Down Expand Up @@ -88,7 +88,6 @@ require (
github.com/shopspring/decimal v1.2.0 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/stretchr/testify v1.7.1 // indirect
github.com/xlab/treeprint v1.1.0 // indirect
go.etcd.io/etcd/api/v3 v3.5.4 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect
Expand All @@ -107,12 +106,12 @@ require (
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
go.uber.org/atomic v1.7.0 // indirect
golang.org/x/crypto v0.6.0 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/term v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.6.0 // indirect
golang.org/x/term v0.6.0 // indirect
golang.org/x/text v0.8.0 // indirect
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
Expand All @@ -124,15 +123,15 @@ require (
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.25.0 // indirect
k8s.io/cloud-provider v0.25.0 // indirect
k8s.io/csi-translation-lib v0.25.0 // indirect
k8s.io/apiserver v0.25.10 // indirect
k8s.io/cloud-provider v0.25.10 // indirect
k8s.io/csi-translation-lib v0.25.10 // indirect
k8s.io/klog/v2 v2.70.1 // indirect
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
k8s.io/kube-scheduler v0.25.0 // indirect
k8s.io/mount-utils v0.25.0 // indirect
k8s.io/kube-scheduler v0.25.10 // indirect
k8s.io/mount-utils v0.25.10 // indirect
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.32 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37 // indirect
sigs.k8s.io/gateway-api v0.4.1 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/kustomize/api v0.12.1 // indirect
Expand All @@ -146,30 +145,30 @@ replace (
//github.com/emicklei/go-restful/v3 => github.com/emicklei/go-restful v2.9.5+incompatible
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.2
// these are needed since k8s.io/kubernetes cites v0.0.0 for these in its go.mod
k8s.io/api => k8s.io/api v0.25.0
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.0
k8s.io/apimachinery => k8s.io/apimachinery v0.25.0
k8s.io/apiserver => k8s.io/apiserver v0.25.0
k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.0
k8s.io/client-go => k8s.io/client-go v0.25.0
k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.0
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.0
k8s.io/code-generator => k8s.io/code-generator v0.25.0
k8s.io/component-base => k8s.io/component-base v0.25.0
k8s.io/component-helpers => k8s.io/component-helpers v0.25.0
k8s.io/controller-manager => k8s.io/controller-manager v0.25.0
k8s.io/cri-api => k8s.io/cri-api v0.25.0
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.0
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.0
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.0
k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.0
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.0
k8s.io/kubectl => k8s.io/kubectl v0.25.0
k8s.io/kubelet => k8s.io/kubelet v0.25.0
k8s.io/kubernetes => k8s.io/kubernetes v1.25.0
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.0
k8s.io/metrics => k8s.io/metrics v0.25.0
k8s.io/mount-utils => k8s.io/mount-utils v0.25.0
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.0
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.0
k8s.io/api => k8s.io/api v0.25.10
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.10
k8s.io/apimachinery => k8s.io/apimachinery v0.25.10
k8s.io/apiserver => k8s.io/apiserver v0.25.10
k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.10
k8s.io/client-go => k8s.io/client-go v0.25.10
k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.10
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.10
k8s.io/code-generator => k8s.io/code-generator v0.25.10
k8s.io/component-base => k8s.io/component-base v0.25.10
k8s.io/component-helpers => k8s.io/component-helpers v0.25.10
k8s.io/controller-manager => k8s.io/controller-manager v0.25.10
k8s.io/cri-api => k8s.io/cri-api v0.25.10
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.10
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.10
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.10
k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.10
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.10
k8s.io/kubectl => k8s.io/kubectl v0.25.10
k8s.io/kubelet => k8s.io/kubelet v0.25.10
k8s.io/kubernetes => k8s.io/kubernetes v1.25.10
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.10
k8s.io/metrics => k8s.io/metrics v0.25.10
k8s.io/mount-utils => k8s.io/mount-utils v0.25.10
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.10
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.10
)
Loading

0 comments on commit 6d3c35f

Please sign in to comment.