Commit 9eb2988f authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

added user & group id to deployment configuration + updated meepctl to use uid...

added user & group id to deployment configuration + updated meepctl to use uid in prometheus chart deployment
parent 10eb448d
Loading
Loading
Loading
Loading
+9 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

version: 1.6.9
version: 1.6.10
repo:
  name: AdvantEDGE

@@ -20,6 +20,13 @@ repo:
  #  Deployment
  #------------------------------
  deployment:
    # permissions
    permissions:
      # user id
      uid: 1000
      # group id
      gid: 1000

    # user supplied resources
    user:
      # user supplied frontend UI located @ .meep/user/frontend
@@ -49,7 +56,7 @@ repo:
    auth:
      # enable authentication & authorization
      enabled: true
      # Is platform [open|secure] for all github/gitlab users or only selected ones
      # Provider-authenticated users allowed (open) or limited to user database (secure)
      provider-mode: open
      # Session config
      session:
+3 −0
Original line number Diff line number Diff line
@@ -403,6 +403,9 @@ func deployRunScriptsAndGetFlags(targetName string, chart string, cobraCmd *cobr
		flags = utils.HelmFlags(flags, "--set", "webhook.key="+key)
		flags = utils.HelmFlags(flags, "--set", "webhook.cabundle="+cabundle)
	case "meep-prometheus":
		uid := utils.RepoCfg.GetString("repo.deployment.permissions.uid")
		flags = utils.HelmFlags(flags, "--set", "alertmanager.alertmanagerSpec.securityContext.runAsUser="+uid)
		flags = utils.HelmFlags(flags, "--set", "prometheus.prometheusSpec.securityContext.runAsUser="+uid)
		flags = utils.HelmFlags(flags, "--set", "prometheus.prometheusSpec.persistentVolume.location="+deployData.workdir+"/prometheus/server/")
		flags = utils.HelmFlags(flags, "--set", "alertmanager.alertmanagerSpec.persistentVolume.location="+deployData.workdir+"/prometheus/alertmanager/")
		flags = utils.HelmFlags(flags, "--set", "nameOverride=prometheus")
+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ type versionInfo struct {
	BuildID   string `json:"build,omitempty"`
}

const meepctlVersion = "1.6.9"
const meepctlVersion = "1.6.10"
const na = "NA"

const versionDesc = `Display version information
+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import (
	yaml "gopkg.in/yaml.v2"
)

const configVersion = "1.6.9"
const configVersion = "1.6.10"

const defaultNotSet = "not set"