Skip to content

Commit 61547af

Browse files
authored
Merge pull request openshift#64 from awgreene/targetPort
Update CSV WebhookDescription struct
2 parents 329d62c + f83191c commit 61547af

File tree

4 files changed

+22
-8
lines changed

4 files changed

+22
-8
lines changed

crds/operators.coreos.com_clusterserviceversions.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8824,6 +8824,11 @@ spec:
88248824
type: string
88258825
sideEffects:
88268826
type: string
8827+
targetPort:
8828+
anyOf:
8829+
- type: integer
8830+
- type: string
8831+
x-kubernetes-int-or-string: true
88278832
timeoutSeconds:
88288833
type: integer
88298834
format: int32
@@ -8834,6 +8839,7 @@ spec:
88348839
enum:
88358840
- ValidatingAdmissionWebhook
88368841
- MutatingAdmissionWebhook
8842+
- ConversionWebhook
88378843
webhookPath:
88388844
type: string
88398845
status:

crds/zz_defs.go

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

pkg/operators/v1alpha1/clusterserviceversion_types.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
rbac "k8s.io/api/rbac/v1"
1313
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1414
"k8s.io/apimachinery/pkg/labels"
15+
"k8s.io/apimachinery/pkg/util/intstr"
1516

1617
"github.com/operator-framework/api/pkg/lib/version"
1718
)
@@ -167,10 +168,11 @@ const (
167168
// +k8s:openapi-gen=true
168169
type WebhookDescription struct {
169170
GenerateName string `json:"generateName"`
170-
// +kubebuilder:validation:Enum=ValidatingAdmissionWebhook;MutatingAdmissionWebhook
171+
// +kubebuilder:validation:Enum=ValidatingAdmissionWebhook;MutatingAdmissionWebhook;ConversionWebhook
171172
Type WebhookAdmissionType `json:"type"`
172173
DeploymentName string `json:"deploymentName,omitempty"`
173174
ContainerPort int32 `json:"containerPort,omitempty"`
175+
TargetPort *intstr.IntOrString `json:"targetPort,omitempty"`
174176
Rules []admissionregistrationv1.RuleWithOperations `json:"rules,omitempty"`
175177
FailurePolicy *admissionregistrationv1.FailurePolicyType `json:"failurePolicy,omitempty"`
176178
MatchPolicy *admissionregistrationv1.MatchPolicyType `json:"matchPolicy,omitempty"`

pkg/operators/v1alpha1/zz_generated.deepcopy.go

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

0 commit comments

Comments
 (0)