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.

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

Jump to bottom

fix(unit): Fix minor unit test bug and update local cluster to k8s 1.16 #1147

Merged
merged 2 commits into from
Nov 22, 2019
Merged

fix(unit): Fix minor unit test bug and update local cluster to k8s 1.16 #1147

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
b0be45d
Update k8s version for local cluster (1.16.2)
dinhxuanvu Nov 22, 2019
a401ca2
Fix minor namespace bug with NewFakeOperator
dinhxuanvu Nov 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/controller/operators/catalog/operator_test.go
View file
Open in desktop
Expand Up @@ -512,7 +512,7 @@ func TestSyncCatalogSources(t *testing.T) {
Namespace: "cool-namespace",
UID: types.UID("configmap-uid"),
ResourceVersion: "resource-version",
LastUpdateTime: now,
LastUpdateTime: now,
},
RegistryServiceStatus: nil,
},
Expand Down Expand Up @@ -854,7 +854,7 @@ func NewFakeOperator(ctx context.Context, namespace string, watchedNamespaces []
var sharedInformers []cache.SharedIndexInformer
for _, ns := range watchedNamespaces {
if ns != namespace {
_, err := opClientFake.KubernetesInterface().CoreV1().Namespaces().Create(&corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: namespace}})
_, err := opClientFake.KubernetesInterface().CoreV1().Namespaces().Create(&corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: ns}})
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -917,7 +917,7 @@ func NewFakeOperator(ctx context.Context, namespace string, watchedNamespaces []
reconciler: config.reconciler,
clientAttenuator: scoped.NewClientAttenuator(logger, &rest.Config{}, opClientFake, clientFake),
serviceAccountQuerier: scoped.NewUserDefinedServiceAccountQuerier(logger, clientFake),
catsrcQueueSet: queueinformer.NewEmptyResourceQueueSet(),
catsrcQueueSet: queueinformer.NewEmptyResourceQueueSet(),
}
op.sources = grpc.NewSourceStore(config.logger, 1*time.Second, 5*time.Second, op.syncSourceState)
if op.reconciler == nil {
Expand Down
2 changes: 1 addition & 1 deletion scripts/build_local.sh
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
set -e

if [ -z "$NO_MINIKUBE" ]; then
pgrep -f "[m]inikube" >/dev/null || minikube start --kubernetes-version="v1.14.2" --extra-config=apiserver.v=4 || { echo 'Cannot start minikube.'; exit 1; }
pgrep -f "[m]inikube" >/dev/null || minikube start --kubernetes-version="v1.16.2" --extra-config=apiserver.v=4 || { echo 'Cannot start minikube.'; exit 1; }
eval "$(minikube docker-env)" || { echo 'Cannot switch to minikube docker'; exit 1; }
kubectl config use-context minikube
fi
Expand Down