Skip to content

Commit 77938c6

Browse files
authored
Merge pull request #124 from mbaldessari/common-automatic-update
common automatic update
2 parents 87f1efa + 3c28043 commit 77938c6

File tree

75 files changed

+2164
-568
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+2164
-568
lines changed

common/.github/workflows/superlinter.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
# Run Linter against code base #
2222
################################
2323
- name: Lint Code Base
24-
uses: github/super-linter/slim@v6
24+
uses: super-linter/super-linter/slim@v7
2525
env:
2626
VALIDATE_ALL_CODEBASE: true
2727
DEFAULT_BRANCH: main
@@ -31,10 +31,13 @@ jobs:
3131
VALIDATE_BASH: false
3232
VALIDATE_CHECKOV: false
3333
VALIDATE_JSCPD: false
34+
VALIDATE_JSON_PRETTIER: false
35+
VALIDATE_MARKDOWN_PRETTIER: false
3436
VALIDATE_KUBERNETES_KUBECONFORM: false
3537
VALIDATE_PYTHON_PYLINT: false
3638
VALIDATE_SHELL_SHFMT: false
3739
VALIDATE_YAML: false
40+
VALIDATE_YAML_PRETTIER: false
3841
# VALIDATE_DOCKERFILE_HADOLINT: false
3942
# VALIDATE_MARKDOWN: false
4043
# VALIDATE_NATURAL_LANGUAGE: false

common/Changes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
## October 3, 2022
125125

126126
* Restore the ability to install a non-default site: `make TARGET_SITE=mysite install`
127-
* Revised tests (new output and filenames, requires adding new result files to git)
127+
* Revised tests (new output and filenames, requires adding new result files to Git)
128128
* ACM 2.6 required for ACM-based managed sites
129129
* Introduced global.clusterDomain template variable (without the `apps.` prefix)
130130
* Removed the ability to send specific charts to another cluster, use hosted argo sites instead

common/Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,15 +238,18 @@ super-linter: ## Runs super linter locally
238238
-e VALIDATE_CHECKOV=false \
239239
-e VALIDATE_DOCKERFILE_HADOLINT=false \
240240
-e VALIDATE_JSCPD=false \
241+
-e VALIDATE_JSON_PRETTIER=false \
242+
-e VALIDATE_MARKDOWN_PRETTIER=false \
241243
-e VALIDATE_KUBERNETES_KUBECONFORM=false \
242244
-e VALIDATE_PYTHON_PYLINT=false \
243245
-e VALIDATE_SHELL_SHFMT=false \
244246
-e VALIDATE_TEKTON=false \
245247
-e VALIDATE_YAML=false \
248+
-e VALIDATE_YAML_PRETTIER=false \
246249
$(DISABLE_LINTERS) \
247250
-v $(PWD):/tmp/lint:rw,z \
248251
-w /tmp/lint \
249-
ghcr.io/super-linter/super-linter:slim-v6
252+
ghcr.io/super-linter/super-linter:slim-v7
250253

251254
.PHONY: ansible-lint
252255
ansible-lint: ## run ansible lint on ansible/ folder

common/acm/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ description: A Helm chart to configure Advanced Cluster Manager for OpenShift.
33
keywords:
44
- pattern
55
name: acm
6-
version: 0.1.0
6+
version: 0.1.1

common/acm/templates/policies/ocp-gitops-policy.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ spec:
3535
labels:
3636
operators.coreos.com/openshift-gitops-operator.openshift-operators: ''
3737
spec:
38-
channel: {{ default "gitops-1.12" .Values.main.gitops.channel }}
38+
channel: {{ default "gitops-1.13" .Values.main.gitops.channel }}
3939
installPlanApproval: Automatic
4040
name: openshift-gitops-operator
41-
source: redhat-operators
41+
source: {{ default "redhat-operators" .Values.main.gitops.operatorSource }}
4242
sourceNamespace: openshift-marketplace
4343
config:
4444
env:

common/acm/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
main:
22
gitops:
3-
channel: "gitops-1.12"
3+
channel: "gitops-1.13"
44

55
global:
66
extraValueFiles: []

common/ansible/plugins/filter/parse_acm_secrets.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,6 @@ def parse_acm_secrets(secrets):
7979

8080

8181
class FilterModule:
82+
8283
def filters(self):
8384
return {"parse_acm_secrets": parse_acm_secrets}

common/ansible/plugins/module_utils/load_secrets_v1.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727

2828
class LoadSecretsV1:
29+
2930
def __init__(
3031
self,
3132
module,

common/ansible/plugins/module_utils/load_secrets_v2.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040

4141

4242
class LoadSecretsV2:
43+
4344
def __init__(self, module, syaml, namespace, pod):
4445
self.module = module
4546
self.namespace = namespace

common/ansible/plugins/module_utils/parse_secrets_v2.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242

4343

4444
class ParseSecretsV2:
45+
4546
def __init__(self, module, syaml, secrets_backing_store):
4647
self.module = module
4748
self.syaml = syaml

0 commit comments

Comments
 (0)