Skip to content

Commit 026adc1

Browse files
committed
:bugfix: manager pod to not mount cert assets by default
cert assets should be enabled through a manager patch when webhooks are enabled.
1 parent b0a1f7b commit 026adc1

File tree

3 files changed

+22
-22
lines changed

3 files changed

+22
-22
lines changed

generated_golden.sh

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,22 @@ build_kb() {
3030
scaffold_test_project() {
3131
project=$1
3232
version=$2
33-
testdata_dir=$(pwd)/testdata
33+
testdata_dir=$(pwd)/testdata
3434
mkdir -p ./testdata/$project
3535
rm -rf ./testdata/$project/*
3636
pushd .
3737
cd testdata/$project
3838

3939
kb=$testdata_dir/../bin/kubebuilder
4040

41-
oldgopath=$GOPATH
41+
oldgopath=$GOPATH
4242
if [ $version == "1" ]; then
43-
export GO111MODULE=auto
44-
export GOPATH=$(pwd)/../.. # go ignores vendor under testdata, so fake out a gopath
45-
# untar Gopkg.lock and vendor directory for appropriate project version
46-
tar -zxf $testdata_dir/vendor.v$version.tgz
43+
export GO111MODULE=auto
44+
export GOPATH=$(pwd)/../.. # go ignores vendor under testdata, so fake out a gopath
45+
# untar Gopkg.lock and vendor directory for appropriate project version
46+
tar -zxf $testdata_dir/vendor.v$version.tgz
4747

48-
$kb init --project-version $version --domain testproject.org --license apache2 --owner "The Kubernetes authors" --dep=false
48+
$kb init --project-version $version --domain testproject.org --license apache2 --owner "The Kubernetes authors" --dep=false
4949
$kb create api --group crew --version v1 --kind FirstMate --controller=true --resource=true --make=false
5050
$kb alpha webhook --group crew --version v1 --kind FirstMate --type=mutating --operations=create,update --make=false
5151
$kb alpha webhook --group crew --version v1 --kind FirstMate --type=mutating --operations=delete --make=false
@@ -57,11 +57,11 @@ scaffold_test_project() {
5757
$kb alpha webhook --group core --version v1 --kind Namespace --type=mutating --operations=update --make=false
5858
$kb create api --group policy --version v1beta1 --kind HealthCheckPolicy --example=false --controller=true --resource=true --namespaced=false --make=false
5959
elif [ $version == "2" ]; then
60-
export GO111MODULE=on
61-
export PATH=$PATH:$(go env GOPATH)/bin
62-
go mod init sigs.k8s.io/kubebuilder/testdata/project_v2 # our repo autodetection will traverse up to the kb module if we don't do this
60+
export GO111MODULE=on
61+
export PATH=$PATH:$(go env GOPATH)/bin
62+
go mod init sigs.k8s.io/kubebuilder/testdata/project-v2 # our repo autodetection will traverse up to the kb module if we don't do this
6363

64-
$kb init --project-version $version --domain testproject.org --license apache2 --owner "The Kubernetes authors"
64+
$kb init --project-version $version --domain testproject.org --license apache2 --owner "The Kubernetes authors"
6565
$kb create api --group crew --version v1 --kind Captain --controller=true --resource=true --make=false
6666
$kb create api --group crew --version v1 --kind FirstMate --controller=true --resource=true --make=false
6767
$kb alpha webhook --group crew --version v1 --kind FirstMate --type=mutating --operations=create,update --make=false
@@ -77,11 +77,11 @@ scaffold_test_project() {
7777
rm -f Gopkg.lock
7878
rm -rf ./vendor
7979
rm -rf ./bin
80-
export GOPATH=$oldgopath
80+
export GOPATH=$oldgopath
8181
popd
8282
}
8383

8484
set -e
8585
build_kb
8686
scaffold_test_project gopath/src/project 1
87-
scaffold_test_project project_v2 2
87+
scaffold_test_project project-v2 2

pkg/scaffold/v2/manager/config.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,5 @@ spec:
102102
- containerPort: 9876
103103
name: webhook-server
104104
protocol: TCP
105-
volumeMounts:
106-
- mountPath: /tmp/cert
107-
name: cert
108-
readOnly: true
109105
terminationGracePeriodSeconds: 10
110-
volumes:
111-
- name: cert
112-
secret:
113-
defaultMode: 420
114-
secretName: webhook-server-secret
115106
`

pkg/scaffold/v2/webhook_manager_patch.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,15 @@ spec:
4949
- containerPort: 443
5050
name: webhook-server
5151
protocol: TCP
52+
volumeMounts:
53+
- mountPath: /tmp/cert
54+
name: cert
55+
readOnly: true
56+
volumes:
57+
- name: cert
58+
secret:
59+
defaultMode: 420
60+
secretName: webhook-server-secret
5261
---
5362
apiVersion: v1
5463
kind: Service

0 commit comments

Comments
 (0)