From 4b98eee32750023ccd51045df5d19f9af41d7525 Mon Sep 17 00:00:00 2001 From: Warren Fernandes Date: Fri, 29 Jan 2021 16:53:58 -0700 Subject: [PATCH] Set webhook port to 9443 Adds CRDs to providers category --- operator/api/v1alpha4/bootstrapprovider_types.go | 2 ++ operator/api/v1alpha4/controlplaneprovider_types.go | 2 ++ operator/api/v1alpha4/coreprovider_types.go | 2 ++ operator/api/v1alpha4/infrastructureprovider_types.go | 2 ++ .../crd/bases/operator.cluster.x-k8s.io_bootstrapproviders.yaml | 2 ++ .../bases/operator.cluster.x-k8s.io_controlplaneproviders.yaml | 2 ++ .../crd/bases/operator.cluster.x-k8s.io_coreproviders.yaml | 2 ++ .../operator.cluster.x-k8s.io_infrastructureproviders.yaml | 2 ++ operator/main.go | 2 +- 9 files changed, 17 insertions(+), 1 deletion(-) diff --git a/operator/api/v1alpha4/bootstrapprovider_types.go b/operator/api/v1alpha4/bootstrapprovider_types.go index cbcefdb74fe1..eae1ecc6b063 100644 --- a/operator/api/v1alpha4/bootstrapprovider_types.go +++ b/operator/api/v1alpha4/bootstrapprovider_types.go @@ -31,6 +31,8 @@ type BootstrapProviderStatus struct { } // +kubebuilder:object:root=true +// +kubebuilder:resource:path=bootstrapproviders,scope=Namespaced,categories=providers +// +kubebuilder:storageversion // BootstrapProvider is the Schema for the bootstrapproviders API type BootstrapProvider struct { //nolint:maligned diff --git a/operator/api/v1alpha4/controlplaneprovider_types.go b/operator/api/v1alpha4/controlplaneprovider_types.go index c596a7db9be5..926552b31f72 100644 --- a/operator/api/v1alpha4/controlplaneprovider_types.go +++ b/operator/api/v1alpha4/controlplaneprovider_types.go @@ -31,6 +31,8 @@ type ControlPlaneProviderStatus struct { } // +kubebuilder:object:root=true +// +kubebuilder:resource:path=controlplaneproviders,scope=Namespaced,categories=providers +// +kubebuilder:storageversion // ControlPlaneProvider is the Schema for the controlplaneproviders API type ControlPlaneProvider struct { //nolint:maligned diff --git a/operator/api/v1alpha4/coreprovider_types.go b/operator/api/v1alpha4/coreprovider_types.go index af1d8946fc54..a556c8a8be61 100644 --- a/operator/api/v1alpha4/coreprovider_types.go +++ b/operator/api/v1alpha4/coreprovider_types.go @@ -31,6 +31,8 @@ type CoreProviderStatus struct { } // +kubebuilder:object:root=true +// +kubebuilder:resource:path=coreproviders,scope=Namespaced,categories=providers +// +kubebuilder:storageversion // CoreProvider is the Schema for the coreproviders API type CoreProvider struct { //nolint:maligned diff --git a/operator/api/v1alpha4/infrastructureprovider_types.go b/operator/api/v1alpha4/infrastructureprovider_types.go index b3d08351b562..17014644dcf3 100644 --- a/operator/api/v1alpha4/infrastructureprovider_types.go +++ b/operator/api/v1alpha4/infrastructureprovider_types.go @@ -31,6 +31,8 @@ type InfrastructureProviderStatus struct { } // +kubebuilder:object:root=true +// +kubebuilder:resource:path=infrastructureproviders,scope=Namespaced,categories=providers +// +kubebuilder:storageversion // InfrastructureProvider is the Schema for the infrastructureproviders API type InfrastructureProvider struct { //nolint:maligned diff --git a/operator/config/crd/bases/operator.cluster.x-k8s.io_bootstrapproviders.yaml b/operator/config/crd/bases/operator.cluster.x-k8s.io_bootstrapproviders.yaml index cf17f658936a..5c58096ea5d1 100644 --- a/operator/config/crd/bases/operator.cluster.x-k8s.io_bootstrapproviders.yaml +++ b/operator/config/crd/bases/operator.cluster.x-k8s.io_bootstrapproviders.yaml @@ -10,6 +10,8 @@ metadata: spec: group: operator.cluster.x-k8s.io names: + categories: + - providers kind: BootstrapProvider listKind: BootstrapProviderList plural: bootstrapproviders diff --git a/operator/config/crd/bases/operator.cluster.x-k8s.io_controlplaneproviders.yaml b/operator/config/crd/bases/operator.cluster.x-k8s.io_controlplaneproviders.yaml index 60002b45cb59..124c3a3d96c1 100644 --- a/operator/config/crd/bases/operator.cluster.x-k8s.io_controlplaneproviders.yaml +++ b/operator/config/crd/bases/operator.cluster.x-k8s.io_controlplaneproviders.yaml @@ -10,6 +10,8 @@ metadata: spec: group: operator.cluster.x-k8s.io names: + categories: + - providers kind: ControlPlaneProvider listKind: ControlPlaneProviderList plural: controlplaneproviders diff --git a/operator/config/crd/bases/operator.cluster.x-k8s.io_coreproviders.yaml b/operator/config/crd/bases/operator.cluster.x-k8s.io_coreproviders.yaml index 565b8cb56c4f..1088dbe136a2 100644 --- a/operator/config/crd/bases/operator.cluster.x-k8s.io_coreproviders.yaml +++ b/operator/config/crd/bases/operator.cluster.x-k8s.io_coreproviders.yaml @@ -10,6 +10,8 @@ metadata: spec: group: operator.cluster.x-k8s.io names: + categories: + - providers kind: CoreProvider listKind: CoreProviderList plural: coreproviders diff --git a/operator/config/crd/bases/operator.cluster.x-k8s.io_infrastructureproviders.yaml b/operator/config/crd/bases/operator.cluster.x-k8s.io_infrastructureproviders.yaml index f36d0f761c13..e78cb7bf1f9f 100644 --- a/operator/config/crd/bases/operator.cluster.x-k8s.io_infrastructureproviders.yaml +++ b/operator/config/crd/bases/operator.cluster.x-k8s.io_infrastructureproviders.yaml @@ -10,6 +10,8 @@ metadata: spec: group: operator.cluster.x-k8s.io names: + categories: + - providers kind: InfrastructureProvider listKind: InfrastructureProviderList plural: infrastructureproviders diff --git a/operator/main.go b/operator/main.go index b22d2823fcf9..4b634e9a103a 100644 --- a/operator/main.go +++ b/operator/main.go @@ -60,7 +60,7 @@ func InitFlags(fs *pflag.FlagSet) { fs.BoolVar(&enableLeaderElection, "leader-elect", false, "Enable leader election for controller manager. Enabling this will ensure there is only one active controller manager.") - fs.IntVar(&webhookPort, "webhook-port", 0, + fs.IntVar(&webhookPort, "webhook-port", 9443, "Webhook Server port, disabled by default. When enabled, the manager will only work as webhook server, no reconcilers are installed.") }