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

Removed the SQL server controller test which is failing pipeline tests #160

Merged
merged 28 commits into from
Aug 29, 2019

Conversation

jananivMS
Copy link
Contributor

Removed the sql server controller test that is failing and causing pipeline tests to fail. Not sure how it snuck in. Also fixed the issues from the merge conflict.

Special notes for your reviewer:

If applicable:

  • this PR contains documentation
  • this PR contains tests

alexeldeib and others added 25 commits August 6, 2019 22:56
* improve tests with parallel execution and rm sleep

* fix the tests to run on kindcluster
* feat: implement keyvault controller

* Ace's KV changes with updates

* Added an event for the final successful provisioning

* Updated changes based on the PR comments

* removing unwanted file

* making resource group name the one in the keyvault yaml

Co-authored-by: Ace Eldeib <[email protected]>
* this needs to exist in the reconciler in order to use controllerutil createorupdate
* add consumer group kind

* update tests for consumer group

* fix isbeingdeleted
* cluster additions

* updated docs
* Update azure-pipelines.yaml
* revert back // +kubebuilder:subresource:status changes - fix broken tests
* add dev conatiner - wip

* DevContainer up and running.

* Removed `sleep 80` and replaced with `kubectl wait`.

* Run `make set-kindcluster` from docker-compose.

* Set timeout on wait.

* Added `install-test-dependency` to makefile and dockerfile.

* Update README - Create SP with contribution rights.

* Updated README with details on using devcontainer.

* Stuff that wanted me to commit.

* Reverted changes made to `docker-build` in Makefile.
* first commit on Amanda's branch

* first

* before properties

* test not tested

* test works

* unit tests work, needs firewall rules

* addresses feedback

* erin's feedback

* janani's change, pass future

* async works much better now

* janani feedback

* screwed up interface prototype
* Updated eventhub_types - Added `secretName`.

* Added `secretName` to sample manifest.

* Set secret name to `secretName` if set, otherwise use eventhub name.

* Updated Makefile to update Azure Operator.

Also added the ability to rebuild image without cache.

* Updated README on how to update the Azure Operator.

* Updated CRD with SecretName description.

* Added tests to ensure `SecretName` was being used if present.

* Fix test.
 Please enter the commit message for your changes. Lines starting
Copy link
Contributor

@frodopwns frodopwns left a comment

Choose a reason for hiding this comment

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

missed some of the merge conflict markers

@@ -9,7 +9,11 @@ rules:
- apiGroups:
- azure.microsoft.com
resources:
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

this shouldn't be here

@@ -9,7 +9,11 @@ rules:
- apiGroups:
- azure.microsoft.com
resources:
<<<<<<< HEAD
- keyvaults
=======
Copy link
Contributor

Choose a reason for hiding this comment

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

nope

- consumergroups
>>>>>>> e97fb2d780445d7ccff2ea0548be8823d4b0c2fb
Copy link
Contributor

Choose a reason for hiding this comment

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

whoops!

Copy link
Contributor

@frodopwns frodopwns left a comment

Choose a reason for hiding this comment

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

markers

@@ -21,15 +25,39 @@ rules:
- apiGroups:
- azure.microsoft.com
resources:
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

merge conflict markers

- ""
resources:
- secrets
=======
Copy link
Contributor

Choose a reason for hiding this comment

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

nope

- resourcegroups/status
>>>>>>> e97fb2d780445d7ccff2ea0548be8823d4b0c2fb
Copy link
Contributor

Choose a reason for hiding this comment

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

remove

verbs:
- get
- patch
- update
- apiGroups:
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

remove

verbs:
- get
- patch
- update
- apiGroups:
<<<<<<< HEAD
- azure.microsoft.com
=======
Copy link
Contributor

Choose a reason for hiding this comment

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

remove

- ""
>>>>>>> e97fb2d780445d7ccff2ea0548be8823d4b0c2fb
Copy link
Contributor

Choose a reason for hiding this comment

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

removve

@@ -59,6 +91,11 @@ rules:
- update
- watch
- apiGroups:
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

remove

- azure.microsoft.com
resources:
- eventhubnamespaces/status
=======
Copy link
Contributor

Choose a reason for hiding this comment

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

remove

@@ -69,22 +106,31 @@ rules:
- apps
resources:
- deployments/status
>>>>>>> e97fb2d780445d7ccff2ea0548be8823d4b0c2fb
Copy link
Contributor

Choose a reason for hiding this comment

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

remove

Copy link
Contributor

@frodopwns frodopwns left a comment

Choose a reason for hiding this comment

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

lgtm

@jananivMS jananivMS merged commit 054ee64 into Azure:azure-sql Aug 29, 2019
@jananivMS jananivMS deleted the azuresqlsrvtest branch August 29, 2019 22:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants