Manual rebase on upstream #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

EmilienM wants to merge 1,353 commits into openshift:master from shiftstack:sync

The diff you're trying to view is too large. We only load the first 3000 changed files.

.dockerignore

-Original file line number
+Diff line change
@@ -0,0 +1,14 @@
+    .git
+    .github
+    .vscode
+    _artifacts
+    bin/
+    config/
+    docs/
+    hack/
+    out/
+    scripts/
+    templates/
+    tmp/
+    **/.md
+    tilt-provider.json

.github/ISSUE_TEMPLATE/bug_report.md

-Original file line number
+Diff line change
@@ -0,0 +1,27 @@
+    ---
+    name: Bug report
+    about: Tell us about a problem you are experiencing
+    ---
+    /kind bug
+    **What steps did you take and what happened:**
+    [A clear and concise description of what the bug is.]
+    **What did you expect to happen:**
+    **Anything else you would like to add:**
+    [Miscellaneous information that will assist in solving the issue.]
+    **Environment:**
+    - Cluster API Provider OpenStack version (Or `git rev-parse HEAD` if manually built):
+    - Cluster-API version:
+    - OpenStack version:
+    - Minikube/KIND version:
+    - Kubernetes version (use `kubectl version`):
+    - OS (e.g. from `/etc/os-release`):

.github/ISSUE_TEMPLATE/feature_request.md

-Original file line number
+Diff line change
@@ -0,0 +1,14 @@
+    ---
+    name: Feature enhancement request
+    about: Suggest an idea for this project
+    ---
+    /kind feature
+    **Describe the solution you'd like**
+    [A clear and concise description of what you want to happen.]
+    **Anything else you would like to add:**
+    [Miscellaneous information that will assist in solving the issue.]

.github/PULL_REQUEST_TEMPLATE.md

-Original file line number
+Diff line change
@@ -1,10 +1,5 @@
-    <!--  Thanks for sending a pull request!  Here are some tips for you:
-. If this is your first time, read our contributor guidelines https://git.k8s.io/community/contributors/guide/pull-requests.md#the-pull-request-submit-process and developer guide https://git.k8s.io/community/contributors/devel/development.md#development-guide
-. If you want *faster* PR reviews, read how: https://git.k8s.io/community/contributors/guide/pull-requests.md#best-practices-for-faster-reviews
-. Follow the instructions for writing a release note: https://git.k8s.io/community/contributors/guide/release-notes.md
-. If the PR is unfinished, see how to mark it: https://git.k8s.io/community/contributors/guide/pull-requests.md#marking-unfinished-pull-requests
-. If this PR changes image versions, please title this PR "Bump <image name> from x.x.x to y.y.y."
-    -->
+    <!-- please add a icon to the title of this PR (see https://sigs.k8s.io/cluster-api/VERSIONING.md), and delete this line and similar ones -->
+    <!-- the icon will be either ⚠️ (:warning:, major or breaking changes), ✨ (:sparkles:, feature additions), 🐛 (:bug:, patch and bugfixes), 📖 (:book:, documentation or proposals), or 🌱 (:seedling:, minor or other) -->
     **What this PR does / why we need it**:
@@ Expand All / @@ -15,11 +10,12 @@ Fixes # @@
 . Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.
-    **Release note**:
-    <!--  Write your release note:
-. Enter your extended release note in the below block. If the PR requires additional action from users switching to the new release, include the string "action required".
-. If no release note is required, just write "NONE".
-    -->
-    ```release-note
+    **TODOs**:
+    <!-- Put an "X" character inside the brackets of each completed task. Some may be optional depending on the PR. -->
-    ```
+    - [ ] squashed commits
+    - if necessary:
+      - [ ] includes documentation
+      - [ ] adds unit tests
+    /hold

.gitignore

-Original file line number
+Diff line change
@@ -1,9 +1,34 @@
+    # Binaries for programs and plugins
+    *.exe
+    *.exe~
+    *.dll
+    *.so
+    *.dylib
+    bin
+    tmp
+    # Test binary, build with `go test -c`
+    *.test
+    # Output of the go coverage tool, specifically when used with LiteIDE
+    *.out
+    out
+    # Kubernetes Generated files - skip generated files, except for vendored files
+    !vendor/**/zz_generated.*
+    # editor and IDE paraphernalia
+    .idea
+    *.swp
+    *.swo
+    *~
     *.json
     *.sublime-project
     *.sublime-workspace
-    *.swp
-    .idea
     .DS_Store
     # OSX leaves these everywhere on SMB shares
@@ Expand Down Expand Up / @@ -72,6 +97,8 @@ network_closure.sh @@
     # User cluster configs
     .kubeconfig
+    kubeconfig
+    clouds.yaml
     .tags*
@@ Expand Down Expand Up / @@ -136,4 +163,16 @@ zz_generated.openapi.go @@
     *.pyc
     # binaries
-    /openstack-machine-controller
+    /bin
+    #Tilt files.
+    .tiltbuild
+    # sshuttle
+    sshuttle.pid
+    # Book
+    docs/book/book/
+    # venv
+    .venv

.golangci.yml

-Original file line number
+Diff line change
@@ -0,0 +1,181 @@
+    linters:
+      disable-all: true
+      enable:
+      - asasalint
+      - asciicheck
+      - bidichk
+      - bodyclose
+      - cyclop
+      - depguard
+      - dogsled
+      - dupword
+      - durationcheck
+      - errcheck
+      - exportloopref
+      - forbidigo
+      - gci
+      - goconst
+      - gocritic
+      - gocyclo
+      - godot
+      - gofmt
+      - gofumpt
+      - goheader
+      - goimports
+      - gomodguard
+      - goprintffuncname
+      - gosec
+      - gosimple
+      - govet
+      - importas
+      - ineffassign
+      - makezero
+      - misspell
+      - nakedret
+      - nestif
+      - nilerr
+      - noctx
+      - nolintlint
+      - prealloc
+      - predeclared
+      - revive
+      - rowserrcheck
+      - sqlclosecheck
+      - staticcheck
+      - stylecheck
+      - thelper
+      - typecheck
+      - unconvert
+      - unparam
+      - unused
+      - wastedassign
+      - whitespace
+    linters-settings:
+      cyclop:
+        # TODO(sbuerin) fix remaining findings and set to 20 afterwards
+        max-complexity: 30
+      gci:
+        local-prefixes: sigs.k8s.io/cluster-api-provider-openstack
+      gocritic:
+        enabled-tags:
+          - diagnostic
+          - experimental
+          - performance
+        disabled-checks:
+          - appendAssign
+          - dupImport # https://github.com/go-critic/go-critic/issues/845
+          - evalOrder
+          - ifElseChain
+          - octalLiteral
+          - regexpSimplify
+          - sloppyReassign
+          - truncateCmp
+          - typeDefFirst
+          - unnamedResult
+          - unnecessaryDefer
+          - whyNoLint
+          - wrapperFunc
+          - rangeValCopy
+          - hugeParam
+      importas:
+        no-unaliased: true
+        alias:
+          # Kubernetes
+          - pkg: k8s.io/api/core/v1
+            alias: corev1
+          - pkg: k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
+            alias: apiextensionsv1
+          - pkg: k8s.io/apimachinery/pkg/apis/meta/v1
+            alias: metav1
+          - pkg: k8s.io/apimachinery/pkg/api/errors
+            alias: apierrors
+          - pkg: k8s.io/apimachinery/pkg/util/errors
+            alias: kerrors
+          # Controller Runtime
+          - pkg: sigs.k8s.io/controller-runtime
+            alias: ctrl
+          # CAPO
+          - pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha3
+            alias: infrav1alpha3
+          - pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha4
+            alias: infrav1alpha4
+          - pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha5
+            alias: infrav1alpha5
+          - pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha6
+            alias: infrav1
+          - pkg: sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors
+            alias: capoerrors
+          # CAPI
+          - pkg: sigs.k8s.io/cluster-api/api/v1alpha3
+            alias: clusterv1alpha3
+          - pkg: sigs.k8s.io/cluster-api/api/v1alpha4
+            alias: clusterv1alpha4
+          - pkg: sigs.k8s.io/cluster-api/api/v1beta1
+            alias: clusterv1
+          # CABPK
+          - pkg: sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha3
+            alias: bootstrapv1alpha3
+          - pkg: sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha4
+            alias: bootstrapv1alpha4
+          - pkg: sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1
+            alias: bootstrapv1
+          # KCP
+          - pkg: sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1alpha3
+            alias: controlplanev1alpha3
+          - pkg: sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1alpha4
+            alias: controlplanev1alpha4
+          - pkg: sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1
+            alias: controlplanev1
+      staticcheck:
+        go: "1.17"
+      stylecheck:
+        go: "1.17"
+      nestif:
+        # minimal complexity of if statements to report, 5 by default
+        # TODO(sbuerin) fix remaining findings and set to 5 after:
+        # https://github.com/kubernetes-sigs/cluster-api-provider-openstack/pull/778
+        min-complexity: 13
+    issues:
+      max-same-issues: 0
+      max-issues-per-linter: 0
+      # List of regexps of issue texts to exclude, empty list by default.
+      exclude-rules:
+      - linters:
+        - gosec
+        text: "G108: Profiling endpoint is automatically exposed on /debug/pprof"
+      - linters:
+        - gosec
+        text: "G108: Profiling endpoint is automatically exposed on /debug/pprof"
+      # This directive allows the embed package to be imported with an underscore everywhere.
+      - linters:
+        - revive
+        source: _ "embed"
+      - linters:
+        - revive
+        - stylecheck
+        path: (test)/.*.go
+        text: should not use dot imports
+      - linters:
+        - revive
+        path: test/e2e/shared/defaults.go
+        text: "exported: exported const .* should have comment \\(or a comment on this block\\) or be unexported"
+      - linters:
+        - revive
+        text: "var-naming: don't use underscores in Go names;"
+        path: .*(api|types)\/.*\/.*conversion.*\.go$
+      - linters:
+        - stylecheck
+        text: "ST1003: should not use underscores in Go names;"
+        path: .*(api|types)\/.*\/.*conversion.*\.go$
+    run:
+      timeout: 10m
+      build-tags:
+      - e2e
+      skip-files:
+        - "zz_generated.*\\.go$"
+      allow-parallel-runners: true

CONTRIBUTING.md

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     ## Sign the CLA
-    Kubernetes projects require that you sign a Contributor License Agreement (CLA) before we can accept your pull requests.  Please see https://git.k8s.io/community/CLA.md for more info
+    Kubernetes projects require that you sign a Contributor License Agreement (CLA) before we can accept your pull requests. Please see https://git.k8s.io/community/CLA.md for more info
     ### Contributing A Patch
@@ Expand All @@
 . If your proposed change is accepted, and you haven't already done so, sign a Contributor License Agreement (see details above).
 . Fork the desired repo, develop and test your code changes.
 . Submit a pull request.
+. All code PR must be labeled with ⚠️ (:warning:, major or breaking changes), ✨ (:sparkles:, feature additions), 🐛 (:bug:, patch and bugfixes), 📖 (:book:, documentation or proposals), or 🌱 (:seedling:, minor or other)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Manual rebase on upstream #252

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!