Skip to content

cvo: allow all GVKs during render, skip unknown manifests during sync. #22

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
openshift-merge-robot merged 2 commits into from
Sep 26, 2018
Merged

cvo: allow all GVKs during render, skip unknown manifests during sync. #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c830bc1
cvo: allow all GVKs during render, skip unknown manifests during sync.
abhinavdahiya Sep 26, 2018
6fab382
hack: fix hack scripts
abhinavdahiya Sep 26, 2018
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
2 changes: 1 addition & 1 deletion hack/build-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ if [ -z ${VERSION+a} ]; then
fi

set -x
podman build -t "cluster-version-operator:${VERSION}" -f Dockerfile
podman build -t "cluster-version-operator:${VERSION}" -f Dockerfile --no-cache
5 changes: 5 additions & 0 deletions hack/push-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

set -eu


function print_info {
echo "INFO: $1" >&2
}

REPO=${REPO:-"openshift"}

if [ -z ${VERSION+a} ]; then
Expand Down
10 changes: 3 additions & 7 deletions pkg/cvo/render.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ import (
"fmt"
"io/ioutil"
"path/filepath"
"strings"
"text/template"

"github.com/openshift/cluster-version-operator/lib/resourcebuilder"

"github.com/golang/glog"
batchv1 "k8s.io/api/batch/v1"
batchv1beta1 "k8s.io/api/batch/v1beta1"
Expand Down Expand Up @@ -44,11 +43,8 @@ func Render(outputDir, releaseImage string) error {
continue
}

if !resourcebuilder.Mapper.Exists(manifest.GVK) {
return fmt.Errorf("error: Unknown GVK: %v; Operator will not be able to manage this Manifest %s", manifest.GVK, mname)
}

path := filepath.Join(outputDir, fmt.Sprintf("%03d-manifest.json", idx))
filename := strings.ToLower(fmt.Sprintf("%03d-%s-%s-%s-%s-%s", idx, manifest.GVK.Group, manifest.GVK.Version, manifest.GVK.Kind, manifest.Object().GetNamespace(), manifest.Object().GetName()))
path := filepath.Join(outputDir, filename)
if err := ioutil.WriteFile(path, manifest.Raw, 0644); err != nil {
errs = append(errs, err)
}
Expand Down
9 changes: 9 additions & 0 deletions pkg/cvo/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,15 @@ func (optr *Operator) syncUpdatePayload(config *cvv1.CVOConfig, payload *updateP
taskName := fmt.Sprintf("(%s) %s/%s", manifest.GVK.String(), manifest.Object().GetNamespace(), manifest.Object().GetName())
glog.V(4).Infof("Running sync for %s", taskName)
glog.V(4).Infof("Manifest: %s", string(manifest.Raw))

// FIXME: skip manifests that CVO doesn't know how to handle for now.
// such manifests should be handled by a generic resourcebuilder that
// can mimic behavior of `kubectl apply` in terms of replace.
if !resourcebuilder.Mapper.Exists(manifest.GVK) {
glog.Info("Cannot handle %s as it is currently unsupported, skipping for now", taskName)
continue
}

b, err := resourcebuilder.New(resourcebuilder.Mapper, optr.restConfig, manifest)
if err != nil {
return fmt.Errorf("error creating New resourcebuilder for %s: %v", taskName, err)
Expand Down