Skip to content

Commit 18eec8b

Browse files
ccremerccremer
authored
Merge pull request #38 from projectsyn/webhooks
Enable webhooks by default
2 parents 4efa1ec + c698fd9 commit 18eec8b

File tree

14 files changed

+195
-1
lines changed

14 files changed

+195
-1
lines changed

‎class/defaults.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,5 @@ parameters:
4343
cpu: 500m
4444
metrics:
4545
enabled: ${crossplane:monitoring:enabled}
46+
webhooks:
47+
enabled: true

‎docs/modules/ROOT/pages/references/parameters.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ parameters:
169169
crossplane:
170170
images:
171171
crossplane:
172-
image: mymirror.io/crossplane/crossplane
172+
registry: mymirror.io
173173
providers:
174174
helm:
175175
package: crossplane/provider-helm:v0.3.5

‎tests/golden/defaults-with-provider/crossplane/crossplane/01_helmchart/crossplane/templates/deployment.yaml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,18 @@ spec:
4848
fieldPath: metadata.namespace
4949
- name: LEADER_ELECTION
5050
value: 'true'
51+
- name: WEBHOOK_TLS_SECRET_NAME
52+
value: webhook-tls-secret
53+
- name: WEBHOOK_TLS_CERT_DIR
54+
value: /webhook/tls
5155
image: docker.io/crossplane/crossplane:v1.9.0
5256
imagePullPolicy: IfNotPresent
5357
name: crossplane
5458
ports:
5559
- containerPort: 8080
5660
name: metrics
61+
- containerPort: 9443
62+
name: webhooks
5763
resources:
5864
limits:
5965
cpu: 1000m
@@ -69,6 +75,8 @@ spec:
6975
volumeMounts:
7076
- mountPath: /cache
7177
name: package-cache
78+
- mountPath: /webhook/tls
79+
name: webhook-tls-secret
7280
initContainers:
7381
- args:
7482
- core
@@ -78,6 +86,16 @@ spec:
7886
valueFrom:
7987
fieldRef:
8088
fieldPath: metadata.namespace
89+
- name: WEBHOOK_TLS_SECRET_NAME
90+
value: webhook-tls-secret
91+
- name: WEBHOOK_SERVICE_NAME
92+
value: crossplane-webhooks
93+
- name: WEBHOOK_SERVICE_NAMESPACE
94+
valueFrom:
95+
fieldRef:
96+
fieldPath: metadata.namespace
97+
- name: WEBHOOK_SERVICE_PORT
98+
value: '9443'
8199
image: docker.io/crossplane/crossplane:v1.9.0
82100
imagePullPolicy: IfNotPresent
83101
name: crossplane-init
@@ -100,3 +118,6 @@ spec:
100118
medium: null
101119
sizeLimit: 5Mi
102120
name: package-cache
121+
- name: webhook-tls-secret
122+
secret:
123+
secretName: webhook-tls-secret

‎tests/golden/defaults-with-provider/crossplane/crossplane/01_helmchart/crossplane/templates/secret.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
apiVersion: v1
2+
kind: Secret
3+
metadata:
4+
name: webhook-tls-secret
5+
type: Opaque

‎tests/golden/defaults-with-provider/crossplane/crossplane/01_helmchart/crossplane/templates/service.yaml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
labels:
5+
app: crossplane
6+
app.kubernetes.io/component: cloud-infrastructure-controller
7+
app.kubernetes.io/instance: crossplane
8+
app.kubernetes.io/managed-by: Helm
9+
app.kubernetes.io/name: crossplane
10+
app.kubernetes.io/part-of: crossplane
11+
app.kubernetes.io/version: 1.9.0
12+
helm.sh/chart: crossplane-1.9.0
13+
release: crossplane
14+
name: crossplane-webhooks
15+
spec:
16+
ports:
17+
- port: 9443
18+
protocol: TCP
19+
targetPort: 9443
20+
selector:
21+
app: crossplane
22+
release: crossplane

