Skip to content

OCPBUGS-13891: [release-4.12] HyperShift: Support HostedControlPlane node selector #1816

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Jun 22, 2023
Merged

OCPBUGS-13891: [release-4.12] HyperShift: Support HostedControlPlane node selector #1816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9049a76
Bump hypershift dependency to v0.1.2
kyrtapz May 29, 2023
667e48d
Migrate to hypershift v1beta1
martinkennelly Apr 3, 2023
d40981b
HyperShift: Move hypershift.go to platform package
kyrtapz Mar 9, 2023
a5c7bc7
HyperShift: Retrieve HostedControlPlane as part of bootstrap process
kyrtapz Mar 9, 2023
6ad1fce
HyperShift: Add support for HostedControlPlane nodeSelector field
kyrtapz Mar 14, 2023
4e7b1b5
Do not determine if HyperShift is enabled based on the ControlPlaneTo…
kyrtapz Jun 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 6 additions & 0 deletions bindata/cloud-network-config-controller/managed/controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,12 @@ spec:
operator: "Equal"
value: {{.HostedClusterNamespace}}
effect: "NoSchedule"
{{ if .HCPNodeSelector }}
nodeSelector:
{{ range $key, $value := .HCPNodeSelector }}
"{{$key}}": "{{$value}}"
{{ end }}
{{ end }}
volumes:
- name: hosted-cluster-api-access
emptyDir: {}
Expand Down
8 changes: 8 additions & 0 deletions bindata/network/multus-admission-controller/admission-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,14 @@ spec:
{{- if not .ExternalControlPlane }}
nodeSelector:
node-role.kubernetes.io/master: ""
{{- end }}
{{- if .HyperShiftEnabled}}
{{ if .HCPNodeSelector }}
nodeSelector:
{{ range $key, $value := .HCPNodeSelector }}
"{{$key}}": "{{$value}}"
{{ end }}
{{ end }}
{{- end }}
volumes:
- name: webhook-certs
Expand Down
7 changes: 5 additions & 2 deletions bindata/network/ovn-kubernetes/managed/ovnkube-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1036,9 +1036,12 @@ spec:
- name: KUBECONFIG
value: "/etc/kubernetes/kubeconfig"
terminationMessagePolicy: FallbackToLogsOnError
{{ if .HCPNodeSelector }}
nodeSelector:
node-role.kubernetes.io/worker: ""
beta.kubernetes.io/os: "linux"
{{ range $key, $value := .HCPNodeSelector }}
"{{$key}}": "{{$value}}"
{{ end }}
{{ end }}
volumes:
- name: ovnkube-config
configMap:
Expand Down
38 changes: 19 additions & 19 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,24 @@ require (
github.com/go-bindata/go-bindata v3.1.2+incompatible
github.com/gophercloud/gophercloud v0.19.0
github.com/gophercloud/utils v0.0.0-20210720165645-8a3ad2ad9e70
github.com/onsi/gomega v1.20.1
github.com/openshift/api v0.0.0-20220831183848-09c070622e2c
github.com/onsi/gomega v1.24.1
github.com/openshift/api v0.0.0-20230119154305-a7b1b9651014
github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d
github.com/openshift/client-go v0.0.0-20220831193253-4950ae70c8ea
github.com/openshift/library-go v0.0.0-20220922140741-7772048e4447
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.12.2
github.com/spf13/cobra v1.4.0
github.com/prometheus/client_golang v1.14.0
github.com/spf13/cobra v1.6.1
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.0
github.com/stretchr/testify v1.7.1
github.com/vishvananda/netlink v1.1.0
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect
golang.org/x/net v0.5.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.25.2
k8s.io/apiextensions-apiserver v0.25.2
k8s.io/apimachinery v0.25.2
k8s.io/client-go v0.25.2
k8s.io/client-go v12.0.0+incompatible
k8s.io/code-generator v0.25.2
k8s.io/component-base v0.25.2
k8s.io/klog/v2 v2.80.1
Expand All @@ -38,8 +38,7 @@ require (
)

require (
cloud.google.com/go v0.97.0 // indirect
github.com/BurntSushi/toml v0.4.1 // indirect
cloud.google.com/go v0.99.0 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/PuerkitoBio/purell v1.1.1 // indirect
Expand All @@ -62,14 +61,14 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/go-cmp v0.5.8 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/huandu/xstrings v1.4.0 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
Expand All @@ -80,12 +79,12 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/openshift/hypershift v0.0.0-20220525174911-c7c2b57c98ca
github.com/openshift/hypershift v0.1.2
github.com/pkg/profile v1.3.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/robfig/cron v1.2.0 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
go.etcd.io/etcd/api/v3 v3.5.4 // indirect
Expand Down Expand Up @@ -116,7 +115,7 @@ require (
golang.org/x/tools v0.1.12 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect
google.golang.org/grpc v1.47.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
Expand All @@ -127,9 +126,8 @@ require (
k8s.io/kube-aggregator v0.25.2 // indirect
k8s.io/kube-openapi v0.0.0-20220803164354-a70c9af30aea // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 // indirect
sigs.k8s.io/cluster-api v1.1.3 // indirect
sigs.k8s.io/cluster-api-provider-aws v1.1.0 // indirect
sigs.k8s.io/cluster-api-provider-ibmcloud v0.2.0 // indirect
sigs.k8s.io/cluster-api v1.2.10 // indirect
sigs.k8s.io/cluster-api-provider-ibmcloud v0.2.4 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/kube-storage-version-migrator v0.0.4 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
Expand All @@ -140,17 +138,19 @@ require (
github.com/Masterminds/semver/v3 v3.2.0 // indirect
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/gobuffalo/flect v0.2.5 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/spf13/cast v1.5.0 // indirect
sigs.k8s.io/cluster-api-provider-aws/v2 v2.0.2 // indirect
)

replace (
github.com/openshift/hypershift/api => github.com/openshift/hypershift v0.0.0-20220323152148-c356b8b72d66

// for Hypershift
k8s.io/client-go => k8s.io/client-go v0.25.2
kubevirt.io/containerized-data-importer-api => github.com/kubevirt/containerized-data-importer-api v1.41.1-0.20211201033752-05520fb9f18d
sigs.k8s.io/apiserver-network-proxy/konnectivity-client => sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.24
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.0.0
sigs.k8s.io/cluster-api-provider-kubevirt => github.com/openshift/cluster-api-provider-kubevirt v0.0.0-20211223062810-ef64d5ff1cde
sigs.k8s.io/cluster-api-provider-openstack => github.com/openshift/cluster-api-provider-openstack v0.0.0-20220209101310-a384cbe0dfa0
)
Loading