Fix/logs

api/v1alpha1/cachedimage_webhook.go

@@ -8,23 +8,19 @@
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	ctrl "sigs.k8s.io/controller-runtime"
-	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
-var cachedimagelog = logf.Log.WithName("cachedimage-resource")
-
 func (r *CachedImage) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).
 		WithDefaulter(r).
 		For(r).
 		Complete()
 }
 
 //+kubebuilder:webhook:path=/mutate-kuik-enix-io-v1alpha1-cachedimage,mutating=true,failurePolicy=fail,sideEffects=None,groups=kuik.enix.io,resources=cachedimages,verbs=create;update,versions=v1alpha1,name=mcachedimage.kb.io,admissionReviewVersions=v1
 
 func (r *CachedImage) Default(ctx context.Context, obj runtime.Object) error {
 	cachedImage := obj.(*CachedImage)
-	cachedimagelog.Info("defaulting", "name", cachedImage.Name)
 
 	named, err := reference.ParseNormalizedNamed(cachedImage.Spec.SourceImage)
 	if err != nil {

helm/kube-image-keeper/templates/controller-deployment.yaml

@@ -91,6 +91,10 @@ spec:
           readinessProbe:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+          {{- with .Values.controllers.livenessProbe }}
+          livenessProbe:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           {{- with .Values.controllers.resources }}
           resources:
             {{- toYaml . | nindent 12 }}

helm/kube-image-keeper/templates/proxy-daemonset.yaml

@@ -77,11 +77,13 @@ spec:
             {{- else }}
             - -bind-address=:{{ .Values.proxy.hostPort }}
             {{- end }}
-          {{- if .Values.rootCertificateAuthorities }}
-          {{- with .Values.proxy.env }}
           env:
+          {{- with .Values.proxy.env }}
             {{- toYaml . | nindent 12 }}
           {{- end }}
+            - name: GIN_MODE
+              value: release
+          {{- if .Values.rootCertificateAuthorities }}
           volumeMounts:
             - mountPath: /etc/ssl/certs/registry-certificate-authorities
               name: registry-certificate-authorities
@@ -95,6 +97,14 @@ spec:
           readinessProbe:
             {{- $readinessProbe | toYaml | nindent 12 }}
           {{- end }}
+          {{- $livenessProbe := deepCopy .Values.proxy.livenessProbe }}
+          {{- if .Values.proxy.hostNetwork }}
+            {{- $livenessProbe := merge $livenessProbe.httpGet (dict "host" "localhost") }}
+          {{- end }}
+          {{- with .Values.proxy.livenessProbe }}
+          livenessProbe:
+            {{- $livenessProbe | toYaml | nindent 12 }}
+          {{- end }}
           {{- with .Values.proxy.resources }}
           resources:
             {{- toYaml . | nindent 12 }}

helm/kube-image-keeper/templates/registry-deployment.yaml

@@ -94,6 +94,10 @@ spec:
           readinessProbe:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+          {{- with .Values.registry.livenessProbe }}
+          livenessProbe:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
       {{- with .Values.registry.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

helm/kube-image-keeper/templates/registry-statefulset.yaml

@@ -97,6 +97,10 @@ spec:
           readinessProbe:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+          {{- with .Values.registry.livenessProbe }}
+          livenessProbe:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
       {{- with .Values.registry.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

helm/kube-image-keeper/values.yaml

@@ -57,6 +57,11 @@ controllers:
     httpGet:
       path: /readyz
       port: 8081
+  # -- Liveness probe definition for the controllers pod
+  livenessProbe:
+    httpGet:
+      path: /healthz
+      port: 8081
   resources:
     requests:
       # -- Cpu requests for the controller pod
@@ -162,7 +167,12 @@ proxy:
   # -- Readiness probe definition for the proxy pod
   readinessProbe:
     httpGet:
-      path: /v2/
+      path: /readyz
+      port: 7439
+  # -- Liveness probe definition for the proxy pod
+  livenessProbe:
+    httpGet:
+      path: /healthz
       port: 7439
   resources:
     requests:
@@ -239,6 +249,11 @@ registry:
     httpGet:
       path: /v2/
       port: 5000
+    # -- Liveness probe definition for the proxy pod
+  livenessProbe:
+    httpGet:
+      path: /v2/
+      port: 5000
   resources:
     requests:
       # -- Cpu requests for the registry pod

internal/proxy/server.go

@@ -39,7 +39,7 @@ func New(k8sClient client.Client, metricsAddr string, insecureRegistries []strin
 	collector := NewCollector()
 	return &Proxy{
 		k8sClient:          k8sClient,
-		engine:             gin.Default(),
+		engine:             gin.New(),
 		collector:          collector,
 		exporter:           metrics.New(collector, metricsAddr),
 		insecureRegistries: insecureRegistries,
@@ -57,14 +57,24 @@ func NewWithEngine(k8sClient client.Client, engine *gin.Engine) *Proxy {
 func (p *Proxy) Serve() *Proxy {
 	r := p.engine
 
-	r.Use(recoveryMiddleware())
-	r.Use(func(c *gin.Context) {
-		c.Next()
-		registry := c.Param("originRegistry")
-		if registry == "" {
-			return
-		}
-		p.collector.IncHTTPCall(registry, c.Writer.Status(), c.GetBool("cacheHit"))
+	r.Use(
+		gin.LoggerWithWriter(gin.DefaultWriter, "/readyz", "/healthz"),
+		recoveryMiddleware(),
+		func(c *gin.Context) {
+			c.Next()
+			registry := c.Param("originRegistry")
+			if registry == "" {
+				return
+			}
+			p.collector.IncHTTPCall(registry, c.Writer.Status(), c.GetBool("cacheHit"))
+		},
+	)
+
+	r.GET("/readyz", func(c *gin.Context) {
+		c.Status(http.StatusOK)
+	})
+	r.GET("/healthz", func(c *gin.Context) {
+		c.Status(http.StatusOK)
 	})
 
 	v2 := r.Group("/v2")
@@ -80,7 +90,7 @@ func (p *Proxy) Serve() *Proxy {
 
 			subMatches := pathRegex.FindStringSubmatch(subPath)
 			if subMatches == nil {
-				c.Status(404)
+				c.Status(http.StatusNotFound)
 				return
 			}
 
@@ -134,7 +144,7 @@ func (p *Proxy) Run(proxyAddr string) chan struct{} {
 func (p *Proxy) v2Endpoint(c *gin.Context) {
 	c.Header("Docker-Distribution-Api-Version", "registry/2.0")
 	c.Header("X-Content-Type-Options", "nosniff")
-	c.JSON(200, map[string]string{})
+	c.JSON(http.StatusOK, map[string]string{})
 }
 
 func (p *Proxy) routeProxy(c *gin.Context) {