From dba505296618beecb2cef66adaf10c209e8c0970 Mon Sep 17 00:00:00 2001 From: Abhishek Kondur Date: Thu, 8 Dec 2022 09:38:23 +0530 Subject: [PATCH] resolve conflicts --- k8s/client/netclient.yaml | 4 -- k8s/server/netmaker-ui.yaml | 4 -- netclient/netclient.exe.manifest.xml | 4 -- scripts/nm-quick-interactive.sh | 97 ---------------------------- 4 files changed, 109 deletions(-) diff --git a/k8s/client/netclient.yaml b/k8s/client/netclient.yaml index 18ae287a..ca6bd0c4 100644 --- a/k8s/client/netclient.yaml +++ b/k8s/client/netclient.yaml @@ -28,11 +28,7 @@ spec: # - "" containers: - name: netclient -<<<<<<< HEAD image: gravitl/netclient:v0.17.0 -======= - image: gravitl/netclient:v0.16.3 ->>>>>>> 407c6ed20a427153acb4901db7e61d3016823cc4 env: - name: TOKEN value: "TOKEN_VALUE" diff --git a/k8s/server/netmaker-ui.yaml b/k8s/server/netmaker-ui.yaml index 5d95e2c0..4d5944e6 100644 --- a/k8s/server/netmaker-ui.yaml +++ b/k8s/server/netmaker-ui.yaml @@ -15,11 +15,7 @@ spec: spec: containers: - name: netmaker-ui -<<<<<<< HEAD image: gravitl/netmaker-ui:v0.17.0 -======= - image: gravitl/netmaker-ui:v0.16.3 ->>>>>>> 407c6ed20a427153acb4901db7e61d3016823cc4 ports: - containerPort: 443 env: diff --git a/netclient/netclient.exe.manifest.xml b/netclient/netclient.exe.manifest.xml index 5ad93770..0db144e5 100644 --- a/netclient/netclient.exe.manifest.xml +++ b/netclient/netclient.exe.manifest.xml @@ -1,11 +1,7 @@ >>>>>> 407c6ed20a427153acb4901db7e61d3016823cc4 processorArchitecture="*" name="netclient.exe" type="win32" diff --git a/scripts/nm-quick-interactive.sh b/scripts/nm-quick-interactive.sh index 05da0c43..4f942683 100644 --- a/scripts/nm-quick-interactive.sh +++ b/scripts/nm-quick-interactive.sh @@ -17,14 +17,11 @@ cat << "EOF" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - EOF -<<<<<<< HEAD if [ $(id -u) -ne 0 ]; then echo "This script must be run as root" exit 1 fi -======= ->>>>>>> 407c6ed20a427153acb4901db7e61d3016823cc4 if [ -z "$1" ]; then echo "-----------------------------------------------------" echo "Would you like to install Netmaker Community Edition (CE), or Netmaker Enterprise Edition (EE)?" @@ -69,24 +66,12 @@ confirm() {( read -p 'Does everything look right? [y/n]: ' yn case $yn in [Yy]* ) override="true"; break;; -<<<<<<< HEAD [Nn]* ) echo "exiting..."; exit 1;; -======= - [Nn]* ) echo "exiting..."; exit;; ->>>>>>> 407c6ed20a427153acb4901db7e61d3016823cc4 * ) echo "Please answer yes or no.";; esac done )} -<<<<<<< HEAD -======= -if [ $(id -u) -ne 0 ]; then - echo "This script must be run as root" - exit 1 -fi - ->>>>>>> 407c6ed20a427153acb4901db7e61d3016823cc4 echo "checking dependencies..." OS=$(uname) @@ -139,12 +124,9 @@ if [ -z "${install_cmd}" ]; then fi set -- $dependencies -<<<<<<< HEAD ${update_cmd} -======= ->>>>>>> 407c6ed20a427153acb4901db7e61d3016823cc4 while [ -n "$1" ]; do if [ "${OS}" = "FreeBSD" ]; then is_installed=$(pkg check -d $1 | grep "Checking" | grep "done") @@ -207,22 +189,12 @@ COREDNS_IP=$(ip route get 1 | sed -n 's/^.*src \([0-9.]*\) .*$/\1/p') SERVER_PUBLIC_IP=$(curl -s ifconfig.me) MASTER_KEY=$(tr -dc A-Za-z0-9 >>>>>> 407c6ed20a427153acb4901db7e61d3016823cc4 select domain_option in "Auto Generated ($NETMAKER_BASE_DOMAIN)" "Custom Domain (e.x: netmaker.example.com)"; do case $REPLY in 1) @@ -240,15 +212,9 @@ select domain_option in "Auto Generated ($NETMAKER_BASE_DOMAIN)" "Custom Domain *) echo "invalid option $REPLY";; esac done -<<<<<<< HEAD wait_seconds 2 -======= - -wait_seconds 2 - ->>>>>>> 407c6ed20a427153acb4901db7e61d3016823cc4 echo "-----------------------------------------------------" echo "The following subdomains will be used:" echo " dashboard.$NETMAKER_BASE_DOMAIN" @@ -259,7 +225,6 @@ if [ "$INSTALL_TYPE" = "ee" ]; then echo " prometheus.$NETMAKER_BASE_DOMAIN" echo " netmaker-exporter.$NETMAKER_BASE_DOMAIN" echo " grafana.$NETMAKER_BASE_DOMAIN" -<<<<<<< HEAD fi echo "-----------------------------------------------------" @@ -301,45 +266,6 @@ if [ -z "$GET_EMAIL" ]; then else EMAIL="$GET_EMAIL" fi -======= -fi - -echo "-----------------------------------------------------" - -if [[ "$DOMAIN_TYPE" == "custom" ]]; then - echo "before continuing, confirm DNS is configured correctly, with records pointing to $SERVER_PUBLIC_IP" - confirm -fi - -wait_seconds 1 - -if [ "$INSTALL_TYPE" = "ee" ]; then - - echo "-----------------------------------------------------" - echo "Provide Details for EE installation:" - echo " 1. Log into https://dashboard.license.netmaker.io" - echo " 2. Copy License Key Value: https://dashboard.license.netmaker.io/license-keys" - echo " 3. Retrieve Account ID: https://dashboard.license.netmaker.io/user" - echo " 4. note email address" - echo "-----------------------------------------------------" - unset LICENSE_KEY - while [ -z "$LICENSE_KEY" ]; do - read -p "License Key: " LICENSE_KEY - done - unset ACCOUNT_ID - while [ -z ${ACCOUNT_ID} ]; do - read -p "Account ID: " ACCOUNT_ID - done - -fi - -unset EMAIL -while [ -z ${EMAIL} ]; do - read -p "Email Address (for LetsEncrypt): " EMAIL -done - -wait_seconds 2 ->>>>>>> 407c6ed20a427153acb4901db7e61d3016823cc4 wait_seconds 2 @@ -369,7 +295,6 @@ wait_seconds 3 echo "Pulling config files..." COMPOSE_URL="https://raw.githubusercontent.com/gravitl/netmaker/master/compose/docker-compose.yml" -<<<<<<< HEAD CADDY_URL="https://raw.githubusercontent.com/gravitl/netmaker/master/docker/Caddyfile" if [ "$INSTALL_TYPE" = "ee" ]; then COMPOSE_URL="https://raw.githubusercontent.com/gravitl/netmaker/master/compose/docker-compose.ee.yml" @@ -377,13 +302,6 @@ if [ "$INSTALL_TYPE" = "ee" ]; then fi wget -O /root/docker-compose.yml $COMPOSE_URL && wget -O /root/mosquitto.conf https://raw.githubusercontent.com/gravitl/netmaker/master/docker/mosquitto.conf && wget -O /root/Caddyfile $CADDY_URL && wget -q -O /root/wait.sh https://raw.githubusercontent.com/gravitl/netmaker/master/docker/wait.sh && chmod +x /root/wait.sh -======= -if [ "$INSTALL_TYPE" = "ee" ]; then - COMPOSE_URL="https://raw.githubusercontent.com/gravitl/netmaker/master/compose/docker-compose.ee.yml" -fi - -wget -O docker-compose.yml $COMPOSE_URL && wget -O /root/mosquitto.conf https://raw.githubusercontent.com/gravitl/netmaker/master/docker/mosquitto.conf && wget -q -O /root/wait.sh https://raw.githubusercontent.com/gravitl/netmaker/develop/docker/wait.sh && chmod +x wait.sh ->>>>>>> 407c6ed20a427153acb4901db7e61d3016823cc4 mkdir -p /etc/netmaker @@ -393,11 +311,7 @@ sed -i "s/SERVER_PUBLIC_IP/$SERVER_PUBLIC_IP/g" /root/docker-compose.yml sed -i "s/NETMAKER_BASE_DOMAIN/$NETMAKER_BASE_DOMAIN/g" /root/Caddyfile sed -i "s/NETMAKER_BASE_DOMAIN/$NETMAKER_BASE_DOMAIN/g" /root/docker-compose.yml sed -i "s/REPLACE_MASTER_KEY/$MASTER_KEY/g" /root/docker-compose.yml -<<<<<<< HEAD sed -i "s/YOUR_EMAIL/$EMAIL/g" /root/Caddyfile -======= -sed -i "s/YOUR_EMAIL/$EMAIL/g" /root/docker-compose.yml ->>>>>>> 407c6ed20a427153acb4901db7e61d3016823cc4 sed -i "s/REPLACE_MQ_ADMIN_PASSWORD/$MQ_PASSWORD/g" /root/docker-compose.yml if [ "$INSTALL_TYPE" = "ee" ]; then sed -i "s~YOUR_LICENSE_KEY~$LICENSE_KEY~g" /root/docker-compose.yml @@ -454,7 +368,6 @@ wait_seconds 3 echo "Configuring netmaker server as ingress gateway" -<<<<<<< HEAD for i in 1 2 3 4 5 6 do echo " waiting for server node to become available" @@ -473,16 +386,6 @@ do fi done -======= - -while [ -z "$SERVER_ID" ]; do - echo "waiting for server node to become available" - wait_seconds 2 - curlresponse=$(curl -s -H "Authorization: Bearer $MASTER_KEY" -H 'Content-Type: application/json' https://api.${NETMAKER_BASE_DOMAIN}/api/nodes/netmaker) - SERVER_ID=$(jq -r '.[0].id' <<< ${curlresponse}) -done - ->>>>>>> 407c6ed20a427153acb4901db7e61d3016823cc4 curl -o /dev/null -s -X POST -H "Authorization: Bearer $MASTER_KEY" -H 'Content-Type: application/json' https://api.${NETMAKER_BASE_DOMAIN}/api/nodes/netmaker/$SERVER_ID/createingress )}