Skip to content

Commit

Permalink
Update Helm chart for 1.3.0 (#1512)
Browse files Browse the repository at this point in the history
* Update Helm chart for 1.3.0

* Update pipeline to error better
  • Loading branch information
matthchr authored May 27, 2021
1 parent 7a6e709 commit b895cb4
Show file tree
Hide file tree
Showing 84 changed files with 4,681 additions and 4,530 deletions.
7 changes: 5 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ steps:
inputs:
targetType: 'inline'
script: |
set -e
kubectl delete namespace $(OPERATOR_NAMESPACE)
imagename="$(PIPELINE_CONTAINER_REGISTRY_NAME)/$(IMAGE_NAME):$(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_VERSION)"
echo $imagename
Expand All @@ -298,11 +299,14 @@ steps:
kubectl logs -n $(OPERATOR_NAMESPACE) deployment/azureoperator-controller-manager -c manager
- task: AzureCLI@2
displayName: Deploy to AKS - Clean up deployment and release cluster back to free pool
condition: or(eq(variables['check_changes.SOURCE_CODE_CHANGED'], 'true'), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
inputs:
azureSubscription: 'ASO Subscription'
scriptType: 'bash'
scriptLocation: 'inlineScript'
inlineScript: |
set -e
echo "Chosen AKS Cluster name"
echo $(chosenclustername)
# Delete CRDs to clean up cluster
Expand All @@ -315,8 +319,7 @@ steps:
az resource tag --tags 'freeforpipeline=true' -g $(AKS_CLUSTER_RG) -n $(chosenclustername) --resource-type Microsoft.ContainerService/managedClusters
workingDirectory: '$(System.DefaultWorkingDirectory)'
failOnStandardError: true
displayName: Deploy to AKS - Clean up deployment and release cluster back to free pool
condition: or(eq(variables['check_changes.SOURCE_CODE_CHANGED'], 'true'), eq(variables['Build.SourceBranch'], 'refs/heads/master'))


- task: Docker@2
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
Expand Down
Binary file added charts/azure-service-operator-1.3.0.tgz
Binary file not shown.
4 changes: 2 additions & 2 deletions charts/azure-service-operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: azure-service-operator
version: 1.2.0
appVersion: 1.0.22275
version: 1.3.0
appVersion: 1.0.23694
description: Deploy components and dependencies of azure-service-operator
home: https://github.com/Azure/azure-service-operator
sources:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,189 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.4.0
creationTimestamp: null
name: apimgmtapis.azure.microsoft.com
spec:
group: azure.microsoft.com
names:
kind: APIMgmtAPI
listKind: APIMgmtAPIList
plural: apimgmtapis
shortNames:
- apim
singular: apimgmtapi
preserveUnknownFields: false
scope: Namespaced
versions:
- additionalPrinterColumns:
- jsonPath: .status.provisioned
name: Provisioned
type: string
- jsonPath: .status.message
name: Message
type: string
name: v1alpha1
schema:
openAPIV3Schema:
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: APIMgmtSpec defines the desired state of APIMgmt
properties:
apiId:
type: string
apiService:
type: string
location:
type: string
properties:
properties:
apiRevision:
description: APIRevision - Describes the Revision of the Api.
If no value is provided, default revision 1 is created
type: string
apiRevisionDescription:
description: APIRevisionDescription - Description of the Api Revision.
type: string
apiVersion:
description: APIVersion - Indicates the Version identifier of
the API if the API is versioned
type: string
apiVersionDescription:
description: APIVersionDescription - Description of the Api Version.
type: string
apiVersionSetId:
description: APIVersionSetID - A resource identifier for the related
ApiVersionSet.
type: string
apiVersionSets:
description: APIVersionSet - APIVersionSetContractDetails an API
Version Set contains the common configuration for a set of API
versions.
properties:
description:
description: Description - Description of API Version Set.
type: string
id:
description: ID - Identifier for existing API Version Set.
Omit this value to create a new Version Set.
type: string
name:
description: Name - The display Name of the API Version Set.
type: string
type: object
description:
description: Description - Description of the API. May include
HTML formatting tags.
type: string
displayName:
description: DisplayName - API name. Must be 1 to 300 characters
long.
type: string
format:
description: " Format - Format of the Content in which the API
is getting imported. Possible values include: \t'WadlXML', 'WadlLinkJSON',
'SwaggerJSON', 'SwaggerLinkJSON', 'Wsdl', 'WsdlLink', 'Openapi',
'Openapijson', 'OpenapiLink'"
type: string
isCurrent:
description: IsCurrent - Indicates if API revision is current
api revision.
type: boolean
isOnline:
description: IsOnline - READ-ONLY; Indicates if API revision is
accessible via the gateway.
type: boolean
path:
description: " Path - Relative URL uniquely identifying this API
and all of its resource paths within the API Management service
instance. \tIt is appended to the API endpoint base URL specified
during the service instance creation to form a public URL for
this API."
type: string
protocols:
description: Protocols - Describes on which protocols the operations
in this API can be invoked.
items:
type: string
type: array
serviceUrl:
description: ServiceURL - Absolute URL of the backend service
implementing this API. Cannot be more than 2000 characters long.
type: string
sourceApiId:
description: SourceAPIID - API identifier of the source API.
type: string
subscriptionRequired:
description: SubscriptionRequired - Specifies whether an API or
Product subscription is required for accessing the API.
type: boolean
type: object
resourceGroup:
minLength: 1
pattern: ^[-\w\._\(\)]+$
type: string
required:
- apiId
- apiService
- location
- properties
- resourceGroup
type: object
status:
description: ASOStatus (AzureServiceOperatorsStatus) defines the observed
state of resource actions
properties:
completed:
format: date-time
type: string
containsUpdate:
type: boolean
failedProvisioning:
type: boolean
flattenedSecrets:
type: boolean
message:
type: string
output:
type: string
pollingUrl:
type: string
provisioned:
type: boolean
provisioning:
type: boolean
requested:
format: date-time
type: string
resourceId:
type: string
specHash:
type: string
state:
type: string
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.4.0
creationTimestamp: null
name: apimservices.azure.microsoft.com
spec:
group: azure.microsoft.com
names:
kind: ApimService
listKind: ApimServiceList
plural: apimservices
shortNames:
- apims
singular: apimservice
preserveUnknownFields: false
scope: Namespaced
versions:
- additionalPrinterColumns:
- jsonPath: .status.provisioned
name: Provisioned
type: string
- jsonPath: .status.message
name: Message
type: string
name: v1alpha1
schema:
openAPIV3Schema:
description: ApimService is the Schema for the apimservices API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: ApimServiceSpec defines the desired state of ApimService
properties:
appInsightsName:
type: string
appInsightsResourceGroup:
type: string
location:
type: string
publisherEmail:
type: string
publisherName:
type: string
resourceGroup:
type: string
tier:
description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
Important: Run "make" to regenerate code after modifying this file'
type: string
vnetName:
type: string
vnetResourceGroup:
type: string
vnetSubnetName:
type: string
vnetType:
type: string
required:
- location
- publisherEmail
- publisherName
- resourceGroup
- vnetResourceGroup
type: object
status:
description: ASOStatus (AzureServiceOperatorsStatus) defines the observed
state of resource actions
properties:
completed:
format: date-time
type: string
containsUpdate:
type: boolean
failedProvisioning:
type: boolean
flattenedSecrets:
type: boolean
message:
type: string
output:
type: string
pollingUrl:
type: string
provisioned:
type: boolean
provisioning:
type: boolean
requested:
format: date-time
type: string
resourceId:
type: string
specHash:
type: string
state:
type: string
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Loading

0 comments on commit b895cb4

Please sign in to comment.