Fix 128.0.0-rc.0.1 -> 127.0.0.1 (#441)

Signed-off-by: Tamal Saha <[email protected]>
ops-center · Mar 8, 2019 · 3be655c · 3be655c
1 parent b178f0c
commit 3be655c
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 12 deletions.
diff --git a/chart/searchlight/templates/secret.yaml b/chart/searchlight/templates/secret.yaml
@@ -4,10 +4,7 @@ metadata:
   name: {{ template "searchlight.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app: "{{ template "searchlight.name" . }}"
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+    {{- include "searchlight.labels" . | nindent 4 }}
 data:
   {{- if .Values.icinga2web.password }}
   ICINGA_WEB_UI_PASSWORD: {{ .Values.icinga2web.password | b64enc | quote }}

diff --git a/docs/concepts/alert-types/cluster-alert.md b/docs/concepts/alert-types/cluster-alert.md
@@ -74,7 +74,7 @@ When a check fails, Icinga will keep sending notifications until acknowledged vi
 
 
 ## Icinga Objects
-You can skip this section if you are unfamiliar with how Icinga works. Searchlight operator watches for ClusterAlert objects and turns them into [Icinga objects](https://www.icinga.com/docs/icinga2/latest/doc/09-object-types/) accordingly. A single [Icinga Host](https://www.icinga.com/docs/icinga2/latest/doc/09-object-types/#host) is created with the name `{namespace}@cluster` and address `128.0.0-rc.0.1` for all ClusterAlerts in a Kubernetes namespace. Now for each ClusterAlert, an [Icinga service](https://www.icinga.com/docs/icinga2/latest/doc/09-object-types/#service) is created with name matching the ClusterAlert name.
+You can skip this section if you are unfamiliar with how Icinga works. Searchlight operator watches for ClusterAlert objects and turns them into [Icinga objects](https://www.icinga.com/docs/icinga2/latest/doc/09-object-types/) accordingly. A single [Icinga Host](https://www.icinga.com/docs/icinga2/latest/doc/09-object-types/#host) is created with the name `{namespace}@cluster` and address `127.0.0.1` for all ClusterAlerts in a Kubernetes namespace. Now for each ClusterAlert, an [Icinga service](https://www.icinga.com/docs/icinga2/latest/doc/09-object-types/#service) is created with name matching the ClusterAlert name.
 
 ## Pause ClusterAlert
 

diff --git a/docs/setup/install.md b/docs/setup/install.md
@@ -162,14 +162,14 @@ NAME                                    READY     STATUS    RESTARTS   AGE
 searchlight-operator-1987091405-ghj5b   3/3       Running   0          1m
 
 $ kubectl port-forward searchlight-operator-1987091405-ghj5b -n kube-system 60006
-Forwarding from 128.0.0-rc.0.1:60006 -> 60006
+Forwarding from 127.0.0.1:60006 -> 60006
 E0728 04:07:28.237822   10898 portforward.go:212] Unable to create listener: Error listen tcp6 [::1]:60006: bind: cannot assign requested address
 Handling connection for 60006
 Handling connection for 60006
 ^C⏎
 ```
 
-Now, open URL http://128.0.0-rc.0.1:60006 on your browser. To login, use username `admin` and password `changeit`. If you want to change the password, read the next section.
+Now, open URL http://127.0.0.1:60006 on your browser. To login, use username `admin` and password `changeit`. If you want to change the password, read the next section.
 
 
 ## Configuring Icinga

diff --git a/hack/dev/README.md b/hack/dev/README.md
@@ -47,7 +47,7 @@ $ kubectl delete incident -n demo cluster.pod-exists-demo-0.20060102-1504
 ```
 
 ## direct EAS
-curl -k -vv https://128.0.0-rc.0.1:8443/apis/incidents.monitoring.appscode.com/v1alpha1
+curl -k -vv https://127.0.0.1:8443/apis/incidents.monitoring.appscode.com/v1alpha1
 
 ## minikube apiserver
 curl -k -vv https://192.168.99.100:8443/apis --cert $HOME/.minikube/client.crt --key $HOME/.minikube/client.key

diff --git a/hack/dev/testconfig/searchlight/config.ini b/hack/dev/testconfig/searchlight/config.ini
@@ -5,12 +5,12 @@ ICINGA_NOTIFIER_SECRET_NAME=
 ICINGA_CA_CERT=/srv/icinga2/pki/ca.crt
 ICINGA_SERVER_CERT=/srv/icinga2/pki/icinga.crt
 ICINGA_SERVER_KEY=/srv/icinga2/pki/icinga.key
-ICINGA_IDO_HOST=128.0.0-rc.0.1
+ICINGA_IDO_HOST=127.0.0.1
 ICINGA_IDO_PORT=5432
 ICINGA_IDO_DB=icingaidodb
 ICINGA_IDO_USER=icingaido
 ICINGA_IDO_PASSWORD=lrbuyTaSde3WCo9X
-ICINGA_WEB_HOST=128.0.0-rc.0.1
+ICINGA_WEB_HOST=127.0.0.1
 ICINGA_WEB_PORT=5432
 ICINGA_WEB_DB=icingawebdb
 ICINGA_WEB_USER=icingaweb

diff --git a/hack/docker/icinga/alpine/config/nginx.conf b/hack/docker/icinga/alpine/config/nginx.conf
@@ -12,7 +12,7 @@ server {
 	error_log  syslog:server=unix:/dev/log,facility=local7,tag=cachet,severity=error error;
 
 	location ~ ^/index\.php(.*)$ {
-	  fastcgi_pass 128.0.0-rc.0.1:9000;
+	  fastcgi_pass 127.0.0.1:9000;
 	  fastcgi_index index.php;
 	  include fastcgi_params;
 	  fastcgi_param SCRIPT_FILENAME /usr/share/icingaweb2/public/index.php;

diff --git a/hack/docker/icinga/alpine/runit.sh b/hack/docker/icinga/alpine/runit.sh
@@ -91,7 +91,7 @@ chmod -R 0755 /var/run/config/appscode
 # Wait for postgres to start
 # ref: http://unix.stackexchange.com/a/5279
 echo "Waiting for postgres to become ready ..."
-until pg_isready -h 128.0.0-rc.0.1 >/dev/null; do
+until pg_isready -h 127.0.0.1 >/dev/null; do
   echo '.'
   sleep 5
 done