Skip to content

Commit 9615cbc

Browse files
vishiyganga1980rashmichandrashekarbragi92saaror
authoredOct 6, 2020
Merge from ci_dev into ci_prod (#454)
* separate build yamls for ci_prod branch (#415) * re-enable adx path (#420) * Gangams/release changes (#419) * updates related to release * updates related to release * fix the incorrect version * fix pr feedback * fix some typos in the release notes * fix for zero filled metrics (#423) * consolidate windows agent image docker files (#422) * consolidate windows agent image docker files * revert docker file consolidation * revert readme updates * merge back windows dockerfiles * image tag update * Gangams/cluster creation scripts (#414) * onprem k8s script * script updates * scripts for creating non-aks clusters * fix minor text update * updates * script updates * fix * script updates * fix scripts to install docker * fix: Pin to a particular version of ltsc2019 by SHA (#427) * enable collecting npm metrics (optionally) (#425) * enable collecting npm metrics (optionally) * fix default enrichment value * fix adx * Saaror patch 3 (#426) * Create README.MD Creating content for Kubecon lab * Update README.MD * Update README.MD * Gangams/add containerd support to windows agent (#428) * wip * wip * wip * wip * bug fix related to uri * wip * wip * fix bug with ignore cert validation * logic to ignore cert validation * minor * fix minor debug log issue * improve log message * debug message * fix bug with nullorempty check * remove debug statements * refactor parsers * add debug message * clean up * chart updates * fix formatting issues * Gangams/arc k8s metrics (#413) * cluster identity token * wip * fix exception * fix exceptions * fix exception * fix bug * fix bug * minor update * refactor the code * more refactoring * fix bug * typo fix * fix typo * wait for 1min after token renewal request * add proxy support for arc k8s mdm endpoint * avoid additional get call * minor line ending fix * wip * have separate log for arc k8s cluster identity * fix bug on creating crd resource * remove update permission since not required * fixed some bugs * fix pr feedback * remove list since its not required * fix: Reverting back to ltsc2019 tag (#429) * more kubelet metrics (#430) * more kubelet metrics * celan up new config * fix nom issue when config is empty (#432) * support multiple docker paths when docker root is updated thru knode (#433) * Gangams/doc and other related updates (#434) * bring back nodeslector changes for windows agent ds * readme updates * chart updates for azure cluster resourceid and region * set cluster region during onboarding for managed clusters * wip * fix for onboarding script * add sp support for the login * update help * add sp support for powershell * script updates for sp login * wip * wip * wip * readme updates * update the links to use ci_prod branch * fix links * fix image link * some more readme updates * add missing serviceprincipal in ps scripts (#435) * fix telemetry bug (#436) * Gangams/readmeupdates non aks 09162020 (#437) * changes for ciprod09162020 non-aks release * fix script to handle cross sub scenario * fix minor comment * fix date in version file * fix pr comments * Gangams/fix weird conflicts (#439) * separate build yamls for ci_prod branch (#415) (#416) * [Merge] dev to prod for ciprod08072020 release (#424) * separate build yamls for ci_prod branch (#415) * re-enable adx path (#420) * Gangams/release changes (#419) * updates related to release * updates related to release * fix the incorrect version * fix pr feedback * fix some typos in the release notes * fix for zero filled metrics (#423) * consolidate windows agent image docker files (#422) * consolidate windows agent image docker files * revert docker file consolidation * revert readme updates * merge back windows dockerfiles * image tag update Co-authored-by: Vishwanath <visnara@microsoft.com> Co-authored-by: rashmichandrashekar <rashmy@microsoft.com> Co-authored-by: Vishwanath <visnara@microsoft.com> Co-authored-by: rashmichandrashekar <rashmy@microsoft.com> * fix quote issue for the region (#441) * fix cpucapacity/limit bug (#442) * grwehner/pv-usage-metrics (#431) - Send persistent volume usage and capacity metrics to LA for PVs with PVCs at the pod level; config to include or exclude kube-system namespace. - Send PV usage percentage to MDM if over the configurable threshold. - Add PV usage recommended alert template. * add new custom metric regions (#444) * add new custom metric regions * fix commas * add 'Terminating' state (#443) * Gangams/sept agent release tasks (#445) * turnoff mdm nonsupported cluster types * enable validation of server cert for ai ruby http client * add kubelet operations total and total error metrics * node selector label change * label update * wip * wip * wip * revert quotes * grwehner/pv-collect-volume-name (#448) Collect and send the volume name as another tag for pvUsedBytes in InsightsMetrics, so that it can be displayed in the workload workbook. Does not affect the PV MDM metric * Changes for september agent release (#449) Moving from v1beta1 to v1 for health CRD Adding timer for zero filling Adding zero filling for PV metrics * Gangams/arc k8s related scripts, charts and doc updates (#450) * checksum annotations * script update for chart from mcr * chart updates * update chart version to match with chart release * script updates * latest chart updates * version updates for chart release * script updates * script updates * doc updates * doc updates * update comments * fix bug in ps script * fix bug in ps script * minor update * release process updates * use consistent name across scripts * use consistent names * Install CA certs from wireserver (#451) * grwehner/pv-volume-name-in-mdm (#452) Add volume name for PV to mdm dimensions and zero fill it * Release changes for 10052020 release (#453) * Release changes for 10052020 release * remove redundant kubelet metrics as part of PR feedback Co-authored-by: Ganga Mahesh Siddem <gangams@microsoft.com> Co-authored-by: rashmichandrashekar <rashmy@microsoft.com> Co-authored-by: bragi92 <kadubey@microsoft.com> Co-authored-by: saaror <31900410+saaror@users.noreply.github.com> Co-authored-by: Grace Wehner <grace.wehner@microsoft.com>
1 parent e347bb3 commit 9615cbc

File tree

74 files changed

+3281
-599
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+3281
-599
lines changed
 

‎.pipelines/push-helm-chart-as-oci-artifact.sh ‎.pipelines/push-helm-chart-to-canary-repos.sh

+13-11
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/bin/bash
2-
# push the helm chart as an OCI artifact to specified ACR
32
# working directory of this script should be charts/azuremonitor-containers
43

5-
export REPO_PATH="batch1/test/azure-monitor-containers"
4+
# note: this repo registered in arc k8s extension for canary region
5+
export REPO_PATH="public/azuremonitor/containerinsights/canary/preview/azuremonitor-containers"
6+
67
export HELM_EXPERIMENTAL_OCI=1
78

89
for ARGUMENT in "$@"
@@ -11,32 +12,33 @@ do
1112
VALUE=$(echo $ARGUMENT | cut -f2 -d=)
1213

1314
case "$KEY" in
14-
CIARCACR) CIARCACR=$VALUE ;;
15+
CIACR) CIACR=$VALUE ;;
1516
CICHARTVERSION) CHARTVERSION=$VALUE ;;
1617
*)
1718
esac
1819
done
1920

20-
echo "CI ARC K8S ACR: ${CIARCACR}"
21+
echo "CI ARC K8S ACR: ${CIACR}"
2122
echo "CI HELM CHART VERSION: ${CHARTVERSION}"
2223

2324
echo "start: read appid and appsecret"
2425
ACR_APP_ID=$(cat ~/acrappid)
2526
ACR_APP_SECRET=$(cat ~/acrappsecret)
2627
echo "end: read appid and appsecret"
2728

28-
ACR=${CIARCACR}
29+
ACR=${CIACR}
30+
31+
echo "login to acr:${ACR} using helm"
32+
helm registry login $ACR --username $ACR_APP_ID --password $ACR_APP_SECRET
2933

30-
echo "login to acr:${ACR} using oras"
31-
oras login $ACR --username $ACR_APP_ID --password $ACR_APP_SECRET
3234
echo "login to acr:${ACR} completed: ${ACR}"
3335

3436
echo "start: push the chart version: ${CHARTVERSION} to acr repo: ${ACR}"
3537

36-
echo "generate helm package"
37-
helm package .
38+
echo "save the chart locally with acr full path"
39+
helm chart save . ${ACR}/${REPO_PATH}:${CHARTVERSION}
3840

39-
echo "pushing the helm chart as an OCI artifact"
40-
oras push ${ACR}/${REPO_PATH}:${CHARTVERSION} --manifest-config /dev/null:application/vnd.unknown.config.v1+json ./azuremonitor-containers-${CHARTVERSION}.tgz:application/tar+gzip
41+
echo "pushing the helm chart to ACR: ${ACR}"
42+
helm chart push ${ACR}/${REPO_PATH}:${CHARTVERSION}
4143

