From 2b9b3496e7b0bef2aa1092b5015502a30a7fd18e Mon Sep 17 00:00:00 2001 From: Julian Gieseke Date: Thu, 16 Jan 2020 17:33:55 +0100 Subject: [PATCH 1/3] chore: bump kommander addon --- addons/kommander/1.184.x/kommander-1.yaml | 80 +++++++++++++++++++++++ addons/opsportal/1.0.x/opsportal-1.yaml | 2 +- 2 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 addons/kommander/1.184.x/kommander-1.yaml diff --git a/addons/kommander/1.184.x/kommander-1.yaml b/addons/kommander/1.184.x/kommander-1.yaml new file mode 100644 index 00000000..82d05f96 --- /dev/null +++ b/addons/kommander/1.184.x/kommander-1.yaml @@ -0,0 +1,80 @@ +--- +apiVersion: kubeaddons.mesosphere.io/v1beta1 +kind: ClusterAddon +metadata: + name: kommander + labels: + kubeaddons.mesosphere.io/name: kommander + annotations: + catalog.kubeaddons.mesosphere.io/addon-revision: "1.184.0-1" + appversion.kubeaddons.mesosphere.io/kommander: "1.184.0" + endpoint.kubeaddons.mesosphere.io/kommander: /ops/portal/kommander/ui + appversion.kubeaddons.mesosphere.io/thanos: 0.3.9 + appversion.kubeaddons.mesosphere.io/karma: 1.4.0 + appversion.kubeaddons.mesosphere.io/kommander-grafana: 6.4.2 + endpoint.kubeaddons.mesosphere.io/thanos: /ops/portal/kommander/monitoring/query + endpoint.kubeaddons.mesosphere.io/karma: /ops/portal/kommander/monitoring/karma + endpoint.kubeaddons.mesosphere.io/kommander-grafana: "/ops/portal/kommander/monitoring/grafana" + docs.kubeaddons.mesosphere.io/thanos: "https://thanos.io/getting-started.md/" + docs.kubeaddons.mesosphere.io/karma: "https://github.com/prymitive/karma" + docs.kubeaddons.mesosphere.io/kommander-grafana: "https://grafana.com/docs/" + values.chart.helm.kubeaddons.mesosphere.io/kommander: "https://raw.githubusercontent.com/mesosphere/charts/master/stable/kommander/values.yaml" + helmv2.kubeaddons.mesosphere.io/upgrade-strategy: '[{"upgradeFrom": "<=0.1.22", "strategy": "delete"}]' +spec: + namespace: kommander + kubernetes: + minSupportedVersion: v1.15.6 + requires: + - matchLabels: + kubeaddons.mesosphere.io/name: cert-manager + cloudProvider: + - name: aws + enabled: true + - name: azure + enabled: true + - name: docker + enabled: true + - name: none + enabled: true + chartReference: + chart: kommander + repo: https://mesosphere.github.io/charts/stable + version: 0.3.14 + values: | + --- + ingress: + extraAnnotations: + traefik.ingress.kubernetes.io/priority: "2" + + kommander-cluster-lifecycle: + certificates: + issuer: + name: kubernetes-ca + kind: ClusterIssuer + konvoy: + allowUnofficialReleases: true + kubeaddonsRepository: + versionStrategy: mapped-kubernetes-version + versionMap: + 1.15.6: v1.3.0-rc.1 + 1.16.3: v1.3.0-rc.1 + 1.16.4: v1.3.0-rc.1 + + kommander-karma: + karma: + deployment: + annotations: + configmap.reloader.stakater.com/reload: kommander-kubeaddons-config + + federate: + kubeaddons: + image: + repository: "mesosphere/kubeaddons" + tag: "v0.5.3" + pullPolicy: IfNotPresent + + kubeaddons-catalog: + image: + repository: mesosphere/kubeaddons-catalog + tag: "v0.5.3" + pullPolicy: IfNotPresent diff --git a/addons/opsportal/1.0.x/opsportal-1.yaml b/addons/opsportal/1.0.x/opsportal-1.yaml index 51243478..28dcd117 100644 --- a/addons/opsportal/1.0.x/opsportal-1.yaml +++ b/addons/opsportal/1.0.x/opsportal-1.yaml @@ -26,7 +26,7 @@ spec: chartReference: chart: opsportal repo: https://mesosphere.github.io/charts/stable - version: 0.1.25 + version: 0.1.28 values: | --- landing: From 4312d3aa23609186b1bb71a00b78d79f682a3e82 Mon Sep 17 00:00:00 2001 From: Shane Utt Date: Wed, 15 Jan 2020 10:58:48 -0500 Subject: [PATCH 2/3] Go mod tidy && verify --- test/go.sum | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test/go.sum b/test/go.sum index c9214252..752f2f0c 100644 --- a/test/go.sum +++ b/test/go.sum @@ -16,6 +16,7 @@ dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBr dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4= dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU= git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= +github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-autorest/autorest v0.9.0 h1:MRvx8gncNaXJqOoLmhNjUAKh33JJF8LyxPhomEtOsjs= github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= @@ -40,6 +41,7 @@ github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3Q github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/Masterminds/sprig v2.22.0+incompatible h1:z4yfnGrZ7netVz+0EDJ0Wi+5VZCSYp4Z0m2dk6cEM60= github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= +github.com/Microsoft/go-winio v0.4.14 h1:+hMXMk01us9KgxGb7ftKQt2Xpf5hH/yky+TDA+qxleU= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= @@ -687,6 +689,7 @@ github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zV github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -761,6 +764,7 @@ github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2z github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.1/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/pat v0.0.0-20180118222023-199c85a7f6d1/go.mod h1:YeAe0gNeiNT5hoiZRI4yiOky6jVdNvfO2N6Kav/HmxY= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= @@ -947,8 +951,8 @@ github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsO github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/mesosphere/kubeaddons v0.7.2 h1:2EtU6yii2t8q3T9qQVK9vKEUWz88LudH+QSF8VKCaCc= -github.com/mesosphere/kubeaddons v0.7.2/go.mod h1:qzMUNYHzmNTtBygitG7jFeDo5jG9FZhVu0LI1STRrfM= +github.com/mesosphere/kubeaddons v0.7.3 h1:2NFFW/iOar01bKIahBZs4miVUgvmFapqqVF5d+tFaBY= +github.com/mesosphere/kubeaddons v0.7.3/go.mod h1:qzMUNYHzmNTtBygitG7jFeDo5jG9FZhVu0LI1STRrfM= github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc= github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ= @@ -973,6 +977,7 @@ github.com/monoculum/formam v0.0.0-20180901015400-4e68be1d79ba/go.mod h1:RKgILGE github.com/monoculum/formam v0.0.0-20190307031628-bc555adff0cd/go.mod h1:JKa2av1XVkGjhxdLS59nDoXa2JpmIHpnURWNbzCtXtc= github.com/monoculum/formam v0.0.0-20190730134247-0612307a4099/go.mod h1:JKa2av1XVkGjhxdLS59nDoXa2JpmIHpnURWNbzCtXtc= github.com/monoculum/formam v0.0.0-20190830100315-7ff9597b1407/go.mod h1:JKa2av1XVkGjhxdLS59nDoXa2JpmIHpnURWNbzCtXtc= +github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/mozilla/tls-observatory v0.0.0-20190404164649-a3c1b6cfecfd/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= @@ -1594,6 +1599,7 @@ gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20190905181640-827449938966/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20191026110619-0b21df46bc1d h1:LCPbGQ34PMrwad11aMZ+dbz5SAsq/0ySjRwQ8I9Qwd8= gopkg.in/yaml.v3 v3.0.0-20191026110619-0b21df46bc1d/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= From a8f2864aeac2609487873a7de96512df1045bf19 Mon Sep 17 00:00:00 2001 From: Jimmi Dyson Date: Thu, 16 Jan 2020 16:58:49 +0000 Subject: [PATCH 3/3] chore(kommander): Bump KCL chart version Remove unnecessary value overrides. --- addons/kommander/1.184.x/kommander-1.yaml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/addons/kommander/1.184.x/kommander-1.yaml b/addons/kommander/1.184.x/kommander-1.yaml index 82d05f96..51e5df2d 100644 --- a/addons/kommander/1.184.x/kommander-1.yaml +++ b/addons/kommander/1.184.x/kommander-1.yaml @@ -39,7 +39,7 @@ spec: chartReference: chart: kommander repo: https://mesosphere.github.io/charts/stable - version: 0.3.14 + version: 0.3.15 values: | --- ingress: @@ -53,12 +53,6 @@ spec: kind: ClusterIssuer konvoy: allowUnofficialReleases: true - kubeaddonsRepository: - versionStrategy: mapped-kubernetes-version - versionMap: - 1.15.6: v1.3.0-rc.1 - 1.16.3: v1.3.0-rc.1 - 1.16.4: v1.3.0-rc.1 kommander-karma: karma: @@ -66,13 +60,6 @@ spec: annotations: configmap.reloader.stakater.com/reload: kommander-kubeaddons-config - federate: - kubeaddons: - image: - repository: "mesosphere/kubeaddons" - tag: "v0.5.3" - pullPolicy: IfNotPresent - kubeaddons-catalog: image: repository: mesosphere/kubeaddons-catalog