Skip to content

Revert the PR 1744 as the yaml files have been added back#1924

Merged
geeknoid merged 2 commits intoistio:masterfrom
lei-tang:fix_citadel_doc_after_yaml_added_back
Jul 24, 2018
Merged

Revert the PR 1744 as the yaml files have been added back#1924
geeknoid merged 2 commits intoistio:masterfrom
lei-tang:fix_citadel_doc_after_yaml_added_back

Conversation

@lei-tang
Copy link
Copy Markdown
Contributor

The PR 1744 fixes the non-existent yaml files in the description of Citadel health checking in
https://preliminary.istio.io/docs/tasks/security/health-check.html reported by the issue istio/istio#6922. Since the PR istio/istio#7178 adds back the removed yaml files, the PR 1744 is reverted.

The PR 1744 fixes the non-existent yaml files in the description of Citadel health checking in
https://preliminary.istio.io/docs/tasks/security/health-check.html
reported by the issue istio/istio#6922. Since
the PR istio/istio#7178 adds back the removed
yaml files, the PR 1744 is reverted.
@lei-tang
Copy link
Copy Markdown
Contributor Author

/cc @wattli

@istio-testing istio-testing requested a review from wattli July 23, 2018 23:43
@lei-tang
Copy link
Copy Markdown
Contributor Author

/cc @ymesika

@lei-tang
Copy link
Copy Markdown
Contributor Author

/cc @myidpt

@istio-testing istio-testing requested a review from myidpt July 24, 2018 00:42

{{< text bash >}}
$ kubectl apply -f install/kubernetes/istio-demo-auth.yaml
$ kubectl delete svc istio-citadel -n istio-system
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't need to delete the service. The service is enabled by default now.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done: no deleting the service.

{{< text bash >}}
$ kubectl delete deploy istio-citadel -n istio-system
$ kubectl delete -f install/kubernetes/istio-citadel-with-health-check.yaml
$ kubectl delete svc istio-citadel -n istio-system
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here. Please remove this line.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

- --probe-check-interval=15s # interval for health status check
- --logtostderr
- --stderrthreshold
- INFO
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So I guess Citadel can't work well without these lines? If we need to add these lines, we should modify our yaml file template.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To be consistent with the yaml file, these lines have been removed.

Copy link
Copy Markdown
Member

@sdake sdake left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the contribution! One portion of this PR needs a small bit of rework. We expect Operators will create their own manifests with Helm. We do not expect nor want Operators to use istio-demo.yaml or istio-demo-auth.yaml for production workloads.


## Cleanup

* To disable health checking on Citadel, deploy Citadel with health checking disabled by setting the Helm argument `security.healthCheckEnabled` as `false`.
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this content should not be lost. Please revert this part of the change.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sdake We actually don't have this Helm flag at the moment so shouldn't be documented

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ymesika my bad, thought we did :) It must have been removed.

/lgtm
/approve

@sdake
Copy link
Copy Markdown
Member

sdake commented Jul 24, 2018

/assign @sdake

Copy link
Copy Markdown
Member

@ymesika ymesika left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lgtm

@istio-testing
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lei-tang, sdake

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@sdake
Copy link
Copy Markdown
Member

sdake commented Jul 24, 2018

Just noticed the linter failed in many areas - can you resolve?

TIA
-steve

@geeknoid geeknoid merged commit 8a43b3d into istio:master Jul 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants