Vendor [email protected] and Upgrade go,k8s.io/* dependencies and…

… `controller-runtime` (#213)

* Vendor `[email protected]`

* Rename generate script filename

* Adapt repo change for gomock

* Adapt changes for the managedresource builder

* Use gardener v1.77.2 for e2e tests

* Refactor imagevector package to conform to usage pattern in gardener/gardener

* Drop version tpl files

* Run `make generate`

* Delete util-templates

* Vendor `[email protected]`

* Drop symlink in charts

* -----------------Empty separator commit----------------

* Update go.mod to 1.21

* Vendor `[email protected]`

Upgrade `k8s.io/*` dependencies and `controller-runtime`

* Adapt changes to the Manager

* Adapt changes to NodeLocalDNS

* Run `make generate`

* Use `[email protected]` for e2e tests

* Embed remaining charts and drop copying charts to the container

* Use `autoscaling.k8s.io/v1` API for VPA

* Do not duplicate the configMap

.ci/set_dependency_version

@@ -1,3 +1,5 @@
 #!/usr/bin/env bash
 
+set -e 
+
 $(dirname $0)"/../vendor/github.com/gardener/gardener/hack/.ci/set_dependency_version

.dockerignore

@@ -7,6 +7,7 @@
 !docs/
 !example/
 !hack/
+!imagevector/
 !pkg/
 !test/
 !tools/

Dockerfile

@@ -12,7 +12,6 @@ RUN make install EFFECTIVE_VERSION=$EFFECTIVE_VERSION
 FROM gcr.io/distroless/static-debian11:nonroot AS gardener-extension-networking-cilium
 WORKDIR /
 
-COPY charts /charts
 COPY --from=builder /go/bin/gardener-extension-networking-cilium /gardener-extension-networking-cilium
 ENTRYPOINT ["/gardener-extension-networking-cilium"]
 

Makefile

@@ -108,7 +108,7 @@ check: $(GOIMPORTS) $(GOLANGCI_LINT) $(HELM)
 
 .PHONY: generate
 generate: $(CONTROLLER_GEN) $(GEN_CRD_API_REFERENCE_DOCS) $(HELM) $(MOCKGEN) $(YQ)
-	@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/generate.sh ./charts/... ./cmd/... ./pkg/... 
+	@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/generate-sequential.sh ./charts/... ./cmd/... ./pkg/... 
 	$(MAKE) format
 
 .PHONY: format

charts/images.go → charts/charts.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2021 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file
+// Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,8 +14,15 @@
 
 package charts
 
-import _ "embed"
+import (
+	"embed"
+	_ "embed"
+)
 
-// ImagesYAML contains the contents of the images.yaml file.
-//go:embed images.yaml
-var ImagesYAML string
+// InternalChart embeds the internal charts in embed.FS
+//
+//go:embed internal
+var InternalChart embed.FS
+
+// InternalChartsPath is the path to the internal charts
+const InternalChartsPath = "internal"

charts/gardener-extension-admission-cilium/charts/application/templates/_helpers.tpl

@@ -21,7 +21,3 @@ app.kubernetes.io/instance: {{ .Release.Name }}
   {{- printf "%s:%s" .repository .tag }}
   {{- end }}
 {{- end }}
-
-{{- define "deploymentversion" -}}
-apps/v1
-{{- end -}}

charts/gardener-extension-admission-cilium/charts/runtime/templates/_helpers.tpl

@@ -21,7 +21,3 @@ app.kubernetes.io/instance: {{ .Release.Name }}
   {{- printf "%s:%s" .repository .tag }}
   {{- end }}
 {{- end }}
-
-{{- define "deploymentversion" -}}
-apps/v1
-{{- end -}}

charts/gardener-extension-admission-cilium/charts/runtime/templates/poddisruptionbudget.yaml

@@ -1,4 +1,4 @@
-apiVersion: {{ include "poddisruptionbudgetversion" . }}
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: {{ include "name" . }}

charts/gardener-extension-admission-cilium/templates/_helpers.tpl

@@ -21,7 +21,3 @@ app.kubernetes.io/instance: {{ .Release.Name }}
   {{- printf "%s:%s" .repository .tag }}
   {{- end }}
 {{- end }}
-
-{{- define "deploymentversion" -}}
-apps/v1
-{{- end -}}

charts/gardener-extension-networking-cilium/templates/_helpers.tpl

@@ -21,11 +21,3 @@ app.kubernetes.io/instance: {{ .Release.Name }}
   {{- printf "%s:%s" .Values.image.repository .Values.image.tag }}
   {{- end }}
 {{- end }}
-
-{{- define "deploymentversion" -}}
-apps/v1
-{{- end -}}
-
-{{- define "poddisruptionbudgetversion" -}}
-policy/v1
-{{- end -}}

charts/gardener-extension-networking-cilium/templates/deployment.yaml

@@ -41,7 +41,6 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         command:
         - /gardener-extension-networking-cilium
-        - --leader-election-resource-lock={{ .Values.leaderElection.resourceLock }}
         - --max-concurrent-reconciles={{ .Values.controller.concurrentSyncs }}
         - --healthcheck-max-concurrent-reconciles={{ .Values.controller.healthcheck.concurrentSyncs }}
         - --heartbeat-namespace={{ .Release.Namespace }} 

charts/gardener-extension-networking-cilium/templates/poddisruptionbudget.yaml

@@ -1,4 +1,4 @@
-apiVersion: {{ include "poddisruptionbudgetversion" . }}
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: gardener-extension-networking-cilium

charts/gardener-extension-networking-cilium/templates/vpa.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.vpa.enabled }}
-apiVersion: "autoscaling.k8s.io/v1beta2"
+apiVersion: "autoscaling.k8s.io/v1"
 kind: VerticalPodAutoscaler
 metadata:
   name: gardener-extension-networking-cilium-vpa

charts/gardener-extension-networking-cilium/values.yaml

@@ -35,9 +35,6 @@ controller:
     renewIntervalSeconds: 30 
   ignoreOperationAnnotation: false
 
-leaderElection:
-  resourceLock: leases
-
 config:
   clientConnection:
     acceptContentTypes: application/json

charts/internal/cilium/charts/agent/templates/clusterrole.yaml

@@ -1,4 +1,4 @@
-apiVersion: {{ include "rbacversion" . }}
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: cilium

charts/internal/cilium/charts/agent/templates/clusterrolebinding.yaml

@@ -1,4 +1,4 @@
-apiVersion: {{ include "rbacversion" . }}
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: cilium

charts/internal/cilium/charts/agent/templates/daemonset.yaml

@@ -1,4 +1,4 @@
-apiVersion: {{ include "daemonsetversion" . }}
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: cilium
@@ -16,7 +16,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/configmap-cilium: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+        checksum/configmap-cilium: "{{ .Values.global.configMapHash }}"
 {{- if and .Values.global.prometheus.enabled (not .Values.global.prometheus.serviceMonitor.enabled) }}
         prometheus.io/port: "{{ .Values.global.prometheus.port }}"
         prometheus.io/scrape: "true"

charts/internal/cilium/charts/hubble-relay/templates/clusterrole.yaml

@@ -1,5 +1,5 @@
 ---
-apiVersion: {{ include "rbacversion" . }}
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: hubble-relay
@@ -20,7 +20,7 @@ rules:
       - list
       - watch
 ---
-apiVersion: {{ include "rbacversion" . }}
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: hubble-generate-certs

charts/internal/cilium/charts/hubble-relay/templates/clusterrolebinding.yaml

@@ -1,5 +1,5 @@
 ---
-apiVersion: {{ include "rbacversion" . }}
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: hubble-relay
@@ -14,7 +14,7 @@ subjects:
   name: hubble-relay
   namespace: {{ .Release.Namespace }}
 ---
-apiVersion: {{ include "rbacversion" . }}
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: hubble-generate-certs

charts/internal/cilium/charts/hubble-relay/templates/deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: {{ include "deploymentversion" .}}
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ .Chart.Name }}

charts/internal/cilium/charts/hubble-ui/templates/clusterrole.yaml

@@ -1,5 +1,5 @@
 ---
-apiVersion: {{ include "rbacversion" . }}
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: hubble-ui

charts/internal/cilium/charts/hubble-ui/templates/clusterrolebinding.yaml

@@ -1,5 +1,5 @@
 ---
-apiVersion: {{ include "rbacversion" . }}
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: hubble-ui

charts/internal/cilium/charts/hubble-ui/templates/deployment.yaml

@@ -1,5 +1,5 @@
 ---
-apiVersion: {{ include "deploymentversion" .}}
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ .Chart.Name }}

charts/internal/cilium/charts/hubble-ui/templates/ingress.yaml

@@ -1,6 +1,6 @@
 {{- if .Values.ingress.enabled -}}
 {{- $ingressPath := .Values.ingress.path -}}
-apiVersion: {{ include "ingressversion" . }}
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: hubble-ui

charts/internal/cilium/charts/operator/templates/clusterrole.yaml

@@ -1,4 +1,4 @@
-apiVersion: {{ include "rbacversion" . }}
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: cilium-operator

charts/internal/cilium/charts/operator/templates/clusterrolebinding.yaml

@@ -1,4 +1,4 @@
-apiVersion: {{ include "rbacversion" . }}
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: cilium-operator

charts/internal/cilium/charts/operator/templates/deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: {{ include "deploymentversion" . }}
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: cilium-operator
@@ -27,7 +27,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/configmap-cilium: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+        checksum/configmap-cilium: "{{ .Values.global.configMapHash }}"
 {{- if and .Values.global.prometheus.enabled (not .Values.global.prometheus.serviceMonitor.enabled) }}
         prometheus.io/port: {{ .Values.global.operatorPrometheus.port | quote }}
         prometheus.io/scrape: "true"

charts/internal/cilium/charts/operator/templates/poddisruptionbudget.yaml

@@ -1,4 +1,4 @@
-apiVersion: {{ include "poddisruptionbudgetversion" . }}
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: cilium-operator

charts/internal/cilium/requirements.yaml

@@ -1,8 +1,6 @@
 dependencies:
   - name: agent
     condition: requirements.agent.enabled
-  - name: config
-    condition: requirements.config.enabled
   - name: operator
     condition: requirements.operator.enabled
   - name: hubble-ui

charts/internal/cilium/values.yaml

@@ -3,10 +3,6 @@ requirements:
   agent:
     enabled: true
 
-  # Include the cilium-config ConfigMap
-  config:
-    enabled: true
-
   # Include the cilium-operator Deployment
   operator:
     enabled: true
@@ -17,6 +13,8 @@ requirements:
 
 # global groups all configuration options that have effect on all sub-charts
 global:
+  configMapHash: ""
+
   egressGateway:
     enabled: false