Skip to content
This repository was archived by the owner on May 6, 2022. It is now read-only.

Commit 2c22fc1

Browse files
nileboxMHBauer
authored andcommitted
Kubernetes 1.10.0 (#1876)
* Kubernetes 1.10.0 * Update vendor with kubernetes-1.10.0 * Update master k8s.io dependencies * Update vendor * autogenerated files * Fix server config for k8s 1.10 * Fix enabled admission plugin list * Generated files * Fix loopback client config * Fix admission controller initialization (adapt code from AdmissionOptions.ApplyTo method invoked by RecommendedOptions) Fix RBAC for admission webhooks * Switch to Kubernetes 1.9 for Jenkins build
1 parent df34489 commit 2c22fc1

File tree

1,013 files changed

+35387
-10576
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,013 files changed

+35387
-10576
lines changed

Gopkg.lock

Lines changed: 45 additions & 44 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,23 +51,23 @@ required = [
5151

5252
[[constraint]]
5353
name = "k8s.io/api"
54-
version = "kubernetes-1.9.1"
54+
version = "kubernetes-1.10.0"
5555

5656
[[constraint]]
5757
name = "k8s.io/apimachinery"
58-
version = "kubernetes-1.9.1"
58+
version = "kubernetes-1.10.0"
5959

6060
[[constraint]]
6161
name = "k8s.io/apiserver"
62-
version = "kubernetes-1.9.1"
62+
version = "kubernetes-1.10.0"
6363

6464
[[constraint]]
6565
name = "k8s.io/client-go"
66-
version = "kubernetes-1.9.1"
66+
version = "kubernetes-1.10.0"
6767

6868
[[constraint]]
6969
name = "k8s.io/code-generator"
70-
version = "kubernetes-1.9.1"
70+
version = "kubernetes-1.10.0"
7171

7272
[[constraint]]
7373
name = "github.com/pmorie/go-open-service-broker-client"

Jenkinsfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ node {
138138
}
139139
} catch (Exception e) {
140140
echo 'Run failed.'
141+
print e
141142
currentBuild.result = 'FAILURE'
142143
} finally {
143144
archiveArtifacts artifacts: 'walkthrough*.txt', fingerprint: true

charts/catalog/templates/apiserver-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ spec:
3939
- --audit-log-path
4040
- {{ .Values.apiserver.audit.logPath }}
4141
{{- end}}
42-
- --admission-control
42+
- --enable-admission-plugins
4343
- "KubernetesNamespaceLifecycle,DefaultServicePlan,ServiceBindingsLifecycle,ServicePlanChangeValidator,BrokerAuthSarCheck"
4444
- --secure-port
4545
- "8443"

charts/catalog/templates/rbac.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@ items:
1717
- apiGroups: [""]
1818
resources: ["namespaces"]
1919
verbs: ["get", "list", "watch"]
20+
- apiGroups: ["admissionregistration.k8s.io"]
21+
resources: ["validatingwebhookconfigurations"]
22+
verbs: ["get", "list", "watch"]
23+
- apiGroups: ["admissionregistration.k8s.io"]
24+
resources: ["mutatingwebhookconfigurations"]
25+
verbs: ["get", "list", "watch"]
2026
# API-server service-account gets its own role
2127
- apiVersion: {{template "rbacApiVersion" . }}
2228
kind: ClusterRoleBinding

cmd/apiserver/app/server/options.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ type ServiceCatalogServerOptions struct {
4444
// the admission options
4545
AdmissionOptions *genericserveroptions.AdmissionOptions
4646
// the https configuration. certs, etc
47-
SecureServingOptions *genericserveroptions.SecureServingOptions
47+
SecureServingOptions *genericserveroptions.SecureServingOptionsWithLoopback
4848
// authn for the API
4949
AuthenticationOptions *genericserveroptions.DelegatingAuthenticationOptions
5050
// authz for the API
@@ -67,7 +67,7 @@ func NewServiceCatalogServerOptions() *ServiceCatalogServerOptions {
6767
opts := &ServiceCatalogServerOptions{
6868
GenericServerRunOptions: genericserveroptions.NewServerRunOptions(),
6969
AdmissionOptions: genericserveroptions.NewAdmissionOptions(),
70-
SecureServingOptions: genericserveroptions.NewSecureServingOptions(),
70+
SecureServingOptions: genericserveroptions.WithLoopback(genericserveroptions.NewSecureServingOptions()),
7171
AuthenticationOptions: genericserveroptions.NewDelegatingAuthenticationOptions(),
7272
AuthorizationOptions: genericserveroptions.NewDelegatingAuthorizationOptions(),
7373
AuditOptions: genericserveroptions.NewAuditOptions(),

0 commit comments

Comments
 (0)