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

Updating version to v1alpha1 from v1 #257

Merged
merged 24 commits into from
Oct 2, 2019
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
f29f02f
feat: implement keyvault controller
alexeldeib Aug 7, 2019
30d70a0
Ace's KV changes with updates
jananivMS Aug 14, 2019
f4eadbb
Added an event for the final successful provisioning
jananivMS Aug 14, 2019
4893ac3
Updated changes based on the PR comments
jananivMS Aug 19, 2019
add1b86
removing unwanted file
jananivMS Aug 19, 2019
a3f4985
making resource group name the one in the keyvault yaml
jananivMS Aug 19, 2019
145fdce
Merge branch 'jananivMS-jananiv/kvchanges'
jananivMS Aug 19, 2019
0e91b3e
Fix merge conflicts
jananivMS Aug 19, 2019
1e26f3a
need to handled unexpected error types...like validation.error (#111)
frodopwns Aug 20, 2019
f5fd2cb
refactor tests (#90)
priyakumarank Aug 21, 2019
ea86ff6
Updates to KV controller from Ace (#80) (#112)
frodopwns Aug 21, 2019
93d3fb4
Test update (#115)
frodopwns Aug 21, 2019
0dd02d0
Feat/add consumer group kind (#117)
priyakumarank Aug 22, 2019
d02a81a
Updates to README - steps for onboarding (#114)
szoio Aug 22, 2019
39b0d04
Update azure-pipelines.yaml (#119)
priyakumarank Aug 22, 2019
594c5cd
fix tests (#140)
priyakumarank Aug 26, 2019
5223da9
Devcontainer to Help Onboard New People (#142)
JasonTheDeveloper Aug 26, 2019
5b6278d
pass future where possible instead of bool (#121)
WilliamMortlMicrosoft Aug 26, 2019
15d092d
randomize the resources names used in tests (#152)
priyakumarank Aug 28, 2019
c22f7c0
Ability to Set SecretName When Creating Event Hub (#151)
JasonTheDeveloper Aug 28, 2019
4d82777
Merge branch 'master' of https://github.com/Azure/azure-service-operator
jananivMS Aug 28, 2019
95e804d
first cut of changes
jananivMS Oct 1, 2019
aee7807
Changes with version rename
jananivMS Oct 1, 2019
be583fa
merge cinflict
jananivMS Oct 2, 2019
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
12 changes: 0 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,6 @@ CRD_OPTIONS ?= "crd:trivialVersions=true"

all: manager

# Generate test certs for development
generate-test-certs:
echo "[req]" > config.txt
echo "distinguished_name = req_distinguished_name" >> config.txt
echo "[req_distinguished_name]" >> config.txt
echo "[SAN]" >> config.txt
echo "subjectAltName=DNS:azureoperator-webhook-service.azureoperator-system.svc.cluster.local" >> config.txt
openssl req -x509 -days 730 -out tls.crt -keyout tls.key -newkey rsa:4096 -subj "/CN=azureoperator-webhook-service.azureoperator-system" -config config.txt -nodes
rm -rf /tmp/k8s-webhook-server
mkdir -p /tmp/k8s-webhook-server/serving-certs
mv tls.* /tmp/k8s-webhook-server/serving-certs/

# Run API unittests
api-test: generate fmt vet manifests
TEST_USE_EXISTING_CLUSTER=false go test -v -coverprofile=coverage.txt -covermode count ./api/... 2>&1 | tee testlogs.txt
Expand Down
22 changes: 11 additions & 11 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,35 @@ domain: microsoft.com
repo: github.com/Azure/azure-service-operator
resources:
- group: azure
version: v1
version: v1alpha1
kind: Storage
- group: azure
version: v1
version: v1alpha1
kind: CosmosDB
- group: azure
version: v1
version: v1alpha1
kind: RedisCache
- group: azure
version: v1
version: v1alpha1
kind: Eventhub
- group: azure
version: v1
version: v1alpha1
kind: ResourceGroup
- group: azure
version: v1
version: v1alpha1
kind: EventhubNamespace
- group: azure
version: v1
version: v1alpha1
kind: SqlServer
- group: azure
version: v1
version: v1alpha1
kind: SqlDatabase
- group: azure
version: v1
version: v1alpha1
kind: SqlFirewallRule
- group: azure
version: v1
version: v1alpha1
kind: KeyVault
- group: azure
version: v1
version: v1alpha1
kind: ConsumerGroup
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
helpers "github.com/Azure/azure-service-operator/pkg/helpers"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
. "github.com/onsi/ginkgo"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE
*/

package v1
package v1alpha1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
helpers "github.com/Azure/azure-service-operator/pkg/helpers"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
. "github.com/onsi/ginkgo"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package v1
package v1alpha1

import (
eventhubsmanager "github.com/Azure/azure-service-operator/pkg/resourcemanager/eventhubs"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
helpers "github.com/Azure/azure-service-operator/pkg/helpers"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
. "github.com/onsi/ginkgo"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package v1
package v1alpha1

import (
resoucegroupsresourcemanager "github.com/Azure/azure-service-operator/pkg/resourcemanager/resourcegroups"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

// Package v1 contains API Schema definitions for the azure v1 API group
// Package v1alpha1 contains API Schema definitions for the azure v1alpha1 API group
// +kubebuilder:object:generate=true
// +groupName=azure.microsoft.com
package v1
package v1alpha1

import (
"k8s.io/apimachinery/pkg/runtime/schema"
Expand All @@ -25,7 +25,7 @@ import (

var (
// GroupVersion is group version used to register these objects
GroupVersion = schema.GroupVersion{Group: "azure.microsoft.com", Version: "v1"}
GroupVersion = schema.GroupVersion{Group: "azure.microsoft.com", Version: "v1alpha1"}

// SchemeBuilder is used to add go types to the GroupVersionKind scheme
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE
*/

package v1
package v1alpha1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
helpers "github.com/Azure/azure-service-operator/pkg/helpers"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
. "github.com/onsi/ginkgo"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
sql "github.com/Azure/azure-service-operator/pkg/resourcemanager/sqlclient"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
. "github.com/onsi/ginkgo"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
7 changes: 3 additions & 4 deletions api/v1/sqlserver_types.go → api/v1alpha1/sqlserver_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -26,9 +26,8 @@ import (
type SqlServerSpec struct {
// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
// Important: Run "make" to regenerate code after modifying this file
Location string `json:"location"`
ResourceGroup string `json:"resourcegroup,omitempty"`
AllowAzureServiceAccess bool `json:"allowazureserviceaccess,omitempty"`
Location string `json:"location"`
ResourceGroup string `json:"resourcegroup,omitempty"`
}

// SqlServerStatus defines the observed state of SqlServer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
. "github.com/onsi/ginkgo"
Expand Down Expand Up @@ -59,9 +59,8 @@ var _ = Describe("SqlServer", func() {
Namespace: "default",
},
Spec: SqlServerSpec{
Location: "westus",
ResourceGroup: "foo-resourcegroup",
AllowAzureServiceAccess: true,
Location: "westus",
ResourceGroup: "foo-resourcegroup",
}}

By("creating an API obj")
Expand Down
2 changes: 1 addition & 1 deletion api/v1/storage_types.go → api/v1alpha1/storage_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE
*/

package v1
package v1alpha1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion api/v1/suite_test.go → api/v1alpha1/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
"path/filepath"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.

// autogenerated by controller-gen object, do not modify manually

package v1
package v1alpha1

import (
"k8s.io/apimachinery/pkg/runtime"
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/azure.microsoft.com_consumergroups.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ spec:
type: object
type: object
versions:
- name: v1
- name: v1alpha1
served: true
storage: true
status:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/azure.microsoft.com_cosmosdbs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ spec:
type: object
type: object
versions:
- name: v1
- name: v1alpha1
served: true
storage: true
status:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ spec:
type: object
type: object
versions:
- name: v1
- name: v1alpha1
served: true
storage: true
status:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/azure.microsoft.com_eventhubs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ spec:
type: object
type: object
versions:
- name: v1
- name: v1alpha1
served: true
storage: true
status:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/azure.microsoft.com_keyvaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ spec:
type: object
type: object
versions:
- name: v1
- name: v1alpha1
served: true
storage: true
status:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/azure.microsoft.com_rediscaches.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ spec:
type: object
type: object
versions:
- name: v1
- name: v1alpha1
served: true
storage: true
status:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/azure.microsoft.com_resourcegroups.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ spec:
type: object
type: object
versions:
- name: v1
- name: v1alpha1
served: true
storage: true
status:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/azure.microsoft.com_sqldatabases.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ spec:
type: object
type: object
versions:
- name: v1
- name: v1alpha1
served: true
storage: true
status:
Expand Down
8 changes: 3 additions & 5 deletions config/crd/bases/azure.microsoft.com_sqlfirewallrules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -403,16 +403,14 @@ spec:
properties:
endipaddress:
type: string
location:
server:
description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
Important: Run "make" to regenerate code after modifying this file'
type: string
resourcegroup:
type: string
startipaddress:
type: string
required:
- location
- server
type: object
status:
description: SqlFirewallRuleStatus defines the observed state of SqlFirewallRule
Expand All @@ -427,7 +425,7 @@ spec:
type: object
type: object
versions:
- name: v1
- name: v1alpha1
served: true
storage: true
status:
Expand Down
Loading