Merge pull request #64 from awgreene/targetPort

Update CSV WebhookDescription struct
operator-framework · Sep 17, 2020 · 61547af · 61547af
2 parents 329d62c + f83191c
commit 61547af
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/crds/operators.coreos.com_clusterserviceversions.yaml b/crds/operators.coreos.com_clusterserviceversions.yaml
@@ -8824,6 +8824,11 @@ spec:
                             type: string
                     sideEffects:
                       type: string
+                    targetPort:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      x-kubernetes-int-or-string: true
                     timeoutSeconds:
                       type: integer
                       format: int32
@@ -8834,6 +8839,7 @@ spec:
                       enum:
                       - ValidatingAdmissionWebhook
                       - MutatingAdmissionWebhook
+                      - ConversionWebhook
                     webhookPath:
                       type: string
           status:

diff --git a/crds/zz_defs.go b/crds/zz_defs.go
diff --git a/pkg/operators/v1alpha1/clusterserviceversion_types.go b/pkg/operators/v1alpha1/clusterserviceversion_types.go
@@ -12,6 +12,7 @@ import (
 	rbac "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/util/intstr"
 
 	"github.com/operator-framework/api/pkg/lib/version"
 )
@@ -167,10 +168,11 @@ const (
 // +k8s:openapi-gen=true
 type WebhookDescription struct {
 	GenerateName string `json:"generateName"`
-	// +kubebuilder:validation:Enum=ValidatingAdmissionWebhook;MutatingAdmissionWebhook
+	// +kubebuilder:validation:Enum=ValidatingAdmissionWebhook;MutatingAdmissionWebhook;ConversionWebhook
 	Type                    WebhookAdmissionType                            `json:"type"`
 	DeploymentName          string                                          `json:"deploymentName,omitempty"`
 	ContainerPort           int32                                           `json:"containerPort,omitempty"`
+	TargetPort              *intstr.IntOrString                             `json:"targetPort,omitempty"`
 	Rules                   []admissionregistrationv1.RuleWithOperations    `json:"rules,omitempty"`
 	FailurePolicy           *admissionregistrationv1.FailurePolicyType      `json:"failurePolicy,omitempty"`
 	MatchPolicy             *admissionregistrationv1.MatchPolicyType        `json:"matchPolicy,omitempty"`

diff --git a/pkg/operators/v1alpha1/zz_generated.deepcopy.go b/pkg/operators/v1alpha1/zz_generated.deepcopy.go