Skip to content

Commit

Permalink
Merge pull request #190 from intel/ppalucki/fix-e2e-and-deps-update
Browse files Browse the repository at this point in the history
Gradener 1.85 updates and fix e2e Kuberenetes version
  • Loading branch information
ppalucki authored Dec 20, 2023
2 parents 34116d5 + efce4e5 commit 9a84794
Show file tree
Hide file tree
Showing 24 changed files with 415 additions and 608 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.19
go-version: 1.21
cache: true

- name: Verify dependencies
Expand All @@ -38,7 +38,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v3
with:
go-version: 1.19
go-version: 1.21

- uses: actions/checkout@v3
# with:
Expand All @@ -64,7 +64,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v3
with:
go-version: 1.19
go-version: 1.21

- uses: actions/checkout@v3

Expand Down
17 changes: 5 additions & 12 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,6 @@
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "unittests-actuator",
"type": "go",
"request": "launch",
"mode": "test",
"program": "./pkg/controller/lifecycle",
// "cwd": "./pkg/controller/lifecycle",
"showGlobalVariables": true,
"args": [],
"preLaunchTask": "generate",
},
{
"name": "unittests-configs",
"type": "go",
Expand All @@ -23,7 +12,8 @@
"program": "./pkg/configs",
"cwd": "./pkg/configs",
"showGlobalVariables": true,
"args": []
"args": [
]
},
{
"name": "cri-resmgr",
Expand Down Expand Up @@ -51,6 +41,9 @@
// "debugAdapter": "legacy", // ERROR
//"dlvFlags": ["-r", "stderr:output.log"], // IGNORED - work from command live dlv debug -r but not for dlv dap
// "logDest": "/home/root/gardener-extension-cri-resmgr/output.log", // ERROR
"args": [
"--leader-election=false"
]
}
]
}
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

### builder
FROM golang:1.20.6-alpine3.18 AS builder
FROM golang:1.21.5-alpine3.19 AS builder

WORKDIR /gardener-extension-cri-resmgr
COPY go.mod .
Expand All @@ -40,13 +40,13 @@ ENTRYPOINT ["/gardener-extension-cri-resmgr"]


### agnet and installation joined
FROM debian:12.0 as gardener-extension-cri-resmgr-installation-and-agent
FROM debian:12.2 as gardener-extension-cri-resmgr-installation-and-agent

