From 88eb917cef3a539f81352f0f6e9794c8f572bf53 Mon Sep 17 00:00:00 2001 From: Corinne Krych Date: Fri, 26 Apr 2019 11:11:57 +0200 Subject: [PATCH 1/3] merge conflicts --- Gopkg.lock | 163 ++++++++++++------ Gopkg.toml | 28 +-- .../devconsole_v1alpha1_component_crd.yaml | 2 + .../component/component_controller.go | 24 +-- 4 files changed, 122 insertions(+), 95 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index e1e3349..66d2679 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -170,12 +170,12 @@ version = "v1.0.0" [[projects]] - digest = "1:9d66f1a0ee277ad5297c8f83116e0729aa65dba42f9a23c7ec7d84b265badde4" + digest = "1:ba38cf214bac25c2aa3ae9a007cc6f6586a2476840118cfbf4621e8d250dbc3b" name = "github.com/gliderlabs/ssh" packages = ["."] pruneopts = "NT" - revision = "4b72c663cfb315ecfb9f6be5c106c0c693ce196b" - version = "v0.1.3" + revision = "a9daacccc9f1368e52f390591d908470cee477d2" + version = "v0.1.4" [[projects]] digest = "1:d421af4c4fe51d399667d573982d663fe1fa67020a88d3ae43466ebfe8e2b5c9" @@ -307,12 +307,12 @@ version = "v1.0.0" [[projects]] - digest = "1:c37d9d96de085f7a82451b6f62352d32f92f93663373535a8f429ea1981e4a00" + digest = "1:f01e38ee53d9eab9295424e4b5c67c652ac65f4f69bf8c765a375dee02d60df5" name = "github.com/google/go-github" packages = ["github"] pruneopts = "NT" - revision = "b041e285fc4f7a936a81027c21c810cbaac2dc13" - version = "v25.0.0" + revision = "1fef44b9b427e6c43f92b2f20918e496c275393f" + version = "v25.0.2" [[projects]] digest = "1:a63cff6b5d8b95638bfe300385d93b2a6d9d687734b863da8e09dc834510a690" @@ -352,7 +352,7 @@ [[projects]] branch = "master" - digest = "1:f620c969301c9543b5a311a662615f69fbaeeb6864865df9e86a3eca560445e6" + digest = "1:eddd972c10fd51f998a000feff11ceb7df0b327c2d907f88e97f150a95543f8b" name = "github.com/gophercloud/gophercloud" packages = [ ".", @@ -364,7 +364,7 @@ "pagination", ] pruneopts = "NT" - revision = "bb98932a7b3a106e1814e0c6b7f7d48c0a71a919" + revision = "b9b92a82580638d091517faa0a8a9655657ed263" [[projects]] branch = "master" @@ -410,11 +410,11 @@ [[projects]] branch = "master" - digest = "1:c13aea0b77243f1fcd0253583c90e180010a3a5bbdf43f61a3daddc48d88b0b2" + digest = "1:b0b1cae9ff30d8c219dc64e5f8dcfbb3f5f3f10f9e67dec737ce0bc04bf31a54" name = "github.com/iancoleman/strcase" packages = ["."] pruneopts = "NT" - revision = "3605ed457bf7f8caa1371b4fafadadc026673479" + revision = "e506e3ef73653e84c592ba44aab577a46678f68c" [[projects]] digest = "1:aaa38889f11896ee3644d77e17dc7764cc47f5f3d3b488268df2af2b52541c5f" @@ -601,12 +601,12 @@ revision = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4" [[projects]] - digest = "1:e4e9e026b8e4c5630205cd0208efb491b40ad40552e57f7a646bb8a46896077b" + digest = "1:d8139b87c97ab035e546f58bb812ec6eb11518ec7dff03694e5427bc67ca7c0f" name = "github.com/peterbourgon/diskv" packages = ["."] pruneopts = "NT" - revision = "5f041e8faa004a95c88a202771f4cc3e991971e6" - version = "v2.0.1" + revision = "0be1b92a6df0e4f5cb0a5d15fb7f643d0ad93ce6" + version = "v3.0.0" [[projects]] digest = "1:14715f705ff5dfe0ffd6571d7d201dd8e921030f8070321a79380d8ca4ec1a24" @@ -658,40 +658,43 @@ [[projects]] branch = "master" - digest = "1:75f1b9f32d4d204eac68f3427bc4642453fb4fe20f1596ec058757f01dc16e7b" + digest = "1:55ff1480a5e2c800636fb8971c08e407acfb321b1002b876e3acc6725402f542" name = "github.com/prometheus/procfs" packages = ["."] pruneopts = "NT" - revision = "8368d24ba045f26503eb745b624d930cbe214c79" + revision = "87a4384529e0652f5035fb5cc8095faf73ea9b0b" [[projects]] - branch = "master" - digest = "1:22f2b1db5bf1d36b7b622aa2c726ee4179cdd5e8bfc78791c1aff93533358358" + branch = "update.version.runtime-controller" + digest = "1:4e7e746fb11821543e9616e1bdb6c91f6b8a7b3324cd4bdeffba0b678836882c" name = "github.com/redhat-developer/devconsole-api" packages = [ "pkg/apis", "pkg/apis/devconsole/v1alpha1", ] pruneopts = "NT" - revision = "e9de16b0f6bbc760546eb19e3cec6e043855f8fa" + revision = "daa8af1daeccb296ec43858844c08061a573c2ba" + source = "github.com/corinnekrych/devconsole-api" [[projects]] branch = "master" - digest = "1:8e26da08e029d2bbf9b81341c8677424333dfc569b159c60127cb1113ca950d9" + digest = "1:ffac7f9e4afb5d98b4fbb061e87ddd6ce5d1a578b6fdec9c7f7e6acad2dc4958" name = "github.com/redhat-developer/devconsole-git" packages = [ "pkg/git", + "pkg/git/connection", "pkg/git/detector", "pkg/git/detector/build", "pkg/git/repository", "pkg/git/repository/bitbucket", + "pkg/git/repository/generic", "pkg/git/repository/github", "pkg/git/repository/gitlab", "pkg/log", "pkg/test", ] pruneopts = "T" - revision = "3a6b6924d3b66d4d0f6837027d0d3424516de0c1" + revision = "e6043276a7e959284edfd7840c3d20fe84c02576" [[projects]] digest = "1:a4644e85e1f29f9825a4e61dcdd8244fe7c4db02eead3f508d5a5bdf7924dbbd" @@ -761,6 +764,14 @@ revision = "1ac3a1ac202429a54835fe8408a92880156b489d" version = "v1.4.0" +[[projects]] + digest = "1:1e756bf46ac38206112db9743c8960d0eb7a56ea8e6f4c4feb523436c8b6e59a" + name = "github.com/src-d/go-oniguruma" + packages = ["."] + pruneopts = "NT" + revision = "788303971318a98ac6d485136e6ae95d155c0876" + version = "v1.0.0" + [[projects]] digest = "1:8e8fc2cb42cfa0a18fda0c9c4034092faa7aac773da5efdde8828eb4b96c001d" name = "github.com/stretchr/testify" @@ -772,6 +783,14 @@ revision = "ffdc059bfe9ce6a4e144ba849dbedead332c6053" version = "v1.3.0" +[[projects]] + digest = "1:00dde67969c6b5ac2d7bfe189a394095d7be3adff2bb915909235cb697e05d13" + name = "github.com/toqueteos/trie" + packages = ["."] + pruneopts = "NT" + revision = "683ae57f27ac5c2afec902631ed8b9cda1d0f481" + version = "v1.0.0" + [[projects]] digest = "1:660578a0b729bd1a8b7896a8b390979659000400f4007c659c77165ae48da445" name = "github.com/xanzy/go-gitlab" @@ -848,7 +867,7 @@ [[projects]] branch = "master" - digest = "1:f8cb3167bd2a33ac306e159a8d88534dbf973569e848cb5f34de94d9bad552e8" + digest = "1:42cb67b83ea6dcb5b096d4560704c05dc8e519cb85980f13a3f93bb022dbbd19" name = "golang.org/x/crypto" packages = [ "cast5", @@ -871,11 +890,11 @@ "ssh/terminal", ] pruneopts = "NT" - revision = "f416ebab96af27ca70b6e5c23d6a0747530da626" + revision = "c05e17bb3b2dca130fc919668a96b4bec9eb9442" [[projects]] branch = "master" - digest = "1:89cf4e2680b312eb7a1b76f32c29089145b639f578b5fcef106c71ee867921f6" + digest = "1:940590250ff6229f11678ea802c15e75768bf39b6440d24025bc5bede1f40367" name = "golang.org/x/net" packages = [ "context", @@ -888,7 +907,7 @@ "trace", ] pruneopts = "NT" - revision = "1da14a5a36f220ea3f03470682b737b1dfd5de22" + revision = "4829fb13d2c62012c17688fa7f629f371014946d" [[projects]] branch = "master" @@ -906,15 +925,15 @@ [[projects]] branch = "master" - digest = "1:5a0a5ba0bb4fadf7e1c3eaaa48923e0efef23e43243e6038c426288aeef92c42" + digest = "1:bde1844fd8dff0a4ed259e24bf0e3cb91c2bc7bc3cd0a43118c6ef8f8be1b9ca" name = "golang.org/x/sync" packages = ["semaphore"] pruneopts = "NT" - revision = "56d357773e8497dfd526f0727e187720d1093757" + revision = "112230192c580c3556b8cee6403af37a4fc5f28c" [[projects]] branch = "master" - digest = "1:aded639d831ffb2df2531a0298f4bd094b56cb3a79bb212c3b7ebdf5b5f40eb0" + digest = "1:28d091370f89efd3071b5528dc5fd695b3dfb3653e02bac7490142bdeed6ce5b" name = "golang.org/x/sys" packages = [ "cpu", @@ -922,16 +941,18 @@ "windows", ] pruneopts = "NT" - revision = "12500544f89f9420afe9529ba8940bf72d294972" + revision = "16072639606ea9e22c7d86e4cbd6af6314f4193c" [[projects]] - digest = "1:8c74f97396ed63cc2ef04ebb5fc37bb032871b8fd890a25991ed40974b00cd2a" + digest = "1:348fa8283a7c60b5b71ce04d27b37f7c0fce552d4d0b463b5b3ebbd1840d3f1a" name = "golang.org/x/text" packages = [ "collate", "collate/build", "internal/colltab", "internal/gen", + "internal/language", + "internal/language/compact", "internal/tag", "internal/triegen", "internal/ucd", @@ -945,8 +966,8 @@ "width", ] pruneopts = "NT" - revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" - version = "v0.3.0" + revision = "342b2e1fbaa52c93f31447ad2c6abc048c63e475" + version = "v0.3.2" [[projects]] branch = "master" @@ -958,7 +979,7 @@ [[projects]] branch = "master" - digest = "1:3176402f98ede82da36c998ab557f60da76a1e95b9347bf00ac5336581a65b87" + digest = "1:58678e71ecf52ec3d576b5932a52d2578a879ba3f690fa0d2fecde168d214274" name = "golang.org/x/tools" packages = [ "go/ast/astutil", @@ -974,15 +995,15 @@ "internal/semver", ] pruneopts = "NT" - revision = "a5870b40385977769b3e1d711864fcd2d82bb9fd" + revision = "ad9eeb80039afa52dec461f6814f3f79c5b45c39" [[projects]] - digest = "1:568f70cf0f1cacd5fc9b9ad58aed1a42cf5348b001080dc0be69832f78819c9b" + digest = "1:81d407dcb2347a544350b7fb394e0eb065a34c75dc235fd4c6061ea72024a485" name = "google.golang.org/api" packages = ["support/bundler"] pruneopts = "NT" - revision = "0cbcb99a9ea0c8023c794b2693cbe1def82ed4d7" - version = "v0.3.2" + revision = "067bed655e9cbc26f4dbac8f8897b30756d90990" + version = "v0.4.0" [[projects]] digest = "1:711179d92dbef98932acd7afd0dab80b4cf2d97f099f3285c9ba8fa451809fec" @@ -1005,7 +1026,7 @@ [[projects]] branch = "master" - digest = "1:a252437ce08a185d70c3fc019a015b175a13c2c8e5fe5c61bbb16ed87ea5857d" + digest = "1:08676f4e20fd831dae5113b3aa175595e83275956128a090bc19b1c88987e6b7" name = "google.golang.org/genproto" packages = [ "googleapis/api/httpbody", @@ -1013,10 +1034,10 @@ "protobuf/field_mask", ] pruneopts = "NT" - revision = "d1146b9035b912113a38af3b138eb2af567b2c67" + revision = "357c62f0e4bbba7e6cc403ae09edcf3e2b9028fe" [[projects]] - digest = "1:d0908c315cebc69c64e6a21df389f50de5458c9693d95cd60c1d65b3d0806c39" + digest = "1:5761833c144990cd4ce4136a99284f5323116c9c063a1953f0bda38483a9c3cb" name = "google.golang.org/grpc" packages = [ ".", @@ -1053,8 +1074,8 @@ "tap", ] pruneopts = "NT" - revision = "236199dd5f8031d698fb64091194aecd1c3895b2" - version = "v1.20.0" + revision = "25c4f928eaa6d96443009bd842389fb4fa48664e" + version = "v1.20.1" [[projects]] digest = "1:251c1da75fcb42b706777dcf405e5c6f5b167a1f6563ab29997f654bf9a36729" @@ -1072,6 +1093,20 @@ revision = "d2d2541c53f18d2a059457998ce2876cc8e67cbf" version = "v0.9.1" +[[projects]] + digest = "1:7be7e5ed23e03578ea7df71495d2c907790fb05391cfafc21254bc384938b8e8" + name = "gopkg.in/src-d/enry.v1" + packages = [ + ".", + "data", + "data/rule", + "internal/tokenizer", + "regex", + ] + pruneopts = "NT" + revision = "ab3c26b46dfaf8281bf78f2e998111e6a40829bf" + version = "v1.7.3" + [[projects]] digest = "1:82cf9aa44a5f9fadfbce07a95aff7865752b868d0753c78f2b3a57bb330de241" name = "gopkg.in/src-d/go-billy.v4" @@ -1079,6 +1114,7 @@ ".", "helper/chroot", "helper/polyfill", + "memfs", "osfs", "util", ] @@ -1136,6 +1172,14 @@ revision = "aa6f288c256ff8baf8a7745546a9752323dc0d89" version = "v4.11.0" +[[projects]] + digest = "1:20d5d24cfd1dac53cbf730d5c9861c0792c68ae547e67fc16fa0ed0660481b0a" + name = "gopkg.in/toqueteos/substring.v1" + packages = ["."] + pruneopts = "NT" + revision = "c5f61671513240ddf5563635cc4a90e9f3ae4710" + version = "v1.0.2" + [[projects]] digest = "1:b233ad4ec87ac916e7bf5e678e98a2cb9e8b52f6de6ad3e11834fc7a71b8e3bf" name = "gopkg.in/warnings.v0" @@ -1153,7 +1197,7 @@ version = "v2.2.2" [[projects]] - digest = "1:6fa82ea248029bbbdddade20c06ab177ff6e485e5e45e48b045707415b7efd34" + digest = "1:18b9b70bdf29da610c0df032cf60ee7526a48756fa44012cc639dcb557335cbc" name = "k8s.io/api" packages = [ "admission/v1beta1", @@ -1191,7 +1235,8 @@ "storage/v1beta1", ] pruneopts = "NT" - revision = "05914d821849570fba9eacfb29466f2d8d3cd229" + revision = "5cb15d34447165a97c76ed5a60e4e99c8a01ecfe" + version = "kubernetes-1.13.4" [[projects]] digest = "1:c6f23048e162e65d586c809fd02e263e180ad157f110df17437c22517bb59a4b" @@ -1202,10 +1247,11 @@ "pkg/client/clientset/clientset/scheme", ] pruneopts = "NT" - revision = "0fe22c71c47604641d9aa352c785b7912c200562" + revision = "d002e88f6236312f0289d9d1deab106751718ff0" + version = "kubernetes-1.13.4" [[projects]] - digest = "1:15b5c41ff6faa4d0400557d4112d6337e1abc961c65513d44fce7922e32c9ca7" + digest = "1:f44b5a32a31245ea062cd397cc343bda06d75c731596589996c1f77634e653af" name = "k8s.io/apimachinery" packages = [ "pkg/api/errors", @@ -1253,10 +1299,11 @@ "third_party/forked/golang/reflect", ] pruneopts = "NT" - revision = "2b1284ed4c93a43499e781493253e2ac5959c4fd" + revision = "86fb29eff6288413d76bd8506874fddd9fccdff0" + version = "kubernetes-1.13.4" [[projects]] - digest = "1:c904a3d70131b33df36e4e51b574226b82308fc1ea66964aa21095a95d453fc9" + digest = "1:7f28bbfb5889618ab038d4d250d7adb6762aa43b2fc120a95a1cd47c68af6dd4" name = "k8s.io/client-go" packages = [ "discovery", @@ -1336,7 +1383,8 @@ "util/workqueue", ] pruneopts = "NT" - revision = "8d9ed539ba3134352c586810e749e58df4e94e4f" + revision = "b40b2a5939e43f7ffe0028ad67586b7ce50bb675" + version = "kubernetes-1.13.4" [[projects]] digest = "1:dc1ae99dcab96913d81ae970b1f7a7411a54199b14bfb17a7e86f9a56979c720" @@ -1434,7 +1482,7 @@ revision = "0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803" [[projects]] - digest = "1:06035489efbd51ccface65fc878ceeb849aba05b2f9443c8993f363fc96e80ac" + digest = "1:f27c48732f0350be071e81d971a62afb9f5f1ff686ee6cf2b5e14c9266f50741" name = "sigs.k8s.io/controller-runtime" packages = [ "pkg/cache", @@ -1449,28 +1497,31 @@ "pkg/handler", "pkg/internal/controller", "pkg/internal/controller/metrics", + "pkg/internal/log", + "pkg/internal/objectutil", "pkg/internal/recorder", "pkg/leaderelection", + "pkg/log", + "pkg/log/zap", "pkg/manager", + "pkg/manager/signals", "pkg/metrics", - "pkg/patch", "pkg/predicate", "pkg/reconcile", "pkg/recorder", "pkg/runtime/inject", "pkg/runtime/log", - "pkg/runtime/scheme", "pkg/runtime/signals", + "pkg/scheme", "pkg/source", "pkg/source/internal", + "pkg/webhook", "pkg/webhook/admission", - "pkg/webhook/admission/types", "pkg/webhook/internal/metrics", - "pkg/webhook/types", ] pruneopts = "NT" - revision = "12d98582e72927b6cd0123e2b4e819f9341ce62c" - version = "v0.1.10" + revision = "4276f3895df0acc9249f817eb86a47a3db6b7a9e" + version = "v0.2.0-alpha.0" [[projects]] digest = "1:0a14ea9a2647d064bb9d48b2de78306e74b196681efd7b654eb0b518d90c2e8d" @@ -1517,6 +1568,7 @@ "github.com/redhat-developer/devconsole-api/pkg/apis", "github.com/redhat-developer/devconsole-api/pkg/apis/devconsole/v1alpha1", "github.com/redhat-developer/devconsole-git/pkg/git", + "github.com/redhat-developer/devconsole-git/pkg/git/connection", "github.com/redhat-developer/devconsole-git/pkg/git/detector", "github.com/redhat-developer/devconsole-git/pkg/git/detector/build", "github.com/redhat-developer/devconsole-git/pkg/git/repository", @@ -1528,7 +1580,6 @@ "k8s.io/api/core/v1", "k8s.io/apimachinery/pkg/api/errors", "k8s.io/apimachinery/pkg/apis/meta/v1", - "k8s.io/apimachinery/pkg/labels", "k8s.io/apimachinery/pkg/runtime", "k8s.io/apimachinery/pkg/runtime/schema", "k8s.io/apimachinery/pkg/types", diff --git a/Gopkg.toml b/Gopkg.toml index 9a577c7..7428f2b 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -31,23 +31,19 @@ required = [ [[override]] name = "k8s.io/api" - # revision for tag "kubernetes-1.13.1" - revision = "05914d821849570fba9eacfb29466f2d8d3cd229" + version = "kubernetes-1.13.4" [[override]] name = "k8s.io/apiextensions-apiserver" - # revision for tag "kubernetes-1.13.1" - revision = "0fe22c71c47604641d9aa352c785b7912c200562" + version = "kubernetes-1.13.4" [[override]] name = "k8s.io/apimachinery" - # revision for tag "kubernetes-1.13.1" - revision = "2b1284ed4c93a43499e781493253e2ac5959c4fd" + version = "kubernetes-1.13.4" [[override]] name = "k8s.io/client-go" - # revision for tag "kubernetes-1.13.1" - revision = "8d9ed539ba3134352c586810e749e58df4e94e4f" + version = "kubernetes-1.13.4" [[override]] name = "github.com/coreos/prometheus-operator" @@ -55,12 +51,10 @@ required = [ [[override]] name = "sigs.k8s.io/controller-runtime" - version = "=v0.1.10" + version = "v0.2.0-alpha.0" [[constraint]] name = "github.com/operator-framework/operator-sdk" - # The version rule is used for a specific release and the master branch for in between releases. - # branch = "master" #osdk_branch_annotation version = "=v0.7.0" #osdk_version_annotation [[constraint]] @@ -91,10 +85,6 @@ required = [ name = "github.com/stretchr/testify" version = "1.3.0" -[[constraint]] - branch = "master" - name = "github.com/wadey/gocovmerge" - [[override]] name = "github.com/golang/protobuf" @@ -102,8 +92,6 @@ required = [ [[constraint]] name = "github.com/redhat-developer/devconsole-api" - revision = "e9de16b0f6bbc760546eb19e3cec6e043855f8fa" - packages = [ - "pkg/apis", - "pkg/apis/devconsole/v1alpha1", - ] + source = "github.com/corinnekrych/devconsole-api" + branch = "update.version.runtime-controller" + diff --git a/deploy/crds/devconsole_v1alpha1_component_crd.yaml b/deploy/crds/devconsole_v1alpha1_component_crd.yaml index 8067f76..8f5739d 100644 --- a/deploy/crds/devconsole_v1alpha1_component_crd.yaml +++ b/deploy/crds/devconsole_v1alpha1_component_crd.yaml @@ -12,6 +12,8 @@ spec: shortNames: - cp scope: Namespaced + subresources: + status: {} validation: openAPIV3Schema: properties: diff --git a/pkg/controller/component/component_controller.go b/pkg/controller/component/component_controller.go index d3c0424..b30e93a 100644 --- a/pkg/controller/component/component_controller.go +++ b/pkg/controller/component/component_controller.go @@ -13,7 +13,6 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" @@ -116,7 +115,6 @@ func (r *ReconcileComponent) Reconcile(request reconcile.Request) (reconcile.Res // Error reading the object - requeue the request/* */. return reconcile.Result{}, err } - // Checking and logging secondary resource lifecycle dcList := &v1.DeploymentConfigList{} err = r.ObserveDeploymentConfig(cp, dcList) @@ -196,15 +194,9 @@ func (r *ReconcileComponent) Reconcile(request reconcile.Request) (reconcile.Res // ObserveBuildConfig watches for secondary resource BuildConfig. func (r *ReconcileComponent) ObserveBuildConfig(cp *devconsoleapi.Component, bcList *buildv1.BuildConfigList) error { lbls := map[string]string{ - "app": cp.Name, - } - opts := client.ListOptions{ - Namespace: cp.Namespace, - LabelSelector: labels.SelectorFromSet(lbls), + "app.kubernetes.io/instance": cp.Name, } - err := r.client.List(context.TODO(), - &opts, - bcList) + err := r.client.List(context.TODO(), bcList, client.InNamespace(cp.Namespace), client.MatchingLabels(lbls)) if err != nil { log.Error(err, "failed to list existing BuildConfig") return err @@ -222,15 +214,9 @@ func (r *ReconcileComponent) ObserveBuildConfig(cp *devconsoleapi.Component, bcL // ObserveDeploymentConfig watches for secondary resource DeploymentConfig. func (r *ReconcileComponent) ObserveDeploymentConfig(cp *devconsoleapi.Component, dcList *v1.DeploymentConfigList) error { lbls := map[string]string{ - "app": cp.Name, - } - opts := client.ListOptions{ - Namespace: cp.Namespace, - LabelSelector: labels.SelectorFromSet(lbls), + "app.kubernetes.io/instance": cp.Name, } - err := r.client.List(context.TODO(), - &opts, - dcList) + err := r.client.List(context.TODO(), dcList, client.InNamespace(cp.Namespace), client.MatchingLabels(lbls)) if err != nil { log.Error(err, "failed to list existing DeploymentConfig") return err @@ -252,7 +238,7 @@ func (r *ReconcileComponent) ObserveDeploymentConfig(cp *devconsoleapi.Component func (r *ReconcileComponent) UpdateStatus(cp *devconsoleapi.Component, status string) error { if cp.Status.Phase != status { cp.Status.Phase = status - err := r.client.Update(context.TODO(), cp) + err := r.client.Status().Update(context.TODO(), cp) if err != nil { log.Error(err, "** failed to update component status **") return err From eca00647bfbdd4ea6690323989326214017c6f74 Mon Sep 17 00:00:00 2001 From: Corinne Krych Date: Mon, 29 Apr 2019 12:47:39 +0200 Subject: [PATCH 2/3] make e2e tests pass --- Gopkg.lock | 27 ++++++++++++++------------- Gopkg.toml | 4 +++- make/test.mk | 2 +- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 66d2679..812eb61 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -352,7 +352,7 @@ [[projects]] branch = "master" - digest = "1:eddd972c10fd51f998a000feff11ceb7df0b327c2d907f88e97f150a95543f8b" + digest = "1:36e1d8cbdf6853c7abf45742d49d38948e8d5d02b7c18ebf0dd07c59b233ec23" name = "github.com/gophercloud/gophercloud" packages = [ ".", @@ -364,7 +364,7 @@ "pagination", ] pruneopts = "NT" - revision = "b9b92a82580638d091517faa0a8a9655657ed263" + revision = "60507118a582789eaa9c8dcefc1374c7f5431b9b" [[projects]] branch = "master" @@ -554,7 +554,8 @@ revision = "84c2b942258aea2462e675e03aeb8eb4cb5f3c29" [[projects]] - digest = "1:674610d54812d3c36ab7861fc826176bf581a9426cc09abec0107414c17f89cd" + branch = "controller-runtime-0.2.0-alpha0-vendor" + digest = "1:e36c3a2b15891f2b517400bf85f7c0d7efa07588ecfe9101535068777bbad4ae" name = "github.com/operator-framework/operator-sdk" packages = [ "internal/pkg/scaffold", @@ -573,8 +574,8 @@ "version", ] pruneopts = "NT" - revision = "7e07b20c9e22560fb22a3295b612eae7652b8b14" - version = "v0.7.0" + revision = "74bb44b203f4f70e9ed8b9a084806fd6d5fd96e8" + source = "github.com/corinnekrych/operator-sdk" [[projects]] digest = "1:93b1d84c5fa6d1ea52f4114c37714cddd84d5b78f151b62bb101128dd51399bf" @@ -678,7 +679,7 @@ [[projects]] branch = "master" - digest = "1:ffac7f9e4afb5d98b4fbb061e87ddd6ce5d1a578b6fdec9c7f7e6acad2dc4958" + digest = "1:2940a30bb088a6caeef0f7f4271b4fffb0fce5d574377c497fd2745bb0d8a0f2" name = "github.com/redhat-developer/devconsole-git" packages = [ "pkg/git", @@ -694,7 +695,7 @@ "pkg/test", ] pruneopts = "T" - revision = "e6043276a7e959284edfd7840c3d20fe84c02576" + revision = "b5ac7c18ca5de088b4b00c7220c0f97896b4400a" [[projects]] digest = "1:a4644e85e1f29f9825a4e61dcdd8244fe7c4db02eead3f508d5a5bdf7924dbbd" @@ -867,7 +868,7 @@ [[projects]] branch = "master" - digest = "1:42cb67b83ea6dcb5b096d4560704c05dc8e519cb85980f13a3f93bb022dbbd19" + digest = "1:5f92996be2964f7a413cc8c6b7ff02e88e02db6042371b7acadc06cd9dc5a658" name = "golang.org/x/crypto" packages = [ "cast5", @@ -890,7 +891,7 @@ "ssh/terminal", ] pruneopts = "NT" - revision = "c05e17bb3b2dca130fc919668a96b4bec9eb9442" + revision = "a29dc8fdc73485234dbef99ebedb95d2eced08de" [[projects]] branch = "master" @@ -933,7 +934,7 @@ [[projects]] branch = "master" - digest = "1:28d091370f89efd3071b5528dc5fd695b3dfb3653e02bac7490142bdeed6ce5b" + digest = "1:6b6dcecf1cf3271a2b8902cab8e2fd119b68eebaacf4eb06e709def6d51bbac7" name = "golang.org/x/sys" packages = [ "cpu", @@ -941,7 +942,7 @@ "windows", ] pruneopts = "NT" - revision = "16072639606ea9e22c7d86e4cbd6af6314f4193c" + revision = "2cc0cad0ac78f3ede1f4d2b6ca16ea3038641af4" [[projects]] digest = "1:348fa8283a7c60b5b71ce04d27b37f7c0fce552d4d0b463b5b3ebbd1840d3f1a" @@ -979,7 +980,7 @@ [[projects]] branch = "master" - digest = "1:58678e71ecf52ec3d576b5932a52d2578a879ba3f690fa0d2fecde168d214274" + digest = "1:10bc5604a6f43dde4d6609ddf58820f77f1c0f99a4b6bb559a6c2a98abc3505f" name = "golang.org/x/tools" packages = [ "go/ast/astutil", @@ -995,7 +996,7 @@ "internal/semver", ] pruneopts = "NT" - revision = "ad9eeb80039afa52dec461f6814f3f79c5b45c39" + revision = "550556f78a900afacb9e8b22219f5e5b5c6106db" [[projects]] digest = "1:81d407dcb2347a544350b7fb394e0eb065a34c75dc235fd4c6061ea72024a485" diff --git a/Gopkg.toml b/Gopkg.toml index 7428f2b..8081ba6 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -55,7 +55,9 @@ required = [ [[constraint]] name = "github.com/operator-framework/operator-sdk" - version = "=v0.7.0" #osdk_version_annotation + source = "github.com/corinnekrych/operator-sdk" + #version = "=v0.7.0" #osdk_version_annotation + branch = "controller-runtime-0.2.0-alpha0-vendor" [[constraint]] name = "github.com/openshift/client-go" diff --git a/make/test.mk b/make/test.mk index 9bea224..27702d3 100644 --- a/make/test.mk +++ b/make/test.mk @@ -128,7 +128,7 @@ test-e2e-local: build-image-local $(Q)-oc create -f ./deploy/crds/devconsole_v1alpha1_gitsource_crd.yaml $(Q)-oc create -f ./deploy/service_account.yaml --namespace $(TEST_NAMESPACE) $(Q)-oc create -f ./deploy/role.yaml --namespace $(TEST_NAMESPACE) -ifeq ($(UNAME_S),Darwin ) +ifeq ($(UNAME_S),Darwin) $(Q)sed -i "" 's|REPLACE_NAMESPACE|$(TEST_NAMESPACE)|g' ./deploy/test/role_binding_test.yaml else $(Q)sed -i 's|REPLACE_NAMESPACE|$(TEST_NAMESPACE)|g' ./deploy/test/role_binding_test.yaml From 3559e22e318bcca219e9d3d445a4becc44f3155d Mon Sep 17 00:00:00 2001 From: Corinne Krych Date: Mon, 29 Apr 2019 16:56:03 +0200 Subject: [PATCH 3/3] Gopkg.lock confict --- Gopkg.lock | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 46c6ba6..b22c5b0 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -162,12 +162,12 @@ version = "v1.0.0" [[projects]] - digest = "1:ba38cf214bac25c2aa3ae9a007cc6f6586a2476840118cfbf4621e8d250dbc3b" - name = "github.com/gliderlabs/ssh" + digest = "1:d421af4c4fe51d399667d573982d663fe1fa67020a88d3ae43466ebfe8e2b5c9" + name = "github.com/go-logr/logr" packages = ["."] pruneopts = "NT" - revision = "a9daacccc9f1368e52f390591d908470cee477d2" - version = "v0.1.4" + revision = "9fb12b3b21c5415d16ac18dc5cd42c1cfdd40c4e" + version = "v0.1.0" [[projects]] digest = "1:340497a512995aa69c0add901d79a2096b3449d35a44a6f1f1115091a9f8c687" @@ -643,6 +643,7 @@ [[projects]] branch = "update.version.runtime-controller" + digest = "1:4e7e746fb11821543e9616e1bdb6c91f6b8a7b3324cd4bdeffba0b678836882c" name = "github.com/redhat-developer/devconsole-api" packages = [ "pkg/apis", @@ -653,8 +654,7 @@ source = "github.com/corinnekrych/devconsole-api" [[projects]] - branch = "master" - digest = "1:2940a30bb088a6caeef0f7f4271b4fffb0fce5d574377c497fd2745bb0d8a0f2" + digest = "1:f0988454715cc92c944f7c82089ea62de7b89e33a26233ea5acd3ef27a90989d" name = "github.com/redhat-developer/devconsole-git" packages = [ "pkg/controller/gitsource", @@ -670,7 +670,7 @@ "pkg/git/repository/gitlab", "pkg/log", ] - pruneopts = "T" + pruneopts = "NT" revision = "b5ac7c18ca5de088b4b00c7220c0f97896b4400a" [[projects]] @@ -1535,13 +1535,6 @@ "github.com/operator-framework/operator-sdk/version", "github.com/redhat-developer/devconsole-api/pkg/apis", "github.com/redhat-developer/devconsole-api/pkg/apis/devconsole/v1alpha1", - "github.com/redhat-developer/devconsole-git/pkg/git", - "github.com/redhat-developer/devconsole-git/pkg/git/connection", - "github.com/redhat-developer/devconsole-git/pkg/git/detector", - "github.com/redhat-developer/devconsole-git/pkg/git/detector/build", - "github.com/redhat-developer/devconsole-git/pkg/git/repository", - "github.com/redhat-developer/devconsole-git/pkg/log", - "github.com/redhat-developer/devconsole-git/pkg/test", "github.com/redhat-developer/devconsole-git/pkg/controller/gitsource", "github.com/redhat-developer/devconsole-git/pkg/controller/gitsourceanalysis", "github.com/stretchr/testify/assert",