‎tests/golden/defaults/crossplane/crossplane/01_helmchart/crossplane/templates/deployment.yaml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,18 @@ spec:
4848
fieldPath: metadata.namespace
4949
- name: LEADER_ELECTION
5050
value: 'true'
51+
- name: WEBHOOK_TLS_SECRET_NAME
52+
value: webhook-tls-secret
53+
- name: WEBHOOK_TLS_CERT_DIR
54+
value: /webhook/tls
5155
image: docker.io/crossplane/crossplane:v1.9.0
5256
imagePullPolicy: IfNotPresent
5357
name: crossplane
5458
ports:
5559
- containerPort: 8080
5660
name: metrics
61+
- containerPort: 9443
62+
name: webhooks
5763
resources:
5864
limits:
5965
cpu: 1000m
@@ -69,6 +75,8 @@ spec:
6975
volumeMounts:
7076
- mountPath: /cache
7177
name: package-cache
78+
- mountPath: /webhook/tls
79+
name: webhook-tls-secret
7280
initContainers:
7381
- args:
7482
- core
@@ -78,6 +86,16 @@ spec:
7886
valueFrom:
7987
fieldRef:
8088
fieldPath: metadata.namespace
89+
- name: WEBHOOK_TLS_SECRET_NAME
90+
value: webhook-tls-secret
91+
- name: WEBHOOK_SERVICE_NAME
92+
value: crossplane-webhooks
93+
- name: WEBHOOK_SERVICE_NAMESPACE
94+
valueFrom:
95+
fieldRef:
96+
fieldPath: metadata.namespace
97+
- name: WEBHOOK_SERVICE_PORT
98+
value: '9443'
8199
image: docker.io/crossplane/crossplane:v1.9.0
82100
imagePullPolicy: IfNotPresent
83101
name: crossplane-init
@@ -100,3 +118,6 @@ spec:
100118
medium: null
101119
sizeLimit: 5Mi
102120
name: package-cache
121+
- name: webhook-tls-secret
122+
secret:
123+
secretName: webhook-tls-secret

‎tests/golden/defaults/crossplane/crossplane/01_helmchart/crossplane/templates/secret.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
apiVersion: v1
2+
kind: Secret
3+
metadata:
4+
name: webhook-tls-secret
5+
type: Opaque

‎tests/golden/defaults/crossplane/crossplane/01_helmchart/crossplane/templates/service.yaml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
labels:
5+
app: crossplane
6+
app.kubernetes.io/component: cloud-infrastructure-controller
7+
app.kubernetes.io/instance: crossplane
8+
app.kubernetes.io/managed-by: Helm
9+
app.kubernetes.io/name: crossplane
10+
app.kubernetes.io/part-of: crossplane
11+
app.kubernetes.io/version: 1.9.0
12+
helm.sh/chart: crossplane-1.9.0
13+
release: crossplane
14+
name: crossplane-webhooks
15+
spec:
16+
ports:
17+
- port: 9443
18+
protocol: TCP
19+
targetPort: 9443
20+
selector:
21+
app: crossplane
22+
release: crossplane

‎tests/golden/openshift4-with-provider/crossplane/crossplane/01_helmchart/crossplane/templates/deployment.yaml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,18 @@ spec:
4848
fieldPath: metadata.namespace
4949
- name: LEADER_ELECTION
5050
value: 'true'
51+
- name: WEBHOOK_TLS_SECRET_NAME
52+
value: webhook-tls-secret
53+
- name: WEBHOOK_TLS_CERT_DIR
54+
value: /webhook/tls
5155
image: docker.io/crossplane/crossplane:v1.9.0
5256
imagePullPolicy: IfNotPresent
5357
name: crossplane
5458
ports:
5559
- containerPort: 8080
5660
name: metrics
61+
- containerPort: 9443
62+
name: webhooks
5763
resources:
5864
limits:
5965
cpu: 1000m
@@ -69,6 +75,8 @@ spec:
6975
volumeMounts:
7076
- mountPath: /cache
7177
name: package-cache
78+
- mountPath: /webhook/tls
79+
name: webhook-tls-secret
7280
initContainers:
7381
- args:
7482
- core
@@ -78,6 +86,16 @@ spec:
7886
valueFrom:
7987
fieldRef:
8088
fieldPath: metadata.namespace
89+
- name: WEBHOOK_TLS_SECRET_NAME
90+
value: webhook-tls-secret
91+
- name: WEBHOOK_SERVICE_NAME
92+
value: crossplane-webhooks
93+
- name: WEBHOOK_SERVICE_NAMESPACE
94+
valueFrom:
95+
fieldRef:
96+
fieldPath: metadata.namespace
97+
- name: WEBHOOK_SERVICE_PORT
98+
value: '9443'
8199
image: docker.io/crossplane/crossplane:v1.9.0
82100
imagePullPolicy: IfNotPresent
83101
name: crossplane-init
@@ -100,3 +118,6 @@ spec:
100118
medium: null
101119
sizeLimit: 5Mi
102120
name: package-cache
121+
- name: webhook-tls-secret
122+
secret:
123+
secretName: webhook-tls-secret

‎tests/golden/openshift4-with-provider/crossplane/crossplane/01_helmchart/crossplane/templates/secret.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
apiVersion: v1
2+
kind: Secret
3+
metadata:
4+
name: webhook-tls-secret
5+
type: Opaque

0 commit comments

Comments
 (0)