Skip to content
This repository was archived by the owner on Jan 11, 2023. It is now read-only.

add annotation to secrets field #3292

Merged
merged 3 commits into from
Jun 19, 2018

Conversation

zqingqing1
Copy link
Member

What this PR does / why we need it: Followed up on #3227, the CloneAndConform function will added at RP codebase.

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #

Special notes for your reviewer:

If applicable:

  • documentation
  • unit tests
  • tested backward compatibility (ie. deploy with previous version, upgrade with this branch)

Release note:

@acs-bot acs-bot added the size/M label Jun 15, 2018
@codecov
Copy link

codecov bot commented Jun 18, 2018

Codecov Report

Merging #3292 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #3292   +/-   ##
=======================================
  Coverage   52.87%   52.87%           
=======================================
  Files         104      104           
  Lines       15714    15714           
=======================================
  Hits         8308     8308           
  Misses       6671     6671           
  Partials      735      735

pkg/api/types.go Outdated
@@ -148,7 +148,7 @@ type PublicKey struct {
type CustomSearchDomain struct {
Name string `json:"name,omitempty"`
RealmUser string `json:"realmUser,omitempty"`
RealmPassword string `json:"realmPassword,omitempty"`
RealmPassword string `json:"realmPassword,omitempty" `
Copy link
Contributor

Choose a reason for hiding this comment

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

extra space is not needed

pkg/api/types.go Outdated
@@ -151,15 +151,15 @@ type CustomSearchDomain struct {
RealmPassword string `json:"realmPassword,omitempty"`
}

// CustomNodesDNS represents the Search Domain when the custom vnet for a custom DNS as a nameserver.
// CustomNodesDNS represents the Search Domain whenthe custom vnet for a custom DNS as a nameserver.
Copy link
Contributor

Choose a reason for hiding this comment

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

why did you remove a space here?

Copy link
Contributor

Choose a reason for hiding this comment

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

(admittedly that comment isn't very correct grammatically)

Copy link
Member Author

Choose a reason for hiding this comment

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

weird, I don't remember I removed the space. Let me correct this.

@jackfrancis
Copy link
Member

/lgtm

@acs-bot
Copy link

acs-bot commented Jun 19, 2018

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jackfrancis, zqingqing1

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

The pull request process is described here

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

@jackfrancis jackfrancis merged commit ff57141 into Azure:master Jun 19, 2018
weinong pushed a commit that referenced this pull request Jun 19, 2018
PaulCharlton added a commit to ElementAnalytics/acs-engine that referenced this pull request Jun 20, 2018
* 'master' of https://github.com/Azure/acs-engine: (44 commits)
  remove duplicate ebtables (Azure#3308)
  Kubernetes: Remove Windows-specific foo for control plane config (Azure#3240)
  add k8s 1.8.14 (Azure#3303)
  run /usr/lib/apt/apt.systemd.daily in background (Azure#3304)
  add annotation to secrets field (Azure#3292)
  fix(oms): pull oms directly from docker (Azure#3294)
  ensure params vals are bool, with test (Azure#3285)
  udpate to latest 16.04 LTS image (Azure#3286)
  Enable openshift e2e tests on centos (Azure#2910)
  remove docker dependency from hyperkube extract (Azure#3296)
  remove pathological test (Azure#3291)
  Refactor validateDNSPrefix function in one place (Azure#3276)
  remove unnecessary nil check (Azure#3290)
  Fixing panic issue in Validate when properties are nil (Azure#3242)
  Updating the omsagent yaml file to include new changes for node zero dependency (Azure#3277)
  revert Azure CNI to 1.0.4 (Azure#3289)
  Add e2e test for openshift vnet (Azure#3274)
  Support upgrading a Kubernetes cluster that contains Virtual Machine Scale Sets (Azure#3223)
  Set extension for custom DNS (Azure#3264)
  don't exit CSE on apt.systemd.daily error (Azure#3278)
  ...
jackfrancis pushed a commit that referenced this pull request Jun 21, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants