From 8d6d4c3a957a825c780492e21e539013e0459754 Mon Sep 17 00:00:00 2001 From: Jeremy Facchetti Date: Fri, 27 May 2022 19:10:11 +0200 Subject: [PATCH] added yaml lint (#2132) * added yaml lint * updated the doc --- .github/workflows/codeql-analysis.yml | 6 +-- .github/workflows/golint.yml | 6 +-- .github/workflows/yamllint.yml | 42 +++++++++++++++++++ .golangci.yml | 4 +- .mega-linter.yml | 14 +++++++ .pipelines/clean-subscription.yml | 1 - .../pipeline.buildrp.pullrequest.yml | 2 +- .../templates/template-buildrp-buildaro.yml | 2 +- .yaml-lint.yml | 35 ++++++++++++++++ Makefile | 3 +- docs/prepare-your-dev-environment.md | 2 + .../controllers/machinehealthcheck/bindata.go | 2 +- .../staticresources/machinehealthcheck.yaml | 10 ++--- pkg/operator/controllers/muo/bindata.go | 6 +-- .../muo/staticresources/config.yaml | 2 +- .../custom_resource_definition.yaml | 1 - .../monitoring_reader_role.yaml | 2 +- pkg/operator/deploy/bindata.go | 2 +- .../deploy/staticresources/worker/role.yaml | 1 - pkg/portal/ssh/proxy.go | 4 +- python/az/aro/linter_exclusions.yml | 4 +- 21 files changed, 120 insertions(+), 31 deletions(-) create mode 100644 .github/workflows/yamllint.yml create mode 100644 .mega-linter.yml create mode 100644 .yaml-lint.yml diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c97ee3bb3..f0e246728 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: [ master ] + branches: [master] pull_request: # The branches below must be a subset of the branches above - branches: [ master ] + branches: [master] schedule: - cron: '20 0 * * 6' @@ -32,7 +32,7 @@ jobs: strategy: fail-fast: false matrix: - language: [ 'go', 'javascript', 'python' ] + language: ['go', 'javascript', 'python'] # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] # Learn more: # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed diff --git a/.github/workflows/golint.yml b/.github/workflows/golint.yml index c73e98cce..4bbea0171 100644 --- a/.github/workflows/golint.yml +++ b/.github/workflows/golint.yml @@ -16,8 +16,8 @@ jobs: name: lint runs-on: ubuntu-latest steps: - - run: | - sudo apt-get update + - run: | + sudo apt-get update sudo apt-get install libgpgme-dev libgpgme11 - uses: actions/setup-go@v3 with: @@ -28,7 +28,7 @@ jobs: with: # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version version: v1.45.2 - + args: -v --timeout 15m # Optional: working directory, useful for monorepos #working-directory: pkg diff --git a/.github/workflows/yamllint.yml b/.github/workflows/yamllint.yml new file mode 100644 index 000000000..ed3460ee0 --- /dev/null +++ b/.github/workflows/yamllint.yml @@ -0,0 +1,42 @@ +--- +# MegaLinter GitHub Action configuration file +# More info at https://megalinter.github.io +name: mega-linter-yaml + +on: + # Trigger mega-linter at every push. Action will also be visible from Pull Requests to main + push: # Comment this line to trigger action only on pull-requests (not recommended if you don't pay for GH Actions) + pull_request: + +env: # Comment env block if you do not want to apply fixes + APPLY_FIXES: none # When active, APPLY_FIXES must also be defined as environment variable (in github/workflows/mega-linter.yml or other CI tool) + +jobs: + build: + name: mega-linter-yaml + runs-on: ubuntu-latest + steps: + # Git Checkout + - name: Checkout Code + uses: actions/checkout@v2 + with: + token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }} + fetch-depth: 0 + + # MegaLinter + - name: yamllint + id: ml + # You can override MegaLinter flavor used to have faster performances + # More info at https://megalinter.github.io/flavors/ + uses: megalinter/megalinter/flavors/ci_light@v5 + env: + # All available variables are described in documentation + # https://megalinter.github.io/configuration/ + VALIDATE_ALL_CODEBASE: true + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # ADD YOUR CUSTOM ENV VARIABLES HERE OR DEFINE THEM IN A FILE .mega-linter.yml AT THE ROOT OF YOUR REPOSITORY + # DISABLE: COPYPASTE,SPELL # Uncomment to disable copy-paste and spell checks + ENABLE_LINTERS: YAML_YAMLLINT + # YAML_YAMLLINT_CONFIG_FILE: .yaml-lint.yml + # YAML_YAMLLINT_RULES_PATH: .github/linters + PRINT_ALPACA: false diff --git a/.golangci.yml b/.golangci.yml index 167ddd67e..8ae92caee 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -2,6 +2,9 @@ run: timeout: 10m skip-dirs: - vendor/portal + - vendor + skip-dirs-use-default: true + modules-download-mode: vendor issues: exclude-rules: @@ -21,7 +24,6 @@ linters-settings: - github.com/onsi/ginkgo - github.com/onsi/gomega - linters: disable-all: true enable: diff --git a/.mega-linter.yml b/.mega-linter.yml new file mode 100644 index 000000000..7b8c31a77 --- /dev/null +++ b/.mega-linter.yml @@ -0,0 +1,14 @@ +# Configuration file for MegaLinter +# See all available variables at https://megalinter.github.io/configuration/ and in linters documentation + +APPLY_FIXES: none +# ENABLE: # If you use ENABLE variable, all other languages/formats/tooling formats will be disabled by default +ENABLE_LINTERS: + - YAML_YAMLLINT # If you use ENABLE_LINTERS variable, all other linters will be disabled by default +EXCLUDED_DIRECTORIES: + - vendor +YAML_YAMLLINT_CONFIG_FILE: .yaml-lint.yml +LINTER_RULES_PATH: . +PRINT_ALPACA: false +GITHUB_STATUS_REPORTER: false +GITHUB_COMMENT_REPORTER: false diff --git a/.pipelines/clean-subscription.yml b/.pipelines/clean-subscription.yml index 4e4b7c5c6..b5cbd8620 100644 --- a/.pipelines/clean-subscription.yml +++ b/.pipelines/clean-subscription.yml @@ -24,4 +24,3 @@ jobs: purgeCreatedTag: $(purgeCreatedTag) resourceGroupDeletePrefixes: $(resourceGroupDeletePrefixes) purgeTTL: $(purgeTTL) - diff --git a/.pipelines/onebranch/pipeline.buildrp.pullrequest.yml b/.pipelines/onebranch/pipeline.buildrp.pullrequest.yml index 19e13ad96..2cecd4b03 100644 --- a/.pipelines/onebranch/pipeline.buildrp.pullrequest.yml +++ b/.pipelines/onebranch/pipeline.buildrp.pullrequest.yml @@ -12,7 +12,7 @@ trigger: none pr: none variables: - Cdp_Definition_Build_Count: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning + Cdp_Definition_Build_Count: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning LinuxContainerImage: cdpxlinux.azurecr.io/user/aro/ubi8-gotoolset-1.16.12-4:20220202 # Docker image which is used to build the project https://aka.ms/obpipelines/containers Debian_Frontend: noninteractive diff --git a/.pipelines/onebranch/templates/template-buildrp-buildaro.yml b/.pipelines/onebranch/templates/template-buildrp-buildaro.yml index 941d020f6..6204b355d 100644 --- a/.pipelines/onebranch/templates/template-buildrp-buildaro.yml +++ b/.pipelines/onebranch/templates/template-buildrp-buildaro.yml @@ -19,7 +19,7 @@ steps: cp -rd $(Build.SourcesDirectory) $(Agent.TempDirectory)/src/github.com/Azure/ARO-RP cd $(Agent.TempDirectory)/src/github.com/Azure/ARO-RP make aro - mkdir -p $(ob_outputDirectory) + mkdir -p $(ob_outputDirectory) cp aro $(ob_outputDirectory)/aro workingDirectory: $(Build.SourcesDirectory) name: buildaro diff --git a/.yaml-lint.yml b/.yaml-lint.yml new file mode 100644 index 000000000..ed07e08fd --- /dev/null +++ b/.yaml-lint.yml @@ -0,0 +1,35 @@ +--- + +yaml-files: + - '*.yaml' + - '*.yml' + - '.yamllint' + +ignore: | + vendor/ + *aro.openshift.io*.yaml + +rules: + braces: enable + brackets: enable + colons: enable + commas: enable + comments: disable + comments-indentation: disable + document-end: disable + document-start: disable + empty-lines: enable + empty-values: disable + hyphens: enable + indentation: disable + key-duplicates: enable + key-ordering: disable + line-length: disable + new-line-at-end-of-file: enable + new-lines: enable + octal-values: disable + quoted-strings: disable + trailing-spaces: enable + truthy: + level: warning + check-keys: false diff --git a/Makefile b/Makefile index 09639e31b..531d0c3f7 100644 --- a/Makefile +++ b/Makefile @@ -174,8 +174,7 @@ lint-admin-portal: test-python: pyenv az . pyenv/bin/activate && \ azdev linter && \ - azdev style && \ - hack/format-yaml/format-yaml.py .pipelines + azdev style admin.kubeconfig: hack/get-admin-kubeconfig.sh /subscriptions/${AZURE_SUBSCRIPTION_ID}/resourceGroups/${RESOURCEGROUP}/providers/Microsoft.RedHatOpenShift/openShiftClusters/${CLUSTER} >admin.kubeconfig diff --git a/docs/prepare-your-dev-environment.md b/docs/prepare-your-dev-environment.md index 428d843d4..ca1ddaa77 100644 --- a/docs/prepare-your-dev-environment.md +++ b/docs/prepare-your-dev-environment.md @@ -22,6 +22,8 @@ This document goes through the development dependencies one requires in order to sudo touch /etc/containers/nodocker ``` +1. Install [golangci-lint](https://golangci-lint.run/) and [yamllint](https://yamllint.readthedocs.io/en/stable/quickstart.html#installing-yamllint) (optional but your code is required to comply to pass the CI) + ### Fedora Packages 1. Install the `gpgme-devel`, `libassuan-devel`, and `openssl` packages. > `sudo dnf install -y gpgme-devel libassuan-devel openssl` diff --git a/pkg/operator/controllers/machinehealthcheck/bindata.go b/pkg/operator/controllers/machinehealthcheck/bindata.go index 3925344ce..5a9f9483e 100644 --- a/pkg/operator/controllers/machinehealthcheck/bindata.go +++ b/pkg/operator/controllers/machinehealthcheck/bindata.go @@ -77,7 +77,7 @@ func (fi bindataFileInfo) Sys() interface{} { return nil } -var _machinehealthcheckYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x90\xb1\x6e\xf3\x30\x0c\x84\x77\x3f\x05\xa1\xdd\xf9\x13\xfc\x9b\xd6\x20\x45\x3b\xb4\x43\x81\x74\x67\x65\x06\x12\x2c\x51\x82\x48\xa7\xf1\xdb\x17\xb2\x93\x74\x28\xba\x64\xb3\x4f\x77\xdf\x9d\x84\x25\x7c\x50\x95\x90\xd9\x42\x42\xe7\x03\xd3\x26\x17\x62\xf1\xe1\xa4\x9b\x90\xff\x9d\x77\x9f\xa4\xb8\xeb\xc6\xc0\x83\x85\xd7\xd5\xf2\x4c\x18\xd5\xef\x3d\xb9\xb1\x4b\xa4\x38\xa0\xa2\xed\x00\x18\x13\x59\xc0\x9a\xfb\x2b\xcb\x2f\x46\xb7\x18\xd7\x63\x29\xe8\xc8\xc2\xbd\xe3\xe6\xec\xb1\x84\x4e\x0a\xb9\xc6\x11\x8a\xe4\x34\xd7\xf6\x0d\x90\x50\x9d\x3f\x5c\x4a\x25\x69\x43\x65\x55\x7b\x18\x69\xfe\x63\xb4\x8b\x93\x28\xd5\xc6\xbc\xf3\x6b\x8e\xb4\x04\xa1\x95\x57\x6c\x78\x78\xcb\xfa\xc2\x57\xf5\x8c\x71\xa2\x2b\xbc\xe1\x4d\xe0\x53\x45\xf3\xf3\x9f\xb0\x41\xcd\x23\xed\x42\xfa\xab\xfb\x70\x09\xa2\xd2\x01\x4c\xbc\x3e\xd3\xbc\xcf\x3c\x04\xbd\x5d\xb1\x07\x9d\x0b\xd9\x16\x32\xef\x84\xc3\xbc\x36\x6b\x48\x94\x27\xb5\x60\xfe\x6f\xb7\x62\x60\x11\x45\x51\x27\xb1\x60\x9e\x30\x0a\x99\x47\xd3\x47\x1e\x39\x7f\x71\xb3\x26\xbc\x1c\x6f\xbb\x2c\x98\x9d\xf9\x0e\x00\x00\xff\xff\x9f\x0e\x45\xac\x2a\x02\x00\x00") +var _machinehealthcheckYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x90\xb1\x6e\xf3\x30\x0c\x84\x77\x3f\x05\xa1\xdd\xf9\x13\xfc\x9b\xd6\x20\x45\x3b\xb4\x43\x81\x74\x67\x65\x06\x16\x2c\x51\x82\x48\xa7\xf1\xdb\x17\x8a\xe2\x74\x28\xba\x64\x93\x4e\xc7\xef\x4e\xc4\xec\x3f\xa8\x88\x4f\x6c\x21\xa2\x1b\x3d\xd3\x26\x65\x62\x19\xfd\x49\x37\x3e\xfd\x3b\xef\x3e\x49\x71\xd7\x4d\x9e\x07\x0b\xaf\xcd\xf2\x4c\x18\x74\xdc\x8f\xe4\xa6\x2e\x92\xe2\x80\x8a\xb6\x03\x60\x8c\x64\x01\x4b\xea\x6f\xac\xf1\x6a\x74\x57\x63\x7b\x96\x8c\x8e\x2c\xdc\x33\x56\x67\x8f\xd9\x77\x92\xc9\x55\x8e\x50\x20\xa7\xa9\xd4\x33\x40\x44\x75\xe3\xe1\x92\x0b\x49\x2d\x2a\x4d\xed\x61\xa2\xe5\x8f\xd2\x2e\xcc\xa2\x54\x2a\xf3\xce\x2f\x29\xd0\x75\x10\x6a\x78\xc1\x8a\x87\xb7\xa4\x2f\x7c\x53\xcf\x18\x66\xba\xc1\x2b\xde\x78\x3e\x15\x34\x3f\xf7\x88\x15\x6a\x1e\x49\x17\xd2\x5f\xd9\x87\x8b\x17\x95\x0e\x60\xe6\xb6\xa6\x65\x9f\x78\xf0\xba\x7e\xb1\x07\x5d\x32\x59\x30\xef\x84\xc3\xd2\x62\xd5\x47\x4a\xb3\x5a\x30\xff\xb7\x5b\x69\x9a\x28\xea\x2c\x16\xcc\x13\x06\x21\xf3\xc8\xe4\x91\x27\x4e\x5f\x5c\xd5\x88\x97\xe3\xda\xc7\x82\xd9\x99\xee\x3b\x00\x00\xff\xff\x38\x97\xb5\xaf\x23\x02\x00\x00") func machinehealthcheckYamlBytes() ([]byte, error) { return bindataRead( diff --git a/pkg/operator/controllers/machinehealthcheck/staticresources/machinehealthcheck.yaml b/pkg/operator/controllers/machinehealthcheck/staticresources/machinehealthcheck.yaml index 9f8f8fc13..caf285367 100644 --- a/pkg/operator/controllers/machinehealthcheck/staticresources/machinehealthcheck.yaml +++ b/pkg/operator/controllers/machinehealthcheck/staticresources/machinehealthcheck.yaml @@ -14,10 +14,10 @@ spec: - key: machine.openshift.io/cluster-api-machineset operator: Exists unhealthyConditions: - - type: "Ready" - timeout: "300s" + - type: "Ready" + timeout: "300s" status: "False" - - type: "Ready" - timeout: "300s" + - type: "Ready" + timeout: "300s" status: "Unknown" - maxUnhealthy: "1" \ No newline at end of file + maxUnhealthy: "1" diff --git a/pkg/operator/controllers/muo/bindata.go b/pkg/operator/controllers/muo/bindata.go index 3d2cfe213..0c52731e8 100644 --- a/pkg/operator/controllers/muo/bindata.go +++ b/pkg/operator/controllers/muo/bindata.go @@ -132,7 +132,7 @@ func cluster_rolebindingYaml() (*asset, error) { return a, nil } -var _configYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x7c\x52\xdd\x6a\x1b\x3d\x10\xbd\xf7\x53\xe8\x05\xf6\xe3\x73\x7f\xa0\xd5\x5d\xd8\x10\x28\x24\x76\x08\x69\x7b\x3d\x48\x27\xbb\xc2\xda\x91\x18\x8d\xec\xa6\xf4\xe1\x8b\xd7\xbb\x8e\xd3\x6c\xab\xcb\xf3\x33\xe7\x68\x18\xca\xe1\x1b\xa4\x84\xc4\xd6\xec\xd7\xab\x5d\x60\x6f\x4d\x9b\xf8\x29\x74\x77\x94\x57\x03\x94\x3c\x29\xd9\x95\x31\x4c\x03\xac\x19\x88\xa9\x83\x6f\x6a\xee\x84\x3c\x9a\x94\x21\xa4\x49\x1a\x37\x9a\x26\x5d\xc9\xe4\x60\x8d\x49\x19\x5c\xfa\xf0\xa4\xcd\xdf\x7c\xab\x79\xfc\xc9\xff\xdf\x33\x0d\xd1\x9a\x5f\x2b\x63\x66\xe8\x6e\x74\x8a\x1d\x21\x63\x4a\xaa\x72\x9c\x7d\xbb\x6d\xaf\x6e\x27\x2c\x26\x47\xf1\xd4\x7a\xb3\xd8\xf2\x5c\xee\xf8\x0e\xa4\xae\xff\xc2\x0a\xd9\x53\xb4\x66\x3d\xc2\x03\x05\x56\x30\xb1\xc3\x9c\xe4\x12\xab\xa4\x78\x1f\x89\xf1\x18\x8e\x63\x3f\xff\x3f\x51\xa1\xe3\x24\xf0\x57\x11\xa2\x65\xd6\xbf\x76\xb4\x12\x34\x38\x8a\x17\x74\x63\xda\x58\x8b\x42\xb6\xd3\xe7\xaf\xd3\x81\xff\xc1\x62\x2c\xef\x47\xc5\xf4\x93\xef\x81\x7d\x3a\xcc\x23\x3d\x22\x3d\x3f\x4a\xe8\x8e\xfb\x31\xef\xe7\x76\x1a\x06\x6c\xab\x5a\xb3\x7e\x77\x82\x38\x79\x5c\x0b\x05\xb6\x7f\x2a\x3e\x7c\x9c\x10\xfc\xc8\x70\x0a\xbf\x99\xa5\xa7\x1f\x7f\x1a\xe9\xe2\x28\xe2\x8d\x77\xca\xeb\x41\x51\xfb\xb6\x87\xdb\xd9\xd7\xeb\x79\xb3\x82\xc6\xdc\x4b\x1a\xa0\x3d\x6a\x79\xa8\x11\x37\x14\x62\x15\x94\x33\xdd\x12\x73\xd2\x07\xa8\x04\xec\xf1\x35\x7b\xd2\x0b\xf6\x26\x56\xb0\x9e\x2a\xbe\x6c\x6e\x0a\xdb\xcc\x67\x77\x91\xf6\x72\x7e\x31\x75\x5d\xe0\x6e\x81\x11\xf8\x9e\x8e\xf7\x29\x3b\x68\x8e\xe4\xb0\x20\x9a\xaf\xb5\x2c\x70\xb5\x40\x9a\x43\x92\x5d\x4c\xe4\x9b\x21\x71\xd0\x24\xcb\x59\x39\x64\xc4\xc0\x58\x1a\x43\x3f\xab\xe0\xdc\xf3\x77\x00\x00\x00\xff\xff\xd6\xce\xc1\x4a\x98\x03\x00\x00") +var _configYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x7c\x52\xdd\x6a\x1b\x3d\x10\xbd\xf7\x53\xe8\x05\xf6\xe3\x73\x7f\xa0\xd5\x5d\xd8\x10\x28\x24\x76\x08\x69\x7b\x3d\x48\x27\xbb\xc2\xda\x91\x18\x8d\xec\xa6\xf4\xe1\x8b\xd7\xbb\x8e\xd3\x6c\xab\xcb\xf3\x33\xe7\x68\x18\xca\xe1\x1b\xa4\x84\xc4\xd6\xec\xd7\xab\x5d\x60\x6f\x4d\x9b\xf8\x29\x74\x77\x94\x57\x03\x94\x3c\x29\xd9\x95\x31\x4c\x03\xac\x19\x88\xa9\x83\x6f\x6a\xee\x84\x3c\x9a\x94\x21\xa4\x49\x1a\x37\x9a\x26\x5d\xc9\xe4\x60\x4d\xca\xe0\xd2\x87\x27\x6d\xfe\x66\x5b\xcd\xd3\x4f\xf6\xff\x9e\x69\x88\xd6\xfc\x5a\x19\x33\x43\x77\xa3\x53\xec\x08\x19\x53\x52\x95\xe3\xe8\xdb\x6d\x7b\x75\x3b\x61\x31\x39\x8a\xa7\xd2\x9b\xc5\x92\xe7\x6e\xc7\x77\x20\x75\xfd\x17\x56\xc8\x9e\xa2\x35\xeb\x11\x1e\x28\xb0\x82\x89\x1d\xe6\x24\x97\x58\x25\xc5\xfb\x48\x8c\xc7\x70\x1c\xfb\xf9\xff\x89\x0a\x1d\x27\x81\xbf\x8a\x10\x2d\xb3\xfe\xb5\xa3\x95\xa0\xc1\x51\xbc\xa0\x1b\xd3\xc6\x5a\x14\xb2\x9d\x3e\x7f\x9d\x0e\xfc\x0f\x16\x63\x79\x3f\x2a\xa6\x9f\x7c\x0f\xec\xd3\x61\x1e\xe9\x11\xe9\xf9\x51\x42\x77\xdc\x8f\x79\x3f\xb7\xd3\x30\x60\x5b\xd5\x9a\xf5\xbb\x13\xc4\xc9\xe3\x5a\x28\xb0\xfd\x53\xf1\xe1\xe3\x84\xe0\x47\x86\x53\xf8\xcd\x2c\x3d\xfd\xf8\xd3\x48\x17\x47\x11\x6f\xbc\x53\x5e\x0f\x8a\xda\xb7\x3d\xdc\xce\xbe\x5e\xcf\x9b\x15\x34\xe6\x5e\xd2\x00\xed\x51\xcb\x43\x8d\xb8\xa1\x10\xab\xa0\x9c\xe9\x96\x98\x93\x3e\x40\x25\x60\x8f\xaf\xd9\x93\x5e\xb0\x37\xb1\x82\xf5\x54\xf1\x65\x73\x53\xd8\x66\xbe\xba\x8b\xb4\x97\xf3\x8b\xa9\xeb\x02\x77\x0b\x8c\xc0\xf7\x74\xbc\x4f\xd9\x41\x73\x24\x87\x05\xd1\x7c\xad\x65\x81\xab\x05\xd2\x1c\x92\xec\x62\x22\xdf\x0c\x89\x83\x26\x59\xce\xca\x21\x23\x06\xc6\xd2\x18\xfa\x59\x05\xe7\x9e\xbf\x03\x00\x00\xff\xff\x6c\x17\x59\x7b\x97\x03\x00\x00") func configYamlBytes() ([]byte, error) { return bindataRead( @@ -152,7 +152,7 @@ func configYaml() (*asset, error) { return a, nil } -var _custom_resource_definitionYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x59\x4b\x8f\xdb\x38\x12\xbe\xfb\x57\x14\x66\x0f\xd9\x05\x62\x75\x67\x73\x59\xf8\x96\x71\x6f\x30\xc1\xce\x24\x8d\x74\x4f\x2e\x83\xc1\xa2\x2c\x96\x2c\x4e\x53\xa4\x96\x0f\x77\x3c\x8b\xfd\xef\x8b\xa2\x28\xcb\x92\xa9\xb6\x1b\xc9\x3c\x78\x13\x1f\xf5\xae\xaf\x8a\xd4\x62\xb9\x5c\x2e\xb0\x95\x9f\xc8\x3a\x69\xf4\x0a\xb0\x95\xf4\xd9\x93\xe6\x2f\x57\x3c\xfc\xc3\x15\xd2\x5c\xed\x5e\x2d\x1e\xa4\x16\x2b\x58\x07\xe7\x4d\xf3\x91\x9c\x09\xb6\xa4\x1b\xaa\xa4\x96\x5e\x1a\xbd\x68\xc8\xa3\x40\x8f\xab\x05\x00\x6a\x6d\x3c\xf2\xb4\xe3\x4f\x80\xd2\x68\x6f\x8d\x52\x64\x97\x5b\xd2\xc5\x43\xd8\xd0\x26\x48\x25\xc8\x46\xe2\x3d\xeb\xdd\x75\xf1\xba\xb8\x5e\x00\x94\x96\xe2\xf1\x7b\xd9\x90\xf3\xd8\xb4\x2b\xd0\x41\xa9\x05\x80\xc6\x86\x56\x10\xda\xad\x45\x41\xa5\xd1\x95\xdc\xba\x22\x7d\x16\x0d\x6a\xdc\x92\x28\x4c\x4b\xda\xd5\xb2\xf2\x85\x34\x0b\xd7\x52\xc9\x52\x6c\xad\x09\xed\xe1\x68\x7e\x6f\x47\x3f\x09\xdd\x29\xfc\x63\xb7\x7f\x1d\x59\xc5\x79\x25\x9d\xff\xd7\xe9\xda\xf7\xd2\xf9\xb8\xde\xaa\x60\x51\x4d\x85\x8c\x4b\xae\x36\xd6\xbf\x1f\x58\x2c\xfb\x4d\xdd\xaa\xd4\xdb\xa0\xd0\x4e\x8e\x2e\x00\x5c\x69\x5a\x5a\x41\x3c\xd9\x62\x49\x62\x01\x90\xac\x16\x29\x2d\x01\x85\x88\x7e\x40\x75\x6b\xa5\xf6\x64\xd7\x46\x85\x46\x1f\xf8\xfc\xe2\x8c\xbe\x45\x5f\xaf\xa0\x60\x83\x14\x82\x9c\xb4\x24\x8a\x44\x25\xee\xea\xad\x9b\xd6\xfe\x3d\x5e\xf3\x7b\x16\xc1\x79\x2b\xf5\x36\x43\xd4\xa3\x0f\xae\xa8\xa5\xf3\xc6\xee\x7f\xba\xfe\xb9\x68\x6b\x74\x34\xa2\x7b\x3c\xf3\x5c\x6a\xa5\xd1\x9d\x82\x8e\xbf\xf8\xf4\x88\xb4\xf3\xb8\xfd\x3a\xa4\xbb\xf5\x29\xf1\x61\xea\xcb\xa8\x5b\x42\x37\xb1\xf6\x68\xea\xcb\xa8\x37\xe4\xdc\x60\x87\x8e\xfc\x78\xee\x84\x7e\xb7\x69\xf7\x0a\x55\x5b\xe3\xab\x2e\x0c\xcb\x9a\x1a\x5c\xa5\x13\x9c\x1f\x6f\x6e\xdf\x7d\x7a\x7d\x37\x9a\x06\x8e\x92\xd2\xca\xd6\xc7\xcc\x1d\x65\x02\x48\x07\xbe\x26\xe8\x4e\x40\x65\x6c\xfc\x1c\xe7\x03\xbc\xb9\x7d\x77\xa0\xd5\x5a\xd3\x92\xf5\xb2\xcf\x8b\x6e\x1c\xa1\xd2\xd1\xec\x84\xf3\x0b\x16\xae\xdb\x05\x82\xe1\x88\x3a\xe6\x29\x78\x49\x24\x7d\xc0\x54\xe0\x6b\xe9\xc0\x52\x6b\xc9\x91\xee\x00\x6a\x44\x18\x78\x13\x6a\x30\x9b\x5f\xa8\xf4\x05\xdc\x91\x65\x32\x9c\xb6\x41\x09\x46\xb1\x1d\x59\x0f\x96\x4a\xb3\xd5\xf2\xd7\x03\x6d\x07\xde\x44\xa6\x0a\x3d\x25\x14\x18\x46\x4c\x47\x8d\x0a\x76\xa8\x02\xbd\x04\xd4\x02\x1a\xdc\x83\x25\xe6\x02\x41\x1f\xd1\x8b\x5b\x5c\x01\x3f\x18\x4b\x20\x75\x65\x56\x50\x7b\xdf\xba\xd5\xd5\xd5\x56\xfa\x1e\x8d\x4b\xd3\x34\x41\x4b\xbf\xbf\x8a\xc0\x2a\x37\xc1\x1b\xeb\xae\x04\xed\x48\x5d\x39\xb9\x5d\xa2\x2d\x6b\xe9\xa9\xf4\xc1\xd2\x15\xb6\x72\x19\x45\xd7\x31\x50\x8a\x46\xfc\xc5\x26\xfc\x76\x2f\x46\xb2\x9e\x44\x47\x37\x22\x10\x3e\xe1\x01\x06\x43\xf6\x39\xa6\xa3\x9d\x16\x83\xa1\x79\x8a\xad\xf3\xf1\x9f\x77\xf7\xd0\xb3\x8e\xce\x98\x5a\x3f\xda\x7d\x38\xe8\x06\x17\xb0\xc1\xa4\xae\xc8\x76\x4e\xac\xac\x69\x22\x4d\xd2\xa2\x35\x52\xfb\xf8\x51\x2a\x49\x7a\x6a\x7e\x17\x36\x8d\xf4\xec\xf7\xff\x04\x72\x9e\x7d\x55\xc0\x3a\x96\x28\xd8\x70\x54\x0a\xf4\x24\x0a\x78\xa7\x61\x8d\x0d\xa9\x35\x3a\xfa\xcd\x1d\xc0\x96\x76\x4b\x36\xec\x65\x2e\x38\xae\xae\xd3\xcd\x9d\xd5\x8e\x16\xfa\x8a\x37\xe3\xaf\x51\xae\xde\xb5\x54\x8e\xf2\x26\x81\x7f\x04\x3d\xe2\x7c\x38\x2d\x80\xc3\xe0\x50\x4e\x69\x0d\x8f\x52\x0b\xf3\x18\xa7\x2a\x4b\xf4\x6b\x3f\x33\x3a\x92\x4f\x74\x1e\xb7\x37\xdf\xbe\x35\xdc\x52\x58\x94\xb1\xee\x9b\xe0\xa7\x7b\x26\x8a\xdc\xd7\x04\x0d\x7e\x96\x4d\x68\x60\x6b\xb1\x24\x68\xc9\x4a\x23\xf8\x43\x7b\x12\x9c\x95\x08\xda\xb0\x70\xb5\x71\x04\x82\x69\x9f\xd0\x04\x8e\xdd\x8d\x32\xe5\x03\x09\xd8\xec\x01\xe1\xd6\x08\xb8\x91\xce\x86\xc8\x08\xbe\x0d\x62\x4b\xfe\x25\x6c\xa8\xe2\xa8\xf0\x35\xfa\x8e\x14\x1f\xac\x58\x68\x51\x64\xa8\xfe\x40\xe8\x02\x9b\x52\x6a\x68\xa4\x0e\x9e\x13\x3b\xca\x2c\x75\x94\x19\xcb\x92\x5a\xdf\x67\x3d\x13\xbb\x8e\xe6\x93\x3a\x97\x1c\x3c\x4a\x74\x04\xd2\xc3\xa3\x54\x0a\xbc\x95\xdb\x2d\xd9\x4e\x82\x24\x10\x56\x9e\x3a\xb4\xa5\xcf\x2d\x95\x9e\xc4\x7b\x23\x06\x9b\x66\x48\x2a\x6c\x5d\x4e\xfe\xca\xd8\x06\xfd\x8a\xd1\xeb\xf5\xdf\x4f\x56\x93\x0a\x2b\xb8\x3e\x59\xea\x82\x92\x41\x6f\x4b\x76\x31\x95\xbf\xc5\x52\xfa\xfd\x47\x72\x64\x77\x11\x80\xcf\xf8\x98\xe3\x53\x56\x7b\x90\x15\xb8\x12\x15\x43\x49\x68\x19\xa3\xe9\xb3\xb7\xc9\xb9\x5c\x60\x7a\xca\x8c\x2f\x3d\xe9\x8c\xb6\xc9\x85\x7d\xcc\x3a\x8f\xd6\x3b\xb6\xbc\x26\x12\xb1\xad\xca\x29\xb3\x31\x46\x11\x4e\xe9\xa5\x4c\xb9\x50\x81\xe3\xdc\xfa\xd0\x92\xbe\xe3\x9e\x13\x2c\x29\x1a\x9a\xa2\x61\xcc\xe7\x49\x34\x63\x8d\x5a\x93\xca\x2d\x4d\xb8\xaf\xbb\x9d\x10\x1c\x89\x68\xa7\xa4\x79\x2e\xb8\x66\xc1\xa7\x1f\xb2\xc1\x2d\x5d\xc0\xf4\x1d\xef\x03\x4b\x15\x59\xd2\x25\x7d\x1d\xe6\xbb\x5c\x27\x90\x65\xdf\x77\x03\xa6\x82\x43\x73\x3f\x6b\xe8\xb3\x9c\x67\x30\xf6\xb0\x74\x06\xa2\xf6\x2d\x97\x11\x21\x4b\xee\x0c\x62\x10\xac\x55\x70\x9e\x6c\x82\x55\x0b\xb2\x69\x15\x35\x7d\x3f\x02\xde\x64\x64\x0c\x8e\x18\xcc\x5a\xb2\x9c\x96\x1c\xfe\x7d\x04\xc7\xae\x86\x2b\x5f\x24\x7a\x72\x94\x74\x68\x4e\x45\x5c\xc2\x87\xbb\x9b\xcc\xec\x9b\x8f\x1f\x66\xf4\xcf\x1a\x27\xc9\xf0\xe6\x1c\x4e\x1f\xa7\xc0\x28\xf3\xc0\xe7\x30\x69\x96\x23\x57\xf0\xd3\x8c\x5b\x66\x4b\xc7\x64\x4b\xca\xbc\xc9\xec\xd1\x35\xa2\x9f\x3a\xe8\x74\x51\xa1\x8d\xfd\xf8\xc5\xa5\x36\xee\x1e\x15\x5b\xb3\x61\xb0\xba\xac\xda\xce\x43\x42\xba\x0f\x9c\xad\x96\xb1\xf9\x2d\x8d\x15\xfd\x09\x66\x48\x3b\xb2\xfb\xd1\x35\xf4\x78\x48\x4f\x4d\x16\x82\x72\x6a\x7e\x97\xa8\x9e\x32\x99\x23\x7f\x0e\xe8\x00\x4a\xc3\xe9\xe1\x89\xdd\x9a\xdf\x31\x94\x2a\x6e\xe4\x96\xd9\x90\xea\xc6\x19\x84\x89\xcf\x14\xe9\x36\x35\xc7\x6a\x0c\xae\x87\xed\xa9\xfb\x25\xcf\xca\x1e\xa6\x41\x6a\xe7\x51\x97\xe4\x72\xed\x01\x3c\x65\xde\x0c\xb7\x21\x32\x12\xf5\xda\x04\x47\x0e\x2a\x49\x4a\xb8\xd4\x95\xc4\x03\x9b\x39\x03\x44\x23\xd4\x34\x44\x1b\xea\x9e\x2c\x48\x5d\xaa\x20\xb8\xbe\xf6\xbd\xe6\x9c\xd0\xe7\x9d\xd6\x5b\xf3\xbc\xeb\x32\x7a\xae\xd3\xb1\x08\x0e\x87\x5b\xdb\xc1\x35\xf3\x52\xc1\x33\x42\x21\xd9\xe2\x5c\x40\x74\x43\xa1\xf3\xb7\xd6\x6c\x9e\xab\xc9\xf7\xe8\x3a\x88\xeb\x20\xfa\xe0\xb8\x47\x74\x50\xd6\xc4\xfd\xe6\x1f\xa4\xcd\xbd\x45\xed\x64\xff\xc2\xf6\x15\x54\xf2\x1d\xc1\xee\x5e\x66\xf4\xd3\x82\xf6\xc0\x19\xfb\x73\x6d\x7c\x4d\xf6\x0f\xb0\x43\x7a\x18\x79\x86\xf2\xdf\x85\x06\x35\x58\x42\x81\x1b\x45\x3d\x81\xbe\xbc\x73\xea\x08\xf2\x28\x55\xbe\xbf\x19\x06\x6e\x4c\xf0\xd1\x0f\xbd\xdd\xce\xc6\xf5\x85\x3a\x75\x6f\x49\xcf\x50\xe9\xaf\x1b\x2b\xa9\xfa\x5b\x3a\x78\x78\xaa\x39\x38\xf6\x85\xfb\x4d\xe4\x8c\xd5\xff\x99\xa1\x77\x77\xe8\x18\xfe\x14\xa0\x90\xab\xfd\xe7\xe4\xe7\x98\x37\xd5\x20\xf6\x4b\x4e\x15\x9e\xb9\xb7\x81\x5e\xc2\x5b\x54\x8e\x5e\x9e\x09\x9e\x1f\xf5\x83\x36\x8f\xb9\xbb\xcd\xb3\x55\xc8\xf7\xaf\xb3\x0a\xc4\x5e\x76\x28\xe6\x83\x1a\x5f\x2e\x4b\xbe\xb3\x3b\x1e\xcb\xf1\x2b\x6c\x6e\xc3\x49\x37\x77\x2a\x46\xb6\x8d\x1f\x6f\x41\x6b\x71\x9f\xdd\x11\x9f\xaf\x2f\x6a\x0c\x62\xab\xd5\xd7\xe2\x43\xc5\xed\x9c\x7f\xdc\x04\xb7\xd6\x94\xe4\xe6\x74\xca\xf7\xee\xbd\xb6\xef\xe9\x71\x76\xed\x96\xb4\x98\x37\xf7\x32\xd5\xfc\xf3\x3b\x32\x17\xe2\x7e\xc3\x5b\x94\x6a\x76\xf9\xac\xcf\xcf\xe6\xff\x57\x6b\xe9\x9e\xbc\x36\x4e\xdc\x76\x93\xae\xe7\xbb\xe1\x02\x19\x61\x66\xbe\x7b\xbd\x48\x84\x47\x63\x1f\xc8\xae\x7f\xcf\x46\xb6\x63\x79\xf7\x3b\x59\xf9\xa9\xec\x5d\x8e\xfe\xfa\x9c\x12\x9d\xc9\xc8\xb9\x5c\xcc\x1e\x3a\x99\xec\x2e\x55\x2b\xf0\x36\xa4\x3f\x6b\xde\x58\xae\xf5\x47\x33\x61\x73\x78\x04\xef\xe5\x4e\x90\x0e\xff\xfd\xdf\x62\x40\xf7\xfe\x91\xee\xfd\xf4\xc7\xe0\x37\xdf\xc4\x8f\xfe\x6f\x5f\xfc\x3c\xba\x40\xc0\x4f\x3f\x2f\x3a\xc6\x24\x3e\xf5\xbf\xea\x78\xf2\xff\x01\x00\x00\xff\xff\x31\x0f\xfe\x9b\x71\x1d\x00\x00") +var _custom_resource_definitionYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x59\x4b\x8f\xdb\x38\x12\xbe\xfb\x57\x14\x66\x0f\xd9\x05\x62\x75\x67\x73\x59\xf8\x96\x71\x6f\x30\xc1\xce\x24\x8d\x74\x4f\x2e\x83\xc1\xa2\x2c\x96\x2c\x4e\x53\xa4\x96\x0f\x77\x3c\x8b\xfd\xef\x8b\xa2\x28\xcb\x92\xa9\xb6\x1b\xc9\x3c\x78\x13\x1f\xf5\xae\xaf\x8a\xd4\x72\xb9\x5c\x60\x2b\x3f\x91\x75\xd2\xe8\x15\x60\x2b\xe9\xb3\x27\xcd\x5f\xae\x78\xf8\x87\x2b\xa4\xb9\xda\xbd\x5a\x3c\x48\x2d\x56\xb0\x0e\xce\x9b\xe6\x23\x39\x13\x6c\x49\x37\x54\x49\x2d\xbd\x34\x7a\xd1\x90\x47\x81\x1e\x57\x0b\x00\xd4\xda\x78\xe4\x69\xc7\x9f\x00\xa5\xd1\xde\x1a\xa5\xc8\x2e\xb7\xa4\x8b\x87\xb0\xa1\x4d\x90\x4a\x90\x8d\xc4\x7b\xd6\xbb\xeb\xe2\x75\x71\xbd\x00\x28\x2d\xc5\xe3\xf7\xb2\x21\xe7\xb1\x69\x57\xa0\x83\x52\x0b\x00\x8d\x0d\xad\x20\xb4\x5b\x8b\x82\x4a\xa3\x2b\xb9\x75\x45\xfa\x2c\x1a\xd4\xb8\x25\x51\x98\x96\xb4\xab\x65\xe5\x0b\x69\x16\xae\xa5\x92\xa5\xd8\x5a\x13\xda\xc3\xd1\xfc\xde\x8e\x7e\x12\xba\x53\xf8\xc7\x6e\xff\x3a\xb2\x8a\xf3\x4a\x3a\xff\xaf\xd3\xb5\xef\xa5\xf3\x71\xbd\x55\xc1\xa2\x9a\x0a\x19\x97\x5c\x6d\xac\x7f\x3f\xb0\x58\xf6\x9b\xba\x55\xa9\xb7\x41\xa1\x9d\x1c\x5d\x00\xb8\xd2\xb4\xb4\x82\x78\xb2\xc5\x92\xc4\x02\x20\x59\x2d\x52\x5a\x02\x0a\x11\xfd\x80\xea\xd6\x4a\xed\xc9\xae\x8d\x0a\x8d\x3e\xf0\xf9\xc5\x19\x7d\x8b\xbe\x5e\x41\xc1\x06\x29\x04\x39\x69\x49\x14\x89\x4a\xdc\xd5\x5b\x37\xad\xfd\x7b\xbc\xe6\xf7\x2c\x82\xf3\x56\xea\x6d\x86\xa8\x47\x1f\x5c\x51\x4b\xe7\x8d\xdd\xff\x74\xfd\x73\xd1\xd6\xe8\x68\x44\xf7\x78\xe6\xb9\xd4\x4a\xa3\x3b\x05\x1d\x7f\xf1\xe9\x11\x69\xe7\x71\xfb\x75\x48\x77\xeb\x53\xe2\xc3\xd4\x97\x51\xb7\x84\x6e\x62\xed\xd1\xd4\x97\x51\x6f\xc8\xb9\xc1\x0e\x1d\xf9\xf1\xdc\x09\xfd\x6e\xd3\xee\x15\xaa\xb6\xc6\x57\x5d\x18\x96\x35\x35\xb8\x4a\x27\x38\x3f\xde\xdc\xbe\xfb\xf4\xfa\x6e\x34\x0d\x1c\x25\xa5\x95\xad\x8f\x99\x3b\xca\x04\x90\x0e\x7c\x4d\xd0\x9d\x80\xca\xd8\xf8\x39\xce\x07\x78\x73\xfb\xee\x40\xab\xb5\xa6\x25\xeb\x65\x9f\x17\xdd\x38\x42\xa5\xa3\xd9\x09\xe7\x17\x2c\x5c\xb7\x0b\x04\xc3\x11\x75\xcc\x53\xf0\x92\x48\xfa\x80\xa9\xc0\xd7\xd2\x81\xa5\xd6\x92\x23\xdd\x01\xd4\x88\x30\xf0\x26\xd4\x60\x36\xbf\x50\xe9\x0b\xb8\x23\xcb\x64\x38\x6d\x83\x12\x8c\x62\x3b\xb2\x1e\x2c\x95\x66\xab\xe5\xaf\x07\xda\x0e\xbc\x89\x4c\x15\x7a\x4a\x28\x30\x8c\x98\x8e\x1a\x15\xec\x50\x05\x7a\x09\xa8\x05\x34\xb8\x07\x4b\xcc\x05\x82\x3e\xa2\x17\xb7\xb8\x02\x7e\x30\x96\x40\xea\xca\xac\xa0\xf6\xbe\x75\xab\xab\xab\xad\xf4\x3d\x1a\x97\xa6\x69\x82\x96\x7e\x7f\x15\x81\x55\x6e\x82\x37\xd6\x5d\x09\xda\x91\xba\x72\x72\xbb\x44\x5b\xd6\xd2\x53\xe9\x83\xa5\x2b\x6c\xe5\x32\x8a\xae\x63\xa0\x14\x8d\xf8\x8b\x4d\xf8\xed\x5e\x8c\x64\x3d\x89\x8e\x6e\x44\x20\x7c\xc2\x03\x0c\x86\xec\x73\x4c\x47\x3b\x2d\x06\x43\xf3\x14\x5b\xe7\xe3\x3f\xef\xee\xa1\x67\x1d\x9d\x31\xb5\x7e\xb4\xfb\x70\xd0\x0d\x2e\x60\x83\x49\x5d\x91\xed\x9c\x58\x59\xd3\x44\x9a\xa4\x45\x6b\xa4\xf6\xf1\xa3\x54\x92\xf4\xd4\xfc\x2e\x6c\x1a\xe9\xd9\xef\xff\x09\xe4\x3c\xfb\xaa\x80\x75\x2c\x51\xb0\xe1\xa8\x14\xe8\x49\x14\xf0\x4e\xc3\x1a\x1b\x52\x6b\x74\xf4\x9b\x3b\x80\x2d\xed\x96\x6c\xd8\xcb\x5c\x70\x5c\x5d\xa7\x9b\x3b\xab\x1d\x2d\xf4\x15\x6f\xc6\x5f\xa3\x5c\xbd\x6b\xa9\x1c\xe5\x4d\x02\xff\x08\x7a\xc4\xf9\x70\x5a\x00\x87\xc1\xa1\x9c\xd2\x1a\x1e\xa5\x16\xe6\x31\x4e\x55\x96\xe8\xd7\x7e\x66\x74\x24\x9f\xe8\x3c\x6e\x6f\xbe\x7d\x6b\xb8\xa5\xb0\x28\x63\xdd\x37\xc1\x4f\xf7\x4c\x14\xb9\xaf\x09\x1a\xfc\x2c\x9b\xd0\xc0\xd6\x62\x49\xd0\x92\x95\x46\xf0\x87\xf6\x24\x38\x2b\x11\xb4\x61\xe1\x6a\xe3\x08\x04\xd3\x3e\xa1\x09\x1c\xbb\x1b\x65\xca\x07\x12\xb0\xd9\x03\xc2\xad\x11\x70\x23\x9d\x0d\x91\x11\x7c\x1b\xc4\x96\xfc\x4b\xd8\x50\xc5\x51\xe1\x6b\xf4\x1d\x29\x3e\x58\xb1\xd0\xa2\xc8\x50\xfd\x81\xd0\x05\x36\xa5\xd4\xd0\x48\x1d\x3c\x27\x76\x94\x59\xea\x28\x33\x96\x25\xb5\xbe\xcf\x7a\x26\x76\x1d\xcd\x27\x75\x2e\x39\x78\x94\xe8\x08\xa4\x87\x47\xa9\x14\x78\x2b\xb7\x5b\xb2\x9d\x04\x49\x20\xac\x3c\x75\x68\x4b\x9f\x5b\x2a\x3d\x89\xf7\x46\x0c\x36\xcd\x90\x54\xd8\xba\x9c\xfc\x95\xb1\x0d\xfa\x15\xa3\xd7\xeb\xbf\x9f\xac\x26\x15\x56\x70\x7d\xb2\xd4\x05\x25\x83\xde\x96\xec\x62\x2a\x7f\x8b\xa5\xf4\xfb\x8f\xe4\xc8\xee\x22\x00\x9f\xf1\x31\xc7\xa7\xac\xf6\x20\x2b\x70\x25\x2a\x86\x92\xd0\x32\x46\xd3\x67\x6f\x93\x73\xb9\xc0\xf4\x94\x19\x5f\x7a\xd2\x19\x6d\x93\x0b\xfb\x98\x75\x1e\xad\x77\x6c\x79\x4d\x24\x62\x5b\x95\x53\x66\x63\x8c\x22\x9c\xd2\x4b\x99\x72\xa1\x02\xc7\xb9\xf5\xa1\x25\x7d\xc7\x3d\x27\x58\x52\x34\x34\x45\xc3\x98\xcf\x93\x68\xc6\x1a\xb5\x26\x95\x5b\x9a\x70\x5f\x77\x3b\x21\x38\x12\xd1\x4e\x49\xf3\x5c\x70\xcd\x82\x4f\x3f\x64\x83\x5b\xba\x80\xe9\x3b\xde\x07\x96\x2a\xb2\xa4\x4b\xfa\x3a\xcc\x77\xb9\x4e\x20\xcb\xbe\xef\x06\x4c\x05\x87\xe6\x7e\xd6\xd0\x67\x39\xcf\x60\xec\x61\xe9\x0c\x44\xed\x5b\x2e\x23\x42\x96\xdc\x19\xc4\x20\x58\xab\xe0\x3c\xd9\x04\xab\x16\x64\xd3\x2a\x6a\xfa\x7e\x04\xbc\xc9\xc8\x18\x1c\x31\x98\xb5\x64\x39\x2d\x39\xfc\xfb\x08\x8e\x5d\x0d\x57\xbe\x48\xf4\xe4\x28\xe9\xd0\x9c\x8a\xb8\x84\x0f\x77\x37\x99\xd9\x37\x1f\x3f\xcc\xe8\x9f\x35\x4e\x92\xe1\xcd\x39\x9c\x3e\x4e\x81\x51\xe6\x81\xcf\x61\xd2\x2c\x47\xae\xe0\xa7\x19\xb7\xcc\x96\x8e\xc9\x96\x94\x79\x93\xd9\xa3\x6b\x44\x3f\x75\xd0\xe9\xa2\x42\x1b\xfb\xf1\x8b\x4b\x6d\xdc\x3d\x2a\xb6\x66\xc3\x60\x75\x59\xb5\x9d\x87\x84\x74\x1f\x38\x5b\x2d\x63\xf3\x5b\x1a\x2b\xfa\x13\xcc\x90\x76\x64\xf7\xa3\x6b\xe8\xf1\x90\x9e\x9a\x2c\x04\xe5\xd4\xfc\x2e\x51\x3d\x65\x32\x47\xfe\x1c\xd0\x01\x94\x86\xd3\xc3\x13\xbb\x35\xbf\x63\x28\x55\xdc\xc8\x2d\xb3\x21\xd5\x8d\x33\x08\x13\x9f\x29\xd2\x6d\x6a\x8e\xd5\x18\x5c\x0f\xdb\x53\xf7\x4b\x9e\x95\x3d\x4c\x83\xd4\xce\xa3\x2e\xc9\xe5\xda\x03\x78\xca\xbc\x19\x6e\x43\x64\x24\xea\xb5\x09\x8e\x1c\x54\x92\x94\x70\xa9\x2b\x89\x07\x36\x73\x06\x88\x46\xa8\x69\x88\x36\xd4\x3d\x59\x90\xba\x54\x41\x70\x7d\xed\x7b\xcd\x39\xa1\xcf\x3b\xad\xb7\xe6\x79\xd7\x65\xf4\x5c\xa7\x63\x11\x1c\x0e\xb7\xb6\x83\x6b\xe6\xa5\x82\x67\x84\x42\xb2\xc5\xb9\x80\xe8\x86\x42\xe7\x6f\xad\xd9\x3c\x57\x93\xef\xd1\x75\x10\xd7\x41\xf4\xc1\x71\x8f\xe8\xa0\xac\x89\xfb\xcd\x3f\x48\x9b\x7b\x8b\xda\xc9\xfe\x85\xed\x2b\xa8\xe4\x3b\x82\xdd\xbd\xcc\xe8\xa7\x05\xed\x81\x33\xf6\xe7\xda\xf8\x9a\xec\x1f\x60\x87\xf4\x30\xf2\x0c\xe5\xbf\x0b\x0d\x6a\xb0\x84\x02\x37\x8a\x7a\x02\x7d\x79\xe7\xd4\x11\xe4\x51\xaa\x7c\x7f\x33\x0c\xdc\x98\xe0\xa3\x1f\x7a\xbb\x9d\x8d\xeb\x0b\x75\xea\xde\x92\x9e\xa1\xd2\x5f\x37\x56\x52\xf5\xb7\x74\xf0\xf0\x54\x73\x70\xec\x0b\xf7\x9b\xc8\x19\xab\xff\x33\x43\xef\xee\xd0\x31\xfc\x29\x40\x21\x57\xfb\xcf\xc9\xcf\x31\x6f\xaa\x41\xec\x97\x9c\x2a\x3c\x73\x6f\x03\xbd\x84\xb7\xa8\x1c\xbd\x3c\x13\x3c\x3f\xea\x07\x6d\x1e\x73\x77\x9b\x67\xab\x90\xef\x5f\x67\x15\x88\xbd\xec\x50\xcc\x07\x35\xbe\x5c\x96\x7c\x67\x77\x3c\x96\xe3\x57\xd8\xdc\x86\x93\x6e\xee\x54\x8c\x6c\x1b\x3f\xde\x82\xd6\xe2\x3e\xbb\x23\x3e\x5f\x5f\xd4\x18\xc4\x56\xab\xaf\xc5\x87\x8a\xdb\x39\xff\xb8\x09\x6e\xad\x29\xc9\xcd\xe9\x94\xef\xdd\x7b\x6d\xdf\xd3\xe3\xec\xda\x2d\x69\x31\x6f\xee\x65\xaa\xf9\xe7\x77\x64\x2e\xc4\xfd\x86\xb7\x28\xd5\xec\xf2\x59\x9f\x9f\xcd\xff\xaf\xd6\xd2\x3d\x79\x6d\x9c\xb8\xed\x26\x5d\xcf\x77\xc3\x05\x32\xc2\xcc\x7c\xf7\x7a\x91\x08\x8f\xc6\x3e\x90\x5d\xff\x9e\x8d\x6c\xc7\xf2\xee\x77\xb2\xf2\x53\xd9\xbb\x1c\xfd\xf5\x39\x25\x3a\x93\x91\x73\xb9\x98\x3d\x74\x32\xd9\x5d\xaa\x56\xe0\x6d\x48\x7f\xd6\xbc\xb1\x5c\xeb\x8f\x66\xc2\xe6\xf0\x08\xde\xcb\x9d\x20\x1d\xfe\xfb\xbf\xc5\x80\xee\xfd\x23\xdd\xfb\xe9\x8f\xc1\x6f\xbe\x89\x1f\xfd\xdf\xbe\xf8\x79\x74\x81\x80\x9f\x7e\x5e\x74\x8c\x49\x7c\xea\x7f\xd5\xf1\xe4\xff\x03\x00\x00\xff\xff\x30\x3b\x1c\x49\x70\x1d\x00\x00") func custom_resource_definitionYamlBytes() ([]byte, error) { return bindataRead( @@ -232,7 +232,7 @@ func managed_upgrade_rolebindingYaml() (*asset, error) { return a, nil } -var _monitoring_reader_roleYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8c\x8e\xb1\x6a\x03\x41\x0c\x44\xfb\xfd\x0a\xe1\xfe\x36\xa4\x0b\xfb\x03\xe9\x53\xa4\x97\xd7\xf2\x9d\xf0\xad\xb4\x48\xda\x0b\xe4\xeb\x83\x2f\x87\x09\xb8\x49\xa5\xd1\xcc\x30\x3c\xec\xfc\x49\xe6\xac\x52\xc0\xce\x58\x33\x8e\x58\xd4\xf8\x1b\x83\x55\xf2\xed\xcd\x33\xeb\xcb\xf6\x9a\x6e\x2c\x97\x02\x1f\xba\x52\x6a\x14\x78\xc1\xc0\x92\x00\x04\x1b\x15\x68\x43\xa7\xa6\xc2\xa1\xc6\x32\x4f\x46\x78\x21\x3b\x52\xef\x58\xa9\x80\x76\x12\x5f\xf8\x1a\x7f\x8a\xc9\xc6\x4a\x5e\xd2\x04\xd8\xf9\xdd\x74\x74\xbf\x6f\x4e\x70\x3a\x25\x00\x23\xd7\x61\x95\x0e\xaf\xaa\x5c\x79\x6e\xd8\x1d\x60\x37\x9c\x6c\xe3\x4a\x58\xab\x0e\x09\x3f\xbc\x6a\xf4\xd0\x7b\x7e\x7f\x36\xb2\xf3\x31\x33\x53\xec\x77\x65\xff\x15\x5f\x18\x75\x79\x46\x30\x1d\x41\xf9\x41\x9d\x59\x9f\x91\xf6\xce\xff\xf6\x7f\x02\x00\x00\xff\xff\x98\x29\x94\x73\x68\x01\x00\x00") +var _monitoring_reader_roleYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8c\x8e\xbf\x4e\xc3\x40\x0c\xc6\xf7\x7b\x0a\xab\x7b\x82\xd8\xd0\xbd\x00\x3b\x03\xbb\x7b\x71\x13\xab\x39\xfb\x64\xfb\x82\xc4\xd3\xa3\x86\x80\x40\x5d\x3a\xd9\xdf\x1f\x7d\xfa\x61\xe3\x77\x32\x67\x95\x0c\x76\xc6\x32\x62\x8f\x45\x8d\x3f\x31\x58\x65\xbc\xbe\xf8\xc8\xfa\xb4\x3d\xa7\x2b\xcb\x94\xe1\x4d\x57\x4a\x95\x02\x27\x0c\xcc\x09\x40\xb0\x52\x86\xda\x75\xa8\x2a\x1c\x6a\x2c\xf3\x60\x84\x13\xd9\x91\x7a\xc3\x42\x19\xb4\x91\xf8\xc2\x97\xf8\x53\x4c\xd6\x57\xf2\x9c\x06\xc0\xc6\xaf\xa6\xbd\xf9\x6d\x73\x80\xd3\x29\x01\x18\xb9\x76\x2b\x74\x78\x45\xe5\xc2\x73\xc5\xe6\xbb\x74\xb2\x8d\x0b\x61\x29\xda\x25\x7e\xbc\x62\x14\xff\xf2\x9b\xd8\xc8\xce\xc7\xc8\x4c\xb1\xdf\x95\xfd\xfb\xf9\xc0\x28\xcb\x3d\x80\x69\x0f\x1a\x7f\x99\x47\xd6\x7b\xa0\xbd\xf3\xd8\xfe\x57\x00\x00\x00\xff\xff\xfb\x3d\x00\x65\x66\x01\x00\x00") func monitoring_reader_roleYamlBytes() ([]byte, error) { return bindataRead( diff --git a/pkg/operator/controllers/muo/staticresources/config.yaml b/pkg/operator/controllers/muo/staticresources/config.yaml index 3a95b6280..228bdb617 100644 --- a/pkg/operator/controllers/muo/staticresources/config.yaml +++ b/pkg/operator/controllers/muo/staticresources/config.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: managed-upgrade-operator-config - namespace: openshift-managed-upgrade-operator + namespace: openshift-managed-upgrade-operator data: config.yaml: | configManager: diff --git a/pkg/operator/controllers/muo/staticresources/custom_resource_definition.yaml b/pkg/operator/controllers/muo/staticresources/custom_resource_definition.yaml index cb9bd74a6..af0640cc8 100644 --- a/pkg/operator/controllers/muo/staticresources/custom_resource_definition.yaml +++ b/pkg/operator/controllers/muo/staticresources/custom_resource_definition.yaml @@ -1,4 +1,3 @@ - --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition diff --git a/pkg/operator/controllers/muo/staticresources/monitoring_reader_role.yaml b/pkg/operator/controllers/muo/staticresources/monitoring_reader_role.yaml index 8b8bf2c57..c8ae29a69 100644 --- a/pkg/operator/controllers/muo/staticresources/monitoring_reader_role.yaml +++ b/pkg/operator/controllers/muo/staticresources/monitoring_reader_role.yaml @@ -7,7 +7,7 @@ rules: - apiGroups: - "" resources: - - configmaps + - configmaps - serviceaccounts - secrets - services diff --git a/pkg/operator/deploy/bindata.go b/pkg/operator/deploy/bindata.go index 273cb09f8..81d7fa386 100644 --- a/pkg/operator/deploy/bindata.go +++ b/pkg/operator/deploy/bindata.go @@ -247,7 +247,7 @@ func workerDeploymentYaml() (*asset, error) { return a, nil } -var _workerRoleYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xa4\x8e\xb1\x6e\x2c\x31\x08\x45\x7b\xbe\x82\x1f\xb0\x57\xaf\x7b\x72\x9b\x22\x7d\x14\xa5\x67\x3d\x24\x83\xc6\x63\x2c\xc0\xbb\x52\xbe\x3e\x9a\xd9\x6d\x53\xa5\xe2\x0a\x1d\x0e\x17\x52\x4a\x40\x43\x3e\xd8\x5c\xb4\x17\xb4\x2b\xd5\x4c\x33\x56\x35\xf9\xa6\x10\xed\x79\xfb\xef\x59\xf4\x72\xfb\x07\x9b\xf4\xa5\xe0\x4b\x9b\x1e\x6c\x6f\xda\x18\x76\x0e\x5a\x28\xa8\x00\x62\x35\x3e\x0f\xde\x65\x67\x0f\xda\x47\xc1\x3e\x5b\x03\xc4\x4e\x3b\x17\x24\xd3\xa4\x83\x8d\x42\x2d\xdd\xd5\x36\x36\xb0\xd9\xd8\x0b\x24\xa4\x21\xaf\xa6\x73\xf8\x61\x4a\x07\x9b\x75\x70\xf7\x55\x3e\x23\x8b\x02\xa2\xb1\xeb\xb4\xca\x4f\xa2\x3e\x5a\x38\x20\xde\xd8\xae\xcf\xed\x17\xc7\x39\x9b\xf8\x23\xdc\x29\xea\xfa\x17\xff\xc5\x83\x62\xfe\xf2\x66\x9c\xf6\x23\xcd\xb1\x50\x30\xfc\x04\x00\x00\xff\xff\x30\x78\x19\x41\x50\x01\x00\x00") +var _workerRoleYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xa4\x8e\xb1\x6e\x2c\x31\x08\x45\x7b\xbe\x82\x1f\xb0\x57\xaf\x7b\x72\x9b\x22\x7d\x14\xa5\x67\x3d\x24\x83\xc6\x63\x2c\xc0\xbb\x52\xbe\x3e\x9a\xd9\x6d\x53\xa5\xe2\x0a\x1d\x0e\x37\xa5\x04\x34\xe4\x83\xcd\x45\x7b\x41\xbb\x52\xcd\x34\x63\x55\x93\x6f\x0a\xd1\x9e\xb7\xff\x9e\x45\x2f\xb7\x7f\xb0\x49\x5f\x0a\xbe\xb4\xe9\xc1\xf6\xa6\x8d\x61\xe7\xa0\x85\x82\x0a\x20\x56\xe3\xf3\xe0\x5d\x76\xf6\xa0\x7d\x14\xec\xb3\x35\x40\xec\xb4\x73\x41\x32\x4d\x3a\xd8\x28\xd4\xd2\x5d\x6d\x63\x03\x9b\x8d\xbd\x40\x42\x1a\xf2\x6a\x3a\x87\x1f\xa6\x74\xb0\x59\x07\x77\x5f\xe5\x33\xb2\x28\x20\x1a\xbb\x4e\xab\xfc\x24\xea\xa3\x85\x03\xe2\x8d\xed\xfa\xdc\x7e\x71\x9c\xb3\x89\x3f\xc2\x9d\xa2\xae\x7f\xf1\x5f\x3c\x28\xe6\x2f\x6f\xc6\x69\x3f\xd2\x1c\x0b\x05\xc3\x4f\x00\x00\x00\xff\xff\x6c\x8c\x8d\xa2\x4f\x01\x00\x00") func workerRoleYamlBytes() ([]byte, error) { return bindataRead( diff --git a/pkg/operator/deploy/staticresources/worker/role.yaml b/pkg/operator/deploy/staticresources/worker/role.yaml index 9475e6cae..3c3c263fc 100644 --- a/pkg/operator/deploy/staticresources/worker/role.yaml +++ b/pkg/operator/deploy/staticresources/worker/role.yaml @@ -1,4 +1,3 @@ - --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole diff --git a/pkg/portal/ssh/proxy.go b/pkg/portal/ssh/proxy.go index 3d53ba8e7..ec263003c 100644 --- a/pkg/portal/ssh/proxy.go +++ b/pkg/portal/ssh/proxy.go @@ -281,8 +281,8 @@ func (s *ssh) newChannel(ctx context.Context, accessLog *logrus.Entry, nc crypto defer recover.Panic(s.log) ch2, rs2, err := downstreamConn.OpenChannel(nc.ChannelType(), nc.ExtraData()) - if err, ok := err.(*cryptossh.OpenChannelError); ok { - return nc.Reject(err.Reason, err.Message) + if errAsOpenChannel, ok := err.(*cryptossh.OpenChannelError); ok { + return nc.Reject(errAsOpenChannel.Reason, errAsOpenChannel.Message) } else if err != nil { return err } diff --git a/python/az/aro/linter_exclusions.yml b/python/az/aro/linter_exclusions.yml index 128fa616c..22cc6d562 100644 --- a/python/az/aro/linter_exclusions.yml +++ b/python/az/aro/linter_exclusions.yml @@ -4,12 +4,10 @@ aro create: cluster_resource_group: rule_exclusions: - option_length_too_long + - parameter_should_not_end_in_resource_group worker_vm_disk_size_gb: rule_exclusions: - option_length_too_long - cluster_resource_group: - rule_exclusions: - - parameter_should_not_end_in_resource_group vnet_resource_group_name: rule_exclusions: - parameter_should_not_end_in_resource_group