WORKDIR /gardener-extension-cri-resmgr-installation-and-agent
# Please keep this in sync with CRI_RM_VERSION from Makefile!
COPY --from=intel/cri-resmgr-agent:v0.8.3 /bin/* /bin/
COPY Makefile .
RUN apt-get update && apt-get --no-install-recommends -y install make wget ca-certificates libpsl5 libssl3 openssl publicsuffix && apt-get clean && rm -rf /var/lib/apt/lists/*
RUN apt-get update && apt-get --no-install-recommends -y install make wget && apt-get clean && rm -rf /var/lib/apt/lists/*
RUN make _install-binaries
ARG COMMIT=unset
ARG VERSION=unset
Expand Down
14 changes: 9 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,10 @@ e2e-test:
@echo "127.0.0.1 api.e2e-default.local.internal.local.gardener.cloud"
@echo ""
@echo "Note2:"
@echo "KUBECONFIG should point to kind-local gardener cluster."
@echo "Make sure env KUBECONFIG exists"
@echo "example: export KUBECONFIG=~/.kube/config"
@echo 'KUBECONFIG should point to kind-local gardener cluster e.g KUBECONFIG=$HOME/.kube/config'
@echo ""
@echo "Note3:"
@echo "ControllerRegistration and ControllerDeployment CRDs must be already deployed to cluster"
@echo "ControllerRegistration and ControllerDeployment CRDs must be already deployed to cluster (with globallyEnabled=False)"
@echo
@echo "Note4:"
@echo "Following labels are available: enable, reenable, disable"
Expand All @@ -82,19 +80,23 @@ start:

_install-binaries:
# WARNING: this should be run in container
wget --directory-prefix=/cri-resmgr-installation $(CRI_RM_URL_RELEASE)
wget --no-check-certificate --directory-prefix=/cri-resmgr-installation $(CRI_RM_URL_RELEASE)
tar -xvf /cri-resmgr-installation/$(CRI_RM_ARCHIVE_NAME) --directory /cri-resmgr-installation
rm /cri-resmgr-installation/$(CRI_RM_ARCHIVE_NAME)

_build-extension-image:
@echo "Building extension image: commit=${COMMIT}${DIRTY} version=${VERSION} target=$(REGISTRY)$(EXTENSION_IMAGE_NAME):$(TAG)"
rm -rf ./pkg/consts/charts
go generate ./...
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)"
rm -rf ./pkg/consts/charts
go generate ./...
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: _build-extension-image _build-installation-image
echo "Building ${VERSION}-${COMMIT}${DIRTY} done."

Expand All @@ -104,8 +106,10 @@ push-images:
echo "Images ${VERSION}-${COMMIT}${DIRTY} pushed."

generate-mocks:
# go install go.uber.org/mock/mockgen@latest
mockgen -destination=mocks/actuator.go -package=mocks github.com/gardener/gardener/extensions/pkg/controller/extension Actuator
mockgen -destination=mocks/client.go -package=mocks sigs.k8s.io/controller-runtime/pkg/client Client,Reader,Object
mockgen -destination=mocks/manager.go -package=mocks sigs.k8s.io/controller-runtime/pkg/manager Manager

generate-coverage:
go test -coverprofile=coverage.out ./pkg/...
Expand Down
16 changes: 10 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ This Gardener extension will deploy and manage lifecycle of [CRI-Resource-Manage

- `container-runtime` of shoot nodes must be configured to **containerd**,
- for production usage: provide **docker image registry** where installation and extension images can be pushed (until #47 is resolved)
- for local development: tested with Gardener v1.74.2
- for local development: tested with Gardener v1.78.2

### Features

Expand Down Expand Up @@ -187,6 +187,7 @@ This is based on https://github.com/gardener/gardener/blob/master/docs/deploymen
#### Prerequisites
- *golang* 1.21+
- *kubectl* 1.20+
- working dir for `mkdir ~/work`
- *gardener-extension-cri-resmgr* is cloned to ~/work path like this:
Expand All @@ -202,7 +203,7 @@ This is based on https://github.com/gardener/gardener/blob/master/docs/deploymen
mkdir -p ~/work/
git clone https://github.com/gardener/gardener ~/work/gardener
cd ~/work/gardener
git checkout v1.74.2
git checkout v1.78.2
cd -
```

Expand Down Expand Up @@ -316,17 +317,21 @@ First get credentials to access shoot cluster:
kubectl create -f kubeconfig-request.json --raw /apis/core.gardener.cloud/v1beta1/namespaces/garden-local/shoots/local/adminkubeconfig | jq -r ".status.kubeconfig" | base64 -d > /tmp/kubeconfig-shoot-local.yaml
```

Please follow [this guide](https://gardener.cloud/docs/gardener/deployment/getting_started_locally/#accessing-the-shoot-cluster) to get access to local shoot cluster.

... and check status of the node/pods:

```sh
kubectl --kubeconfig=/tmp/kubeconfig-shoot-local.yaml get nodes
kubectl --kubeconfig=/tmp/kubeconfig-shoot-local.yaml get pods -A
```



##### 7. Check CRI-resource-manager is installed properly as proxy

```sh
kubectl exec -n shoot--local--local `kubectl get pod -n shoot--local--local --no-headers G machine-shoot | awk '{print $1}'` -- systemctl status cri-resource-manager kubelet -n 0
kubectl exec -n shoot--local--local `kubectl get pod -n shoot--local--local --no-headers | grep machine-shoot | awk '{print $1}'` -- systemctl status cri-resource-manager kubelet -n 0
```

We should observe that:
Expand Down Expand Up @@ -588,11 +593,10 @@ and already set /etc/hosts properly with following entries:
then:
```
make -C ~/work/gardener kind-up
cp ~/work/gardener/example/gardener-local/kind/kubeconfig ~/.kube/config
./hacks/kind-load-images.sh
cp ~/work/gardener/example/gardener-local/kind/local/kubeconfig ~/.kube/config
make -C ~/work/gardener gardener-up
kubectl apply -f ./examples/ctrldeploy-ctrlreg.yaml
make e2e-tests KUBECONFIG=$HOME/.kube/config
make e2e-test KUBECONFIG=$HOME/.kube/config
```

Additional options available provided by test framework:
Expand Down
8 changes: 4 additions & 4 deletions cmd/gardener-extension-cri-resmgr/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@ func NewExtensionControllerCommand(ctx context.Context) *cobra.Command {
// Enable healthcheck.
// "Registration" adds additional controller that watches over Extension/Cluster.
// TODO: ENABLE before merging!!!
if err := healthcheck.RegisterHealthChecks(mgr); err != nil {
if err := healthcheck.RegisterHealthChecks(ctx, mgr); err != nil {
return err
}

if err := heartbeat.AddToManager(mgr); err != nil {
if err := heartbeat.AddToManager(ctx, mgr); err != nil {
return err
}

Expand All @@ -93,12 +93,12 @@ func NewExtensionControllerCommand(ctx context.Context) *cobra.Command {
log.Log.Info("Reconciler options", "ignoreOperationAnnotation", ignoreOperationAnnotation)

// I. This is the primary controller that watches over Extension (and possible Cluster based on ignoreOperationAnnotation)
if err := lifecycle.AddToManager(mgr, options, ignoreOperationAnnotation); err != nil {
if err := lifecycle.AddToManager(ctx, mgr, options, ignoreOperationAnnotation); err != nil {
return fmt.Errorf("error configuring controller with extensions actuator: %s", err)
}
// II. Create another controller for watching over specific configMap and
// reconciling all Extensions that all only in Succeeded state to prevent race over Extension reconciliation
if err := lifecycle.AddConfigMapWatchingControllerToManager(mgr, options); err != nil {
if err := lifecycle.AddConfigMapWatchingControllerToManager(ctx, mgr, options); err != nil {
return fmt.Errorf("error configuring configMap controller with extensions actuator: %s", err)
}

Expand Down
2 changes: 1 addition & 1 deletion examples/ctrldeploy-ctrlreg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: cri-resmgr-extension
type: helm
providerConfig:
chart: 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
chart: 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

values:
### For development purposes - set it to 0 (if you want to register extension but use local process with "make start").
Expand Down
4 changes: 2 additions & 2 deletions examples/shoot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
## To enable mark it as disable=false or use globallyEnabled: true
extensions:
- type: cri-resmgr-extension
#disabled: false
disabled: true
networking:
type: calico
providerConfig:
Expand All @@ -50,4 +50,4 @@ spec:
maxSurge: 1
maxUnavailable: 0
kubernetes:
version: 1.27.1
version: 1.27.1 # please keep that in sync with test/e2e/cri-resmgr-extension/common_test.go "kubernetesVersion" 1
2 changes: 1 addition & 1 deletion examples/shoot2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,4 @@ spec:
maxSurge: 1
maxUnavailable: 0
kubernetes:
version: 1.25.4
version: 1.27.1 # please keep that in sync with test/e2e/cri-resmgr-extension/common_test.go "kubernetesVersion" 1
Loading

0 comments on commit 9a84794

Please sign in to comment.