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

Operator sdk 0.15.2 #515

Merged
merged 8 commits into from
Nov 11, 2020
Merged

Operator sdk 0.15.2 #515

merged 8 commits into from
Nov 11, 2020

Conversation

tomgeorge
Copy link
Contributor

@tomgeorge tomgeorge commented Nov 2, 2020

Changes:

  • use go 1.13 instead of 1.12
  • remove Gopkg.lock and Gopkg.toml
  • references to sigs.k8s.io/controller-runtime/pkg/runtime/signals replaced by sigs.k8s.io/controller-runtime/pkg/manager/signals
  • e2e tests: serializer.DirectCodecFactory is renamed to serializer.WithoutConversionCodecFactory
  • references to sigs.k8s.io/controller-runtime/pkg/runtime/scheme replaced by sigs.k8s.io/controller-runtime/pkg/scheme
  • remove pkg/apis/org/v1/zz_generated.openapi.go as operator-sdk generate openapi is deprecated in favor of operator-sdk generate crds
  • fix Dockerfiles in olm directory to correctly build test catalog images
  • vendoring new 0.15.2 dependencies
  • added deploy/crds/org.eclipse.che_checlusters_crd.yaml which contains the new openapi specs. I didn't delete the existing CRDs/CRs (org_v1_che_crd.yaml, org_v1_che_cr.yaml)

Paths tested

  • crc with chectl
  • minikube with chectl
  • operator upgrade with olm on minikube
  • operator upgrade with olm on crc

This is part of eclipse-che/che#18133

@tomgeorge
Copy link
Contributor Author

/retest

@tolusha
Copy link
Contributor

tolusha commented Nov 4, 2020

  • a new deploy/crds/org.eclipse.che_checlusters_crd.yaml doesn't have a license
  • we still have several references to org_v1_che_crd.yaml in bash files, pls update to use a new crd file
  • provideNewNightlyBundle.sh:
    • download link should be: https://api.github.com/repos/operator-framework/operator-sdk/releases/tags/v0.15.2

@tomgeorge
Copy link
Contributor Author

Removed org.eclipse.che_checlusters_crd.yaml and changed update-crd-files.sh to rename the newly generated crd to org_v1_che_crd.yaml

@tomgeorge
Copy link
Contributor Author

/retest

@@ -43,9 +43,9 @@ check() {
build() {
printf "%bBuilding image %b${IMAGE_NAME}${NC}..." "${BOLD}" "${BLUE}"
if docker build --build-arg OPERATOR_SDK_VERSION=${OPERATOR_SDK_VERSION} -t ${IMAGE_NAME} > docker-build-log 2>&1 -<<EOF
FROM evns/yq
FROM golang:1.14-alpine
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we use golang:1.13-alphine since we switched from 1.12 to 1.13 version ?

@@ -1,14 +1,17 @@
FROM quay.io/operator-framework/upstream-registry-builder as builder
COPY deploy manifests/eclipse-che-preview-openshift

COPY deploy manifests/eclipse-che-preview-kubernetes
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo?
It should be deploy manifests/eclipse-che-preview-openshift

COPY --from=builder /build/bin/configmap-server /bin/configmap-server
COPY --from=builder /build/bundles.db /bundles.db
COPY --from=builder /build/bin/registry-server /registry-server
COPY --from=builder /bin/initializer /initializer
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To be honest I don't understand why /build isn't necessary anymore. Could you explain pls?

Copy link
Contributor

@tolusha tolusha Nov 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

During my testing, running quay.io/operator-framework/upstream-registry-builder had moved it's artifacts out of /build

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could tag to a specific image

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this image will be updated and pinned #522 in the frame of the issue: che#18105

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that is the upstream-opm-builder image, not the upstream-registry-builder. If upstream-registry-builder is deprecated in favor of opm, this will need to be updated anyway. How often are these catalogs built with this Dockerfile? Probably not too often, as I think you would have seen these fail by now.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, sorry, I thought about another Dockerfile. This one we really could pin.

@tomgeorge
Copy link
Contributor Author

/retest

Tom George added 7 commits November 9, 2020 10:57
Signed-off-by: Tom George <tgeorge@redhat.com>
Signed-off-by: Tom George <tgeorge@redhat.com>
Signed-off-by: Tom George <tgeorge@redhat.com>
Signed-off-by: Tom George <tgeorge@redhat.com>
Signed-off-by: Tom George <tgeorge@redhat.com>
Signed-off-by: Tom George <tgeorge@redhat.com>
Signed-off-by: Tom George <tgeorge@redhat.com>
@tomgeorge
Copy link
Contributor Author

@tolusha @AndrienkoAleksandr can you reapprove?

…from new crd -> org_v1_che_crd.yaml

Signed-off-by: Tom George <tgeorge@redhat.com>
@tomgeorge
Copy link
Contributor Author

@AndrienkoAleksandr made your requested fixes

AndrienkoAleksandr
AndrienkoAleksandr approved these changes Nov 10, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: AndrienkoAleksandr, tolusha, tomgeorge
To complete the pull request process, please assign after the PR has been reviewed.
You can assign the PR to them by writing /assign in a comment when ready.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@tomgeorge
Copy link
Contributor Author

/retest

@tomgeorge
Copy link
Contributor Author

@tolusha @AndrienkoAleksandr Do you think this can this be merged today?

@AndrienkoAleksandr
Copy link
Contributor

@tolusha @AndrienkoAleksandr Do you think this can this be merged today?

+1 @tolusha ?

@tolusha
Copy link
Contributor

tolusha commented Nov 11, 2020

+1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants