add distributionVersion field to controlplane #77
Conversation
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: rccrdpccl The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
approved
| @@ -17,7 +17,7 @@ limitations under the License. | |||
| // Package v1beta1 contains API Schema definitions for the controlplane v1beta1 API group | |||
There was a problem hiding this comment.
Oops looks like we missed this comment the first time
| // Package v1beta1 contains API Schema definitions for the controlplane v1beta1 API group | |
| // Package v1alpha2 contains API Schema definitions for the controlplane v1alpha2 API group |
| } | ||
|
|
||
| func (m *mockOpenShiftVersioner) GetK8sVersionFromReleaseImage(ctx context.Context, releaseImage string, oacp *controlplanev1alpha2.OpenshiftAssistedControlPlane) (*string, error) { | ||
| version := "1.30.0" |
There was a problem hiding this comment.
This is the mock/dummy in the test, we are already - I can add an assertion making sure status.version is 1.30.0
the real thing is happening here https://github.com/openshift-assisted/cluster-api-agent/blob/distribution-version/controlplane/internal/controller/openshiftassistedcontrolplane_controller.go#L172
controlplane/internal/controller/openshiftassistedcontrolplane_controller.go
Show resolved
Hide resolved
controlplane/internal/controller/openshiftassistedcontrolplane_controller.go
Outdated
Show resolved
Hide resolved
Signed-off-by: Riccardo Piccoli <[email protected]>
rccrdpccl
force-pushed
the
distribution-version
branch
from
b8a3a5f to
acd0245
Compare
|
Tests and linter failing because of release golang version (will change before merging), passing in local environment |
|
/retest |
2 similar comments
|
/retest |
|
/retest |
Added spec.distributionVersion field, see kubernetes-sigs/cluster-api#11816
Added status.version field. This should reflect K8s version, which we are extracting from the release image payload
This field changes the controlplane API, so we need to release a new version: v1alpha2