Skip to content

Update webhook description #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 6, 2020
Merged

Update webhook description #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e1a817
Update WebhookDescription struct
awgreene May 6, 2020
2770864
Update Webhook Installation Failure to be generic
awgreene May 5, 2020
19a9724
Update CSV Validation
awgreene May 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions crds/operators.coreos.com_clusterserviceversions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8687,7 +8687,7 @@ spec:
type: object
required:
- admissionReviewVersions
- name
- generateName
- sideEffects
- type
properties:
Expand All @@ -8702,11 +8702,11 @@ spec:
type: string
failurePolicy:
type: string
generateName:
type: string
matchPolicy:
description: MatchPolicyType specifies the type of match policy
type: string
name:
type: string
objectSelector:
description: A label selector is a label query over a set of
resources. The result of matchLabels and matchExpressions
Expand Down Expand Up @@ -8821,6 +8821,9 @@ spec:
description: WebhookAdmissionType is the type of admission webhooks
supported by OLM
type: string
enum:
- ValidatingAdmissionWebhook
- MutatingAdmissionWebhook
webhookPath:
type: string
status:
Expand Down
14 changes: 7 additions & 7 deletions crds/zz_defs.go
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions pkg/operators/v1alpha1/clusterserviceversion_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,8 @@ const (
// WebhookDescription provides details to OLM about required webhooks
// +k8s:openapi-gen=true
type WebhookDescription struct {
Name string `json:"name"`
GenerateName string `json:"generateName"`
// +kubebuilder:validation:Enum=ValidatingAdmissionWebhook;MutatingAdmissionWebhook
Type WebhookAdmissionType `json:"type"`
DeploymentName string `json:"deploymentName,omitempty"`
ContainerPort int32 `json:"containerPort,omitempty"`
Expand All @@ -182,7 +183,7 @@ type WebhookDescription struct {
// GetValidatingWebhook returns a ValidatingWebhook generated from the WebhookDescription
func (w *WebhookDescription) GetValidatingWebhook(namespace string, namespaceSelector *metav1.LabelSelector, caBundle []byte) admissionregistrationv1.ValidatingWebhook {
return admissionregistrationv1.ValidatingWebhook{
Name: w.Name,
Name: w.GenerateName,
Rules: w.Rules,
FailurePolicy: w.FailurePolicy,
MatchPolicy: w.MatchPolicy,
Expand All @@ -205,7 +206,7 @@ func (w *WebhookDescription) GetValidatingWebhook(namespace string, namespaceSel
// GetMutatingWebhook returns a MutatingWebhook generated from the WebhookDescription
func (w *WebhookDescription) GetMutatingWebhook(namespace string, namespaceSelector *metav1.LabelSelector, caBundle []byte) admissionregistrationv1.MutatingWebhook {
return admissionregistrationv1.MutatingWebhook{
Name: w.Name,
Name: w.GenerateName,
Rules: w.Rules,
FailurePolicy: w.FailurePolicy,
MatchPolicy: w.MatchPolicy,
Expand Down Expand Up @@ -365,7 +366,7 @@ const (
CSVReasonInterOperatorGroupOwnerConflict ConditionReason = "InterOperatorGroupOwnerConflict"
CSVReasonCannotModifyStaticOperatorGroupProvidedAPIs ConditionReason = "CannotModifyStaticOperatorGroupProvidedAPIs"
CSVReasonDetectedClusterChange ConditionReason = "DetectedClusterChange"
CSVReasonUnsupportedWebhookRules ConditionReason = "UnsupportedWebhookRules"
CSVReasonInvalidWebhookDescription ConditionReason = "InvalidWebhookDescription"
)

// HasCaResources returns true if the CSV has owned APIServices or Webhooks.
Expand Down