Skip to content

Commit ffe711f

Browse files
author
Eidmantas Ivanauskas
committed
chore(webhook): remove GitLab webhook handler, flag, and file
1 parent 12da30f commit ffe711f

File tree

3 files changed

+7
-192
lines changed

3 files changed

+7
-192
lines changed

cmd/run.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,7 @@ func newRunCommand() *cobra.Command {
244244
harborHandler := webhook.NewHarborWebhook(webhookCfg.HarborSecret)
245245
handler.RegisterHandler(harborHandler)
246246

247-
gitlabHandler := webhook.NewGitLabWebhook(webhookCfg.GitLabSecret)
248-
handler.RegisterHandler(gitlabHandler)
247+
// GitLab Container Registry webhooks are not supported upstream
249248

250249
quayHandler := webhook.NewQuayWebhook(webhookCfg.QuaySecret)
251250
handler.RegisterHandler(quayHandler)
@@ -389,7 +388,7 @@ func newRunCommand() *cobra.Command {
389388
runCmd.Flags().StringVar(&webhookCfg.QuaySecret, "quay-webhook-secret", env.GetStringVal("QUAY_WEBHOOK_SECRET", ""), "Secret for validating Quay webhooks")
390389
runCmd.Flags().StringVar(&webhookCfg.HarborSecret, "harbor-webhook-secret", env.GetStringVal("HARBOR_WEBHOOK_SECRET", ""), "Secret for validating Harbor webhooks")
391390
runCmd.Flags().IntVar(&webhookCfg.RateLimitNumAllowedRequests, "webhook-ratelimit-allowed", env.ParseNumFromEnv("WEBHOOK_RATELIMIT_ALLOWED", 0, 0, math.MaxInt), "The number of allowed requests in an hour for webhook rate limiting, setting to 0 disables ratelimiting")
392-
runCmd.Flags().StringVar(&webhookCfg.GitLabSecret, "gitlab-webhook-secret", env.GetStringVal("GITLAB_WEBHOOK_SECRET", ""), "Secret for validating GitLab Container Registry webhooks")
391+
// GitLab Container Registry webhooks are not supported upstream
393392

394393
return runCmd
395394
}

cmd/webhook.go

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ type WebhookConfig struct {
3535
QuaySecret string
3636
HarborSecret string
3737
RateLimitNumAllowedRequests int
38-
GitLabSecret string
3938
}
4039

4140
// NewWebhookCommand creates a new webhook command
@@ -202,8 +201,7 @@ Supported registries:
202201
webhookCmd.Flags().StringVar(&webhookCfg.GHCRSecret, "ghcr-webhook-secret", env.GetStringVal("GHCR_WEBHOOK_SECRET", ""), "Secret for validating GitHub Container Registry webhooks")
203202
webhookCmd.Flags().StringVar(&webhookCfg.QuaySecret, "quay-webhook-secret", env.GetStringVal("QUAY_WEBHOOK_SECRET", ""), "Secret for validating Quay webhooks")
204203
webhookCmd.Flags().StringVar(&webhookCfg.HarborSecret, "harbor-webhook-secret", env.GetStringVal("HARBOR_WEBHOOK_SECRET", ""), "Secret for validating Harbor webhooks")
205-
webhookCmd.Flags().IntVar(&webhookCfg.RateLimitNumAllowedRequests, "webhook-ratelimit-allowed", env.ParseNumFromEnv("WEBHOOK_RATELIMIT_ALLOWED", 0, 0, math.MaxInt), "The number of allowed requests in an hour for webhook rate limiting, setting to 0 disables ratelimiting")
206-
webhookCmd.Flags().StringVar(&webhookCfg.GitLabSecret, "gitlab-webhook-secret", env.GetStringVal("GITLAB_WEBHOOK_SECRET", ""), "Secret for validating GitLab Container Registry webhooks")
204+
webhookCmd.Flags().IntVar(&webhookCfg.RateLimitNumAllowedRequests, "webhook-ratelimit-allowed", env.ParseNumFromEnv("WEBHOOK_RATELIMIT_ALLOWED", 0, 0, math.MaxInt), "The number of allowed requests in an hour for webhook rate limiting, setting to 0 disables ratelimiting")
207205

208206
return webhookCmd
209207
}
@@ -243,14 +241,11 @@ func runWebhook(cfg *ImageUpdaterConfig, webhookCfg *WebhookConfig) error {
243241
ghcrHandler := webhook.NewGHCRWebhook(webhookCfg.GHCRSecret)
244242
handler.RegisterHandler(ghcrHandler)
245243

246-
quayHandler := webhook.NewQuayWebhook(webhookCfg.QuaySecret)
247-
handler.RegisterHandler(quayHandler)
244+
quayHandler := webhook.NewQuayWebhook(webhookCfg.QuaySecret)
245+
handler.RegisterHandler(quayHandler)
248246

249-
harborHandler := webhook.NewHarborWebhook(webhookCfg.HarborSecret)
250-
handler.RegisterHandler(harborHandler)
251-
252-
gitlabHandler := webhook.NewGitLabWebhook(webhookCfg.GitLabSecret)
253-
handler.RegisterHandler(gitlabHandler)
247+
harborHandler := webhook.NewHarborWebhook(webhookCfg.HarborSecret)
248+
handler.RegisterHandler(harborHandler)
254249

255250
// Create webhook server
256251
server := webhook.NewWebhookServer(webhookCfg.Port, handler, cfg.KubeClient, cfg.ArgoClient)

pkg/webhook/gitlab.go

Lines changed: 0 additions & 179 deletions
This file was deleted.

0 commit comments

Comments
 (0)