Skip to content

Commit

Permalink
Merge branch 'main' into calcha-main
Browse files Browse the repository at this point in the history
  • Loading branch information
calvinsID committed Apr 12, 2022
2 parents 5afc2b1 + 520b2ae commit 77dcaa0
Show file tree
Hide file tree
Showing 176 changed files with 7,805 additions and 15,355 deletions.
2 changes: 0 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,6 @@

/src/ssh/ @rlrossiter @danybeam @fengzhou-msft @N6UDP

/src/k8sconfiguration/ @NarayanThiru @jonathan-innis

/src/k8s-configuration/ @NarayanThiru @jonathan-innis

/src/k8s-extension/ @NarayanThiru @jonathan-innis
Expand Down
32 changes: 17 additions & 15 deletions src/aks-preview/azext_aks_preview/deploymentyaml/aks-periscope.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Namespace
metadata:
name: aks-periscope
---
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: diagnostics.aks-periscope.azure.github.com
Expand All @@ -16,19 +16,21 @@ spec:
- apd
singular: diagnostic
scope: Namespaced
validation:
openAPIV3Schema:
properties:
spec:
properties:
dns:
type: string
networkoutbound:
type: string
type: object
type: object
versions:
- name: v1
schema:
openAPIV3Schema:
properties:
spec:
properties:
dns:
type: string
networkoutbound:
type: string
networkconfig:
type: string
type: object
type: object
served: true
storage: true
---
Expand Down Expand Up @@ -193,7 +195,7 @@ spec:
name: etcvmlog
hostPID: true
nodeSelector:
beta.kubernetes.io/os: linux
kubernetes.io/os: linux
serviceAccountName: aks-periscope-service-account
volumes:
- hostPath:
Expand All @@ -202,6 +204,6 @@ spec:
- hostPath:
path: /run/systemd/resolve
name: resolvlog
- name: etcvmlog
hostPath:
- hostPath:
path: /etc
name: etcvmlog
4 changes: 4 additions & 0 deletions src/application-insights/HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
Release History
===============
0.1.16
++++++++++++++++++
* `az monitor app-insights query`: Fix application could not be found.

0.1.15
++++++++++++++++++
* `az monitor app-insights web-test`: Create/list/update/show/delete Application Insights Web Test.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ def applicationinsights_data_plane_client(cli_ctx, _, subscription=None):
resource=cli_ctx.cloud.endpoints.app_insights_resource_id,
subscription_id=subscription
)
return ApplicationInsightsDataClient(cred)
return ApplicationInsightsDataClient(
cred,
base_url=f'{cli_ctx.cloud.endpoints.app_insights_resource_id}/v1'
)


def applicationinsights_mgmt_plane_client(cli_ctx, **kwargs):
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/application-insights/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from codecs import open
from setuptools import setup, find_packages

VERSION = "0.1.15"
VERSION = "0.1.16"

CLASSIFIERS = [
'Development Status :: 4 - Beta',
Expand Down
Loading

0 comments on commit 77dcaa0

Please sign in to comment.