Browse Source

Loading ConvertWebhook on main routine

Signed-off-by: Gustavo Carvalho <gustavo.carvalho@container-solutions.com>
Gustavo Carvalho 4 years ago
parent
commit
58c6e35010

+ 2 - 1
apis/externalsecrets/v1alpha1/externalsecret_webhook.go

@@ -16,10 +16,11 @@ package v1alpha1
 
 import (
 	ctrl "sigs.k8s.io/controller-runtime"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 // log is for logging in this package.
-// var externalsecretlog = logf.Log.WithName("externalsecret-resource")
+var externalsecretlog = logf.Log.WithName("externalsecret-resource")
 
 func (alpha *ExternalSecret) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).

+ 0 - 1
apis/externalsecrets/v1alpha1/secretstore_conversion.go

@@ -12,7 +12,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// TODO IMPLEMENT.
 package v1alpha1
 
 import (

+ 2 - 1
apis/externalsecrets/v1alpha1/secretstore_webhook.go

@@ -16,10 +16,11 @@ package v1alpha1
 
 import (
 	ctrl "sigs.k8s.io/controller-runtime"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 // log is for logging in this package.
-// var secretStorelog = logf.Log.WithName("secretStore-resource")
+var secretStorelog = logf.Log.WithName("secretStore-resource")
 
 func (c *SecretStore) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).

+ 2 - 1
apis/externalsecrets/v1beta1/externalsecret_webhook.go

@@ -16,10 +16,11 @@ package v1beta1
 
 import (
 	ctrl "sigs.k8s.io/controller-runtime"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 // log is for logging in this package.
-// var externalsecretlog = logf.Log.WithName("externalsecret-resource")
+var externalsecretlog = logf.Log.WithName("externalsecret-resource")
 
 func (r *ExternalSecret) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).

+ 2 - 1
apis/externalsecrets/v1beta1/secretstore_webhook.go

@@ -16,10 +16,11 @@ package v1beta1
 
 import (
 	ctrl "sigs.k8s.io/controller-runtime"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 // log is for logging in this package.
-// var secretStorelog = logf.Log.WithName("secretStore-resource")
+var secretStorelog = logf.Log.WithName("secretStore-resource")
 
 func (c *SecretStore) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).

+ 27 - 0
main.go

@@ -27,6 +27,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
+	esv1alpha1 "github.com/external-secrets/external-secrets/apis/externalsecrets/v1alpha1"
 	esv1beta1 "github.com/external-secrets/external-secrets/apis/externalsecrets/v1beta1"
 	"github.com/external-secrets/external-secrets/pkg/controllers/externalsecret"
 	"github.com/external-secrets/external-secrets/pkg/controllers/secretstore"
@@ -42,6 +43,7 @@ const errCreateController = "unable to create controller"
 func init() {
 	_ = clientgoscheme.AddToScheme(scheme)
 	_ = esv1beta1.AddToScheme(scheme)
+	_ = esv1alpha1.AddToScheme(scheme)
 }
 
 func main() {
@@ -118,6 +120,31 @@ func main() {
 		os.Exit(1)
 	}
 
+	if err = (&esv1beta1.ExternalSecret{}).SetupWebhookWithManager(mgr); err != nil {
+		setupLog.Error(err, "unable to create webhook", "webhook", "ExternalSecret-v1beta1")
+		os.Exit(1)
+	}
+	if err = (&esv1beta1.SecretStore{}).SetupWebhookWithManager(mgr); err != nil {
+		setupLog.Error(err, "unable to create webhook", "webhook", "SecretStore-v1beta1")
+		os.Exit(1)
+	}
+	if err = (&esv1beta1.ClusterSecretStore{}).SetupWebhookWithManager(mgr); err != nil {
+		setupLog.Error(err, "unable to create webhook", "webhook", "ClusterSecretStore-v1beta1")
+		os.Exit(1)
+	}
+	if err = (&esv1alpha1.ExternalSecret{}).SetupWebhookWithManager(mgr); err != nil {
+		setupLog.Error(err, "unable to create webhook", "webhook", "ExternalSecret-v1alpha1")
+		os.Exit(1)
+	}
+	if err = (&esv1alpha1.SecretStore{}).SetupWebhookWithManager(mgr); err != nil {
+		setupLog.Error(err, "unable to create webhook", "webhook", "SecretStore-v1alpha1")
+		os.Exit(1)
+	}
+	if err = (&esv1alpha1.ClusterSecretStore{}).SetupWebhookWithManager(mgr); err != nil {
+		setupLog.Error(err, "unable to create webhook", "webhook", "ClusterSecretStore-v1alpha1")
+		os.Exit(1)
+	}
+
 	setupLog.Info("starting manager")
 	if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
 		setupLog.Error(err, "problem running manager")