Skip to content

Commit

Permalink
Revert "Update master with release-1.13 branch (dapr#7595)" (dapr#7598
Browse files Browse the repository at this point in the history 
)

This reverts commit 1421069.
  • Loading branch information
@yaron2
yaron2 authored Mar 6, 2024
1 parent 1421069 commit 678bff0
Show file tree
Hide file tree
Showing 176 changed files with 1,090 additions and 3,524 deletions.
43 changes: 0 additions & 43 deletions ...w-test-patches/e2e/release-1.12/dapr-sidecar-master/0003-remote-content-length-test.patch
View file

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/dapr-perf-components.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version: '1.21.8'
go-version-file: 'go.mod'
- name: Login to Azure
if: env.CHECKOUT_REPO != ''
uses: azure/login@v1
Expand Down Expand Up @@ -367,7 +367,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version: '1.21.8'
go-version-file: 'go.mod'
- uses: azure/setup-kubectl@v3
with:
version: ${{ env.KUBECTLVER }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dapr-perf.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version: '1.21.8'
go-version-file: 'go.mod'
- name: Login to Azure
if: env.CHECKOUT_REPO != ''
uses: azure/login@v1
Expand Down Expand Up @@ -401,7 +401,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version: '1.21.8'
go-version-file: 'go.mod'
- uses: azure/setup-kubectl@v3
with:
version: ${{ env.KUBECTLVER }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dapr-standalone-validation.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version: '1.21.8'
go-version-file: "go.mod"
- name: Build Dapr's sidecar
run: |
git status
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/dapr-test-sdk.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version: '1.21.8'
go-version-file: "go.mod"
- name: Checkout python-sdk repo to run tests.
uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -232,7 +232,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version: '1.21.8'
go-version-file: "go.mod"
- name: Checkout java-sdk repo to run tests.
uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -404,7 +404,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version: '1.21.8'
go-version-file: "go.mod"
- name: Checkout js-sdk repo to run tests.
uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -526,7 +526,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version: '1.21.8'
go-version-file: "go.mod"
- name: Set up Python 3.9
uses: actions/setup-python@v4
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dapr-test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version: '1.21.8'
go-version-file: "go.mod"
- name: Login to Azure
if: env.CHECKOUT_REPO != ''
uses: azure/login@v1
Expand Down Expand Up @@ -448,7 +448,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version: '1.21.8'
go-version-file: "go.mod"
- uses: azure/setup-kubectl@v3
with:
version: ${{ env.KUBECTLVER }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/dapr.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version: '1.21.8'
go-version-file: "go.mod"
- name: Check white space in .md files
if: github.event_name == 'pull_request'
run: |
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version: '1.21.8'
go-version-file: "go.mod"
- name: Run make test
env:
COVERAGE_OPTS: "-coverprofile=coverage.txt -covermode=atomic"
Expand Down Expand Up @@ -176,7 +176,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version: '1.21.8'
go-version-file: "go.mod"
- name: Build binaries
run: make build
- name: Override DAPR_HOST_IP for MacOS
Expand Down Expand Up @@ -268,7 +268,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version: '1.21.8'
go-version-file: "go.mod"
- name: Parse release version and set REL_VERSION and LATEST_RELEASE
run: python ./.github/scripts/get_release_version.py ${{ github.event_name }}
- name: Updates version for sidecar flavor
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/kind-e2e.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version: '1.21.8'
go-version-file: 'go.mod'
- name: Configure KinD
# Generate a KinD configuration file that uses:
# (a) a couple of worker nodes: this is needed to run both
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/version-skew.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v4
with:
go-version: '1.21.8'
go-version-file: 'go.mod'

- name: Build & download binaries
run: |
Expand Down Expand Up @@ -296,7 +296,7 @@ jobs:
id: setup-go
uses: actions/setup-go@v5
with:
go-version: '1.21.8'
go-version-file: 'go.mod'
- name: Configure KinD
run: |
cat > kind.yaml <<EOF
Expand Down
9 changes: 4 additions & 5 deletions charts/dapr/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,11 +194,10 @@ The Helm chart has the follow configuration options that can be supplied:
| `dapr_sidecar_injector.injectorImage.name` | Docker image name for sidecar injector service (`global.registry/dapr_sidecar_injector.injectorImage.name`) | `dapr`|
| `dapr_sidecar_injector.webhookFailurePolicy` | Failure policy for the sidecar injector | `Ignore` |
| `dapr_sidecar_injector.runAsNonRoot` | Boolean value for `securityContext.runAsNonRoot` for the Sidecar Injector container itself. You may have to set this to `false` when running in Minikube | `true` |
| `dapr_sidecar_injector.sidecarRunAsNonRoot` | When this boolean value is true (the default), the injected sidecar containers have `runAsRoot: true`. You may have to set this to `false` when running Minikube | `true` |
| `dapr_sidecar_injector.sidecarReadOnlyRootFilesystem` | When this boolean value is true (the default), the injected sidecar containers have `readOnlyRootFilesystem: true` | `true` |
| `dapr_sidecar_injector.enableK8sDownwardAPIs` | When set to true, uses the Kubernetes downward projection APIs to inject certain environmental variables (such as pod IP) into the daprd container. (default: `false`) | `true` |
| `dapr_sidecar_injector.sidecarDropALLCapabilities` | When this boolean valus is true, the injected sidecar containers have `securityContext.capabilities.drop: ["ALL"]` | `false` |
| `dapr_sidecar_injector.allowedServiceAccounts` | String value for extra allowed service accounts in the format of `namespace1:serviceAccount1,namespace2:serviceAccount2` | `""` |
| `dapr_sidecar_injector.sidecarRunAsNonRoot` | When this boolean value is true (the default), the injected sidecar containers have `runAsRoot: true`. You may have to set this to `false` when running Minikube | `true` |
| `dapr_sidecar_injector.sidecarReadOnlyRootFilesystem` | When this boolean value is true (the default), the injected sidecar containers have `readOnlyRootFilesystem: true` | `true` |
| `dapr_sidecar_injector.sidecarDropALLCapabilities` | When this boolean valus is true, the injected sidecar containers have `securityContext.capabilities.drop: ["ALL"]` | `false` |
| `dapr_sidecar_injector.allowedServiceAccounts` | String value for extra allowed service accounts in the format of `namespace1:serviceAccount1,namespace2:serviceAccount2` | `""` |
| `dapr_sidecar_injector.allowedServiceAccountsPrefixNames` | Comma-separated list of extra allowed service accounts. Each item in the list should be in the format of namespace:serviceaccount. To match service accounts by a common prefix, you can add an asterisk (`*`) at the end of the prefix. For instance, ns1*:sa2* will match any service account that starts with sa2, whose namespace starts with ns1. For example, it will match service accounts like sa21 and sa2223 in namespaces such as ns1, ns1dapr, and so on. | `""` |
| `dapr_sidecar_injector.resources` | Value of `resources` attribute. Can be used to set memory/cpu resources/limits. See the section "Resource configuration" above. Defaults to empty | `{}` |
| `dapr_sidecar_injector.debug.enabled` | Boolean value for enabling debug mode | `{}` |
Expand Down
2 changes: 1 addition & 1 deletion charts/dapr/charts/dapr_placement/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ports:
scaleZero: false
ha: false

maxActorApiLevel: 10
maxActorApiLevel: -1
minActorApiLevel: 0

cluster:
Expand Down
2 changes: 0 additions & 2 deletions charts/dapr/charts/dapr_sidecar_injector/templates/dapr_sidecar_injector_deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,6 @@ spec:
# Configuration for injected sidecars
- name: SIDECAR_RUN_AS_NON_ROOT
value: {{ .Values.sidecarRunAsNonRoot | toString | toYaml }}
- name: ENABLE_K8S_DOWNWARD_APIS
value: {{ .Values.enableK8sDownwardAPIs | toString | toYaml }}
- name: SIDECAR_DROP_ALL_CAPABILITIES
value: {{ .Values.sidecarDropALLCapabilities | toString | toYaml }}
- name: SIDECAR_READ_ONLY_ROOT_FILESYSTEM
Expand Down
1 change: 0 additions & 1 deletion charts/dapr/charts/dapr_sidecar_injector/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ runAsNonRoot: true
sidecarRunAsNonRoot: true
sidecarReadOnlyRootFilesystem: true
sidecarDropALLCapabilities: false
enableK8sDownwardAPIs: false
allowedServiceAccounts: ""
allowedServiceAccountsPrefixNames: ""
resources: {}
Expand Down
6 changes: 1 addition & 5 deletions cmd/injector/app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,11 @@ func Run() {
if err != nil {
return rerr
}
requester, derr := sentry.New(ctx, sentry.Options{
requester := sentry.New(sentry.Options{
SentryAddress: cfg.SentryAddress,
SentryID: sentryID,
Security: sec,
})
if derr != nil {
return derr
}

return inj.Run(ctx,
sec.TLSServerConfigNoClientAuth(),
sentryID,
Expand Down
2 changes: 1 addition & 1 deletion cmd/placement/options/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func New(origArgs []string) *Options {
fs.IntVar(&opts.HealthzPort, "healthz-port", defaultHealthzPort, "sets the HTTP port for the healthz server")
fs.BoolVar(&opts.TLSEnabled, "tls-enabled", false, "Should TLS be enabled for the placement gRPC server")
fs.BoolVar(&opts.MetadataEnabled, "metadata-enabled", opts.MetadataEnabled, "Expose the placement tables on the healthz server")
fs.IntVar(&opts.MaxAPILevel, "max-api-level", 10, "If set to >= 0, causes the reported 'api-level' in the cluster to never exceed this value")
fs.IntVar(&opts.MaxAPILevel, "max-api-level", -1, "If set to >= 0, causes the reported 'api-level' in the cluster to never exceed this value")
fs.IntVar(&opts.MinAPILevel, "min-api-level", 0, "Enforces a minimum 'api-level' in the cluster")
fs.IntVar(&opts.ReplicationFactor, "replicationFactor", defaultReplicationFactor, "sets the replication factor for actor distribution on vnodes")

Expand Down
Loading

0 comments on commit 678bff0

Please sign in to comment.