Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable OperatingSystemManager in E2E tests #1369

Merged
merged 2 commits into from
Jul 27, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions .prow/provider-aws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,38 @@ presubmits:
limits:
memory: 6Gi

- name: pull-machine-controller-e2e-aws-legacy-userdata
always_run: true
decorate: true
clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git"
labels:
preset-aws: "true"
preset-hetzner: "true"
preset-e2e-ssh: "true"
preset-rhel: "true"
preset-goproxy: "true"
preset-kind-volume-mounts: "true"
preset-docker-mirror: "true"
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.18-node-16-kind-0.14-9
env:
- name: OPERATING_SYSTEM_MANAGER
value: "false"
command:
- "./hack/ci/run-e2e-tests.sh"
args:
- "TestAWSProvisioningE2E"
securityContext:
privileged: true
resources:
requests:
memory: 6Gi
cpu: 2
limits:
memory: 6Gi

- name: pull-machine-controller-e2e-aws-arm
always_run: true
decorate: true
Expand Down
31 changes: 31 additions & 0 deletions examples/machine-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ spec:
- -cluster-dns=10.10.10.10
- -metrics-address=0.0.0.0:8080
- -health-probe-address=0.0.0.0:8085
- -use-osm=true
# Machines that fail to join the cluster within this timeout and
# are owned by a MachineSet will get deleted so the MachineSet
# controller re-creates them
Expand Down Expand Up @@ -260,6 +261,8 @@ spec:
- /usr/local/bin/webhook
- -logtostderr
- -v=6
- -use-osm=true
- -namespace=kube-system
- -listen-address=0.0.0.0:9876
volumeMounts:
- name: machine-controller-admission-cert
Expand Down Expand Up @@ -566,6 +569,34 @@ subjects:
name: machine-controller
namespace: kube-system
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: machine-controller-webhook
namespace: kube-system
rules:
- apiGroups:
- operatingsystemmanager.k8c.io
resources:
- operatingsystemprofiles
verbs:
- get
- list
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: machine-controller-webhook
namespace: kube-system
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: machine-controller-webhook
subjects:
- kind: ServiceAccount
name: machine-controller
namespace: kube-system
---
apiVersion: admissionregistration.k8s.io/v1
kind: MutatingWebhookConfiguration
metadata:
Expand Down
Loading