4244
echo "end: push the chart version: ${CHARTVERSION} to acr repo: ${ACR}"

‎.pipelines/push-helm-chart-to-prod-repos.sh

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
#!/bin/bash
2+
# working directory of this script should be charts/azuremonitor-containers
3+
4+
# this repo used without extension public preview release
5+
export PROD_REPO_PATH="public/azuremonitor/containerinsights/preview/azuremonitor-containers"
6+
7+
# note: this repo registered in arc k8s extension for prod group1 regions.
8+
export EXTENSION_PROD_REPO_PATH="public/azuremonitor/containerinsights/prod1/preview/azuremonitor-containers"
9+
10+
export HELM_EXPERIMENTAL_OCI=1
11+
12+
for ARGUMENT in "$@"
13+
do
14+
KEY=$(echo $ARGUMENT | cut -f1 -d=)
15+
VALUE=$(echo $ARGUMENT | cut -f2 -d=)
16+
17+
case "$KEY" in
18+
CIACR) CIACR=$VALUE ;;
19+
CICHARTVERSION) CHARTVERSION=$VALUE ;;
20+
*)
21+
esac
22+
done
23+
24+
echo "CI ARC K8S ACR: ${CIACR}"
25+
echo "CI HELM CHART VERSION: ${CHARTVERSION}"
26+
27+
echo "start: read appid and appsecret"
28+
ACR_APP_ID=$(cat ~/acrappid)
29+
ACR_APP_SECRET=$(cat ~/acrappsecret)
30+
echo "end: read appid and appsecret"
31+
32+
ACR=${CIACR}
33+
34+
echo "login to acr:${ACR} using helm"
35+
helm registry login $ACR --username $ACR_APP_ID --password $ACR_APP_SECRET
36+
37+
echo "login to acr:${ACR} completed: ${ACR}"
38+
39+
echo "start: push the chart version: ${CHARTVERSION} to acr repo: ${ACR}"
40+
41+
echo "save the chart locally with acr full path: ${ACR}/${EXTENSION_PROD_REPO_PATH}:${CHARTVERSION}"
42+
helm chart save . ${ACR}/${EXTENSION_PROD_REPO_PATH}:${CHARTVERSION}
43+
44+
echo "save the chart locally with acr full path: ${ACR}/${PROD_REPO_PATH}:${CHARTVERSION}"
45+
helm chart save . ${ACR}/${PROD_REPO_PATH}:${CHARTVERSION}
46+
47+
echo "pushing the helm chart to ACR: ${ACR}/${EXTENSION_PROD_REPO_PATH}:${CHARTVERSION}"
48+
helm chart push ${ACR}/${EXTENSION_PROD_REPO_PATH}:${CHARTVERSION}
49+
50+
echo "pushing the helm chart to ACR: ${ACR}/${PROD_REPO_PATH}:${CHARTVERSION}"
51+
helm chart push ${ACR}/${PROD_REPO_PATH}:${CHARTVERSION}
52+
53+
echo "end: push the chart version: ${CHARTVERSION} to acr repo: ${ACR}"

0 commit comments

Comments
 (0)