Skip to content

Commit

Permalink
new shoot definition + remove unused images
Browse files Browse the repository at this point in the history
  • Loading branch information
ppalucki committed Jul 2, 2024
1 parent 8fa57f9 commit efdc430
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 20 deletions.
9 changes: 1 addition & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

REGISTRY := localhost:5001/
EXTENSION_IMAGE_NAME := gardener-extension-cri-resmgr
INSTALLATION_IMAGE_NAME := gardener-extension-cri-resmgr-installation-and-agent
TAG := latest

# Please keep it up to date with agent image in charts/images.yaml
Expand Down Expand Up @@ -86,7 +85,6 @@ _install-binaries:

clean-images:
docker image rm $(REGISTRY)$(EXTENSION_IMAGE_NAME):$(TAG)
docker image rm $(REGISTRY)$(INSTALLATION_IMAGE_NAME):$(TAG)

regenerate-charts:
rm -rf ./pkg/consts/charts
Expand All @@ -95,19 +93,14 @@ regenerate-charts:
_build-extension-image:
@echo "Building extension image: commit=${COMMIT}${DIRTY} version=${VERSION} target=$(REGISTRY)$(EXTENSION_IMAGE_NAME):$(TAG)"
docker build --build-arg COMMIT=${COMMIT}${DIRTY} --build-arg VERSION=${VERSION} -t $(REGISTRY)$(EXTENSION_IMAGE_NAME):$(TAG) -f Dockerfile --target $(EXTENSION_IMAGE_NAME) .
_build-installation-image:
@echo "Building installation image: commit=${COMMIT}${DIRTY} version=${VERSION} target=$(REGISTRY)$(INSTALLATION_IMAGE_NAME):$(TAG)"
docker build --build-arg COMMIT=${COMMIT}${DIRTY} --build-arg VERSION=${VERSION} -t $(REGISTRY)$(INSTALLATION_IMAGE_NAME):$(TAG) -f Dockerfile --target $(INSTALLATION_IMAGE_NAME) .

dist: build build-images

build-images: regenerate-charts _build-extension-image _build-installation-image
build-images: regenerate-charts _build-extension-image
echo "Building ${VERSION}-${COMMIT}${DIRTY} done."


push-images:
docker push $(REGISTRY)$(EXTENSION_IMAGE_NAME):$(TAG)
docker push $(REGISTRY)$(INSTALLATION_IMAGE_NAME):$(TAG)
echo "Images ${VERSION}-${COMMIT}${DIRTY} pushed."

generate-mocks:
Expand Down
25 changes: 13 additions & 12 deletions examples/shoot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,20 @@ metadata:
name: local
namespace: garden-local
annotations:
shoot.gardener.cloud/infrastructure-cleanup-wait-period-seconds: "0"
shoot.gardener.cloud/cloud-config-execution-max-delay-seconds: "0"
authentication.gardener.cloud/issuer: "managed"
spec:
seedName: local
cloudProfileName: local
secretBindingName: local
secretBindingName: local # dummy, doesn't contain any credentials
region: local
## In this shoot, local extension is disabled by default and uses configuration from ControllerDeployment.
## To enable mark it as disable=false or use globallyEnabled: true
extensions:
- type: cri-resmgr-extension
disabled: true
disabled: false
networking:
type: calico
providerConfig:
apiVersion: calico.networking.extensions.gardener.cloud/v1alpha1
kind: NetworkConfig
backend: none
typha:
enabled: false
nodes: 10.10.0.0/16
provider:
type: local
workers:
Expand All @@ -46,8 +41,14 @@ spec:
cri:
name: containerd
minimum: 1
maximum: 1 # currently, only single-node clusters are supported
maximum: 2
maxSurge: 1
maxUnavailable: 0
kubernetes:
version: 1.27.1 # please keep that in sync with test/e2e/cri-resmgr-extension/common_test.go "kubernetesVersion" 1
kubelet:
seccompDefault: true
serializeImagePulls: false
registryPullQPS: 10
registryBurst: 20
protectKernelDefaults: true
streamingConnectionIdleTimeout: 5m

0 comments on commit efdc430

Please sign in to comment.