-
Notifications
You must be signed in to change notification settings - Fork 1.5k
AGENT-990: Allow control planes with 5 and 4 replicas #9154
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
100 changes: 100 additions & 0 deletions
100
cmd/openshift-install/testdata/agent/image/configurations/control-plane-4-replicas.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| # Verify control plane with 4 replicas is allowed | ||
|
|
||
| exec openshift-install agent create image --dir $WORK | ||
|
|
||
| stderr 'The rendezvous host IP \(node0 IP\) is 192.168.111.20' | ||
|
|
||
| exists $WORK/agent.x86_64.iso | ||
| exists $WORK/auth/kubeconfig | ||
| exists $WORK/auth/kubeadmin-password | ||
| isocmp agent.x86_64.iso /etc/systemd/system.conf.d/10-default-env.conf expected/10-default-env.conf | ||
| isocmp agent.x86_64.iso /etc/assisted/manifests/agent-cluster-install.yaml expected/agent-cluster-install.yaml | ||
|
|
||
| -- install-config.yaml -- | ||
| apiVersion: v1 | ||
| baseDomain: test.metalkube.org | ||
| proxy: | ||
| httpProxy: http://192.168.111.1:8215 | ||
| httpsProxy: http://192.168.111.1:8215 | ||
| noProxy: 172.22.0.0/24,virthost.ostest.test.metalkube.org | ||
| controlPlane: | ||
| name: master | ||
| replicas: 4 | ||
| compute: | ||
| - name: worker | ||
| replicas: 0 | ||
| metadata: | ||
| namespace: cluster0 | ||
| name: ostest | ||
| networking: | ||
| clusterNetwork: | ||
| - cidr: 10.128.0.0/14 | ||
| hostPrefix: 23 | ||
| networkType: OVNKubernetes | ||
| machineNetwork: | ||
| - cidr: 192.168.111.0/24 | ||
| serviceNetwork: | ||
| - 172.30.0.0/16 | ||
| platform: | ||
| baremetal: | ||
| apiVips: | ||
| - 192.168.111.5 | ||
| ingressVips: | ||
| - 192.168.111.4 | ||
| sshKey: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDK6UTEydcEKzuNdPaofn8Z2DwgHqdcionLZBiPf/zIRNco++etLsat7Avv7yt04DINQd5zjxIFgG8jblaUB5E5C9ClUcMwb52GO0ay2Y9v1uBv1a4WhI3peKktAzYNk0EBMQlJtXPjRMrC9ylBPh+DsBHMu+KmDnfk7PIwyN4efC8k5kSRuPWoNdme1rz2+umU8FSmaWTHIajrbspf4GQbsntA5kuKEtDbfoNCU97o2KrRnUbeg3a8hwSjfh3u6MhlnGcg5K2Ij+zivEsWGCLKYUtE1ErqwfIzwWmJ6jnV66XCQGHf4Q1iIxqF7s2a1q24cgG2Z/iDXfqXrCIfy4P7b/Ztak3bdT9jfAdVZtdO5/r7I+O5hYhF86ayFlDWzZWP/ByiSb+q4CQbfVgK3BMmiAv2MqLHdhesmD/SmIcoOWUF6rFmRKZVFFpKpt5ATNTgUJ3JRowoXrrDruVXClUGRiCS6Zabd1rZ3VmTchaPJwtzQMdfIWISXj+Ig+C4UK0= | ||
| pullSecret: '{"auths": {"quay.io": {"auth": "c3VwZXItc2VjcmV0Cg=="}}}' | ||
|
|
||
| -- agent-config.yaml -- | ||
| apiVersion: v1alpha1 | ||
| metadata: | ||
| name: ostest | ||
| namespace: cluster0 | ||
| rendezvousIP: 192.168.111.20 | ||
|
|
||
| -- expected/10-default-env.conf -- | ||
| [Manager] | ||
| DefaultEnvironment=HTTP_PROXY="http://192.168.111.1:8215" | ||
| DefaultEnvironment=HTTPS_PROXY="http://192.168.111.1:8215" | ||
| DefaultEnvironment=NO_PROXY="172.22.0.0/24,virthost.ostest.test.metalkube.org,192.168.111.20" | ||
| -- expected/agent-cluster-install.yaml -- | ||
| apiVersion: extensions.hive.openshift.io/v1beta1 | ||
| kind: AgentClusterInstall | ||
| metadata: | ||
| creationTimestamp: null | ||
| name: ostest | ||
| namespace: cluster0 | ||
| spec: | ||
| apiVIP: 192.168.111.5 | ||
| apiVIPs: | ||
| - 192.168.111.5 | ||
| clusterDeploymentRef: | ||
| name: ostest | ||
| imageSetRef: | ||
| name: openshift-was not built correctly | ||
| ingressVIP: 192.168.111.4 | ||
| ingressVIPs: | ||
| - 192.168.111.4 | ||
| networking: | ||
| clusterNetwork: | ||
| - cidr: 10.128.0.0/14 | ||
| hostPrefix: 23 | ||
| machineNetwork: | ||
| - cidr: 192.168.111.0/24 | ||
| networkType: OVNKubernetes | ||
| serviceNetwork: | ||
| - 172.30.0.0/16 | ||
| userManagedNetworking: false | ||
| platformType: BareMetal | ||
| provisionRequirements: | ||
| controlPlaneAgents: 4 | ||
| proxy: | ||
| httpProxy: http://192.168.111.1:8215 | ||
| httpsProxy: http://192.168.111.1:8215 | ||
| noProxy: 172.22.0.0/24,virthost.ostest.test.metalkube.org | ||
| sshPublicKey: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDK6UTEydcEKzuNdPaofn8Z2DwgHqdcionLZBiPf/zIRNco++etLsat7Avv7yt04DINQd5zjxIFgG8jblaUB5E5C9ClUcMwb52GO0ay2Y9v1uBv1a4WhI3peKktAzYNk0EBMQlJtXPjRMrC9ylBPh+DsBHMu+KmDnfk7PIwyN4efC8k5kSRuPWoNdme1rz2+umU8FSmaWTHIajrbspf4GQbsntA5kuKEtDbfoNCU97o2KrRnUbeg3a8hwSjfh3u6MhlnGcg5K2Ij+zivEsWGCLKYUtE1ErqwfIzwWmJ6jnV66XCQGHf4Q1iIxqF7s2a1q24cgG2Z/iDXfqXrCIfy4P7b/Ztak3bdT9jfAdVZtdO5/r7I+O5hYhF86ayFlDWzZWP/ByiSb+q4CQbfVgK3BMmiAv2MqLHdhesmD/SmIcoOWUF6rFmRKZVFFpKpt5ATNTgUJ3JRowoXrrDruVXClUGRiCS6Zabd1rZ3VmTchaPJwtzQMdfIWISXj+Ig+C4UK0= | ||
| status: | ||
| debugInfo: | ||
| eventsURL: "" | ||
| logsURL: "" | ||
| progress: | ||
| totalPercentage: 0 |
100 changes: 100 additions & 0 deletions
100
cmd/openshift-install/testdata/agent/image/configurations/control-plane-5-replicas.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| # Verify control plane with 5 replicas is allowed | ||
|
|
||
| exec openshift-install agent create image --dir $WORK | ||
|
|
||
| stderr 'The rendezvous host IP \(node0 IP\) is 192.168.111.20' | ||
|
|
||
| exists $WORK/agent.x86_64.iso | ||
| exists $WORK/auth/kubeconfig | ||
| exists $WORK/auth/kubeadmin-password | ||
| isocmp agent.x86_64.iso /etc/systemd/system.conf.d/10-default-env.conf expected/10-default-env.conf | ||
| isocmp agent.x86_64.iso /etc/assisted/manifests/agent-cluster-install.yaml expected/agent-cluster-install.yaml | ||
|
|
||
| -- install-config.yaml -- | ||
| apiVersion: v1 | ||
| baseDomain: test.metalkube.org | ||
| proxy: | ||
| httpProxy: http://192.168.111.1:8215 | ||
| httpsProxy: http://192.168.111.1:8215 | ||
| noProxy: 172.22.0.0/24,virthost.ostest.test.metalkube.org | ||
| controlPlane: | ||
| name: master | ||
| replicas: 5 | ||
| compute: | ||
| - name: worker | ||
| replicas: 0 | ||
| metadata: | ||
| namespace: cluster0 | ||
| name: ostest | ||
| networking: | ||
| clusterNetwork: | ||
| - cidr: 10.128.0.0/14 | ||
| hostPrefix: 23 | ||
| networkType: OVNKubernetes | ||
| machineNetwork: | ||
| - cidr: 192.168.111.0/24 | ||
| serviceNetwork: | ||
| - 172.30.0.0/16 | ||
| platform: | ||
| baremetal: | ||
| apiVips: | ||
| - 192.168.111.5 | ||
| ingressVips: | ||
| - 192.168.111.4 | ||
| sshKey: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDK6UTEydcEKzuNdPaofn8Z2DwgHqdcionLZBiPf/zIRNco++etLsat7Avv7yt04DINQd5zjxIFgG8jblaUB5E5C9ClUcMwb52GO0ay2Y9v1uBv1a4WhI3peKktAzYNk0EBMQlJtXPjRMrC9ylBPh+DsBHMu+KmDnfk7PIwyN4efC8k5kSRuPWoNdme1rz2+umU8FSmaWTHIajrbspf4GQbsntA5kuKEtDbfoNCU97o2KrRnUbeg3a8hwSjfh3u6MhlnGcg5K2Ij+zivEsWGCLKYUtE1ErqwfIzwWmJ6jnV66XCQGHf4Q1iIxqF7s2a1q24cgG2Z/iDXfqXrCIfy4P7b/Ztak3bdT9jfAdVZtdO5/r7I+O5hYhF86ayFlDWzZWP/ByiSb+q4CQbfVgK3BMmiAv2MqLHdhesmD/SmIcoOWUF6rFmRKZVFFpKpt5ATNTgUJ3JRowoXrrDruVXClUGRiCS6Zabd1rZ3VmTchaPJwtzQMdfIWISXj+Ig+C4UK0= | ||
| pullSecret: '{"auths": {"quay.io": {"auth": "c3VwZXItc2VjcmV0Cg=="}}}' | ||
|
|
||
| -- agent-config.yaml -- | ||
| apiVersion: v1alpha1 | ||
| metadata: | ||
| name: ostest | ||
| namespace: cluster0 | ||
| rendezvousIP: 192.168.111.20 | ||
|
|
||
| -- expected/10-default-env.conf -- | ||
| [Manager] | ||
| DefaultEnvironment=HTTP_PROXY="http://192.168.111.1:8215" | ||
| DefaultEnvironment=HTTPS_PROXY="http://192.168.111.1:8215" | ||
| DefaultEnvironment=NO_PROXY="172.22.0.0/24,virthost.ostest.test.metalkube.org,192.168.111.20" | ||
| -- expected/agent-cluster-install.yaml -- | ||
| apiVersion: extensions.hive.openshift.io/v1beta1 | ||
| kind: AgentClusterInstall | ||
| metadata: | ||
| creationTimestamp: null | ||
| name: ostest | ||
| namespace: cluster0 | ||
| spec: | ||
| apiVIP: 192.168.111.5 | ||
| apiVIPs: | ||
| - 192.168.111.5 | ||
| clusterDeploymentRef: | ||
| name: ostest | ||
| imageSetRef: | ||
| name: openshift-was not built correctly | ||
| ingressVIP: 192.168.111.4 | ||
| ingressVIPs: | ||
| - 192.168.111.4 | ||
| networking: | ||
| clusterNetwork: | ||
| - cidr: 10.128.0.0/14 | ||
| hostPrefix: 23 | ||
| machineNetwork: | ||
| - cidr: 192.168.111.0/24 | ||
| networkType: OVNKubernetes | ||
| serviceNetwork: | ||
| - 172.30.0.0/16 | ||
| userManagedNetworking: false | ||
| platformType: BareMetal | ||
| provisionRequirements: | ||
| controlPlaneAgents: 5 | ||
| proxy: | ||
| httpProxy: http://192.168.111.1:8215 | ||
| httpsProxy: http://192.168.111.1:8215 | ||
| noProxy: 172.22.0.0/24,virthost.ostest.test.metalkube.org | ||
| sshPublicKey: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDK6UTEydcEKzuNdPaofn8Z2DwgHqdcionLZBiPf/zIRNco++etLsat7Avv7yt04DINQd5zjxIFgG8jblaUB5E5C9ClUcMwb52GO0ay2Y9v1uBv1a4WhI3peKktAzYNk0EBMQlJtXPjRMrC9ylBPh+DsBHMu+KmDnfk7PIwyN4efC8k5kSRuPWoNdme1rz2+umU8FSmaWTHIajrbspf4GQbsntA5kuKEtDbfoNCU97o2KrRnUbeg3a8hwSjfh3u6MhlnGcg5K2Ij+zivEsWGCLKYUtE1ErqwfIzwWmJ6jnV66XCQGHf4Q1iIxqF7s2a1q24cgG2Z/iDXfqXrCIfy4P7b/Ztak3bdT9jfAdVZtdO5/r7I+O5hYhF86ayFlDWzZWP/ByiSb+q4CQbfVgK3BMmiAv2MqLHdhesmD/SmIcoOWUF6rFmRKZVFFpKpt5ATNTgUJ3JRowoXrrDruVXClUGRiCS6Zabd1rZ3VmTchaPJwtzQMdfIWISXj+Ig+C4UK0= | ||
| status: | ||
| debugInfo: | ||
| eventsURL: "" | ||
| logsURL: "" | ||
| progress: | ||
| totalPercentage: 0 |
2 changes: 1 addition & 1 deletion
2
...nshift-install/testdata/agent/image/validations/compact_invalid_controlPlane_replicas.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| # Control Plane Replicas | ||
|
|
||
| The number of control plane replicas are either set in install-config.yaml or agent-cluster-install.yaml if ZTP manifests are used. | ||
|
|
||
| install-config.yaml | ||
| ``` | ||
| controlPlane: | ||
| name: master | ||
| replicas: 3 | ||
| ``` | ||
|
|
||
| agent-cluster-install.yaml | ||
| ``` | ||
| spec: | ||
| provisionRequirements: | ||
| controlPlaneAgents: 3 | ||
| ``` | ||
|
|
||
| # 4.18 update | ||
|
|
||
| Starting with 4.18, replicas of 5, 4, 3, or 1 are supported. | ||
|
|
||
| # Prior to 4.18 | ||
|
|
||
| Only control plane replicas of either 3 or 1 are supported. | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(and very likely we'll have to remove the
2case after #9159 will land)