Adapt config applying jobs & docs for applyconfig

Author: petr-muller

Makefile

@@ -1,25 +1,23 @@
-APPLY := oc apply
-
 .PHONY: check check-core dry-core-admin core-admin dry-core core
 
 check: check-core
 	@echo "Service config check: PASS"
 
 check-core:
-	make -C core-services check
+	core-services/_hack/validate-core-services.sh core-services
 	@echo "Core service config check: PASS"
 
 dry-core-admin:
-	make core-admin APPLY="$(APPLY) --dry-run=true"
+	go run ./tools/applyconfig --config-dir core-services --level=admin
 
 core-admin:
-	make -C core-services admin-resources APPLY="$(APPLY) --as=system:admin"
+	go run ./tools/applyconfig --config-dir core-services --level=admin --confirm=true
 
 dry-core:
-	make core APPLY="$(APPLY) --dry-run=true"
+	go run ./tools/applyconfig --config-dir core-services
 
 core:
-	make -C core-services resources APPLY="$(APPLY)"
+	go run ./tools/applyconfig --config-dir core-services --confirm=true
 
 # LEGACY TARGETS
 # You should not need to add new targets here.

ci-operator/config/openshift/release/openshift-release-master.yaml

@@ -1,8 +1,8 @@
 build_root:
   image_stream_tag:
-    name: "origin-release"
-    namespace: ci
-    tag: cli
+    name: release
+    namespace: openshift
+    tag: golang-1.12
 resources:
   '*':
     limits:
@@ -15,8 +15,3 @@ tests:
   commands: make check
   container:
     from: src
-- as: core-dry
-  commands: |
-    go run ./tools/applyconfig/... --config-dir core-services
-  container:
-    from: src

ci-operator/jobs/openshift/release/openshift-release-master-presubmits.yaml

@@ -77,42 +77,21 @@ presubmits:
     - master
     context: ci/prow/core-dry
     decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/prowgen-controlled: "true"
     name: pull-ci-openshift-release-master-core-dry
     rerun_command: /test core-dry
     spec:
       containers:
       - args:
-        - --artifact-dir=$(ARTIFACTS)
-        - --give-pr-author-access-to-namespace=true
-        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
-        - --target=core-dry
+        - core-dry
         command:
-        - ci-operator
-        env:
-        - name: CONFIG_SPEC
-          valueFrom:
-            configMapKeyRef:
-              key: openshift-release-master.yaml
-              name: ci-operator-master-configs
-        image: ci-operator:latest
+        - make
+        image: registry.svc.ci.openshift.org/ci/origin-release:cli
         imagePullPolicy: Always
         name: ""
         resources:
           requests:
             cpu: 10m
-        volumeMounts:
-        - mountPath: /etc/sentry-dsn
-          name: sentry-dsn
-          readOnly: true
-      serviceAccountName: ci-operator
-      volumes:
-      - name: sentry-dsn
-        secret:
-          secretName: sentry-dsn
+      serviceAccountName: config-updater
     trigger: (?m)^/test( | .* )core-dry,?($|\s.*)
   - agent: kubernetes
     always_run: true

core-services/Makefile

@@ -10,34 +10,29 @@ the cluster automatically by a postsubmit job.
 
 Create a new directory for your service, containing all [necessary files](#quality-criteria-and-conventions).
 You may copy the `_TEMPLATE` directory and start using the files there. Add
-manifests and other configuration as needed, and make sure the `Makefile` in
-your directory applies all config when its `resources` and `admin-resources` are
-built.
-
-Add the name of the directory to the `SERVICES` list in the [Makefile](./Makefile).
-You should not need to modify this or any other Makefile in any way.
+manifests and other configuration as needed.
 
 ## Quality criteria and conventions
 
-1. All directories should contain `OWNERS`, `README.md` and `Makefile` files.
-   This is enforced by `make check` locally and by the `ci/prow/core-valid`
-   check on pull requests.
-2. The `Makefile` should provide `resources` and `admin-resources` targets.
-   Calling the former should create all resources for which admin permissions
-   are not necessary. The `config-updater` service account in the `ci` namespace
-   must have permissions to perform all actions done in the `resources` targets.
-   Calling `admin-resources` should create all resources for which admin
-   permissions is necessary. Presence of these targets is enforced by
-   `make check` locally and by the `ci/prow/core-valid` check on pull requests.
-   Additionally, `make dry-core{-admin}` runs the appropriate target in dry-run
-   mode. Passing `make dry-core` is enforced by the `ci/prow/core-dry` check.
-3. Makefiles and scripts called by them should use `$(APPLY)` variable instead
-   of `oc apply`. This allows the universal dry-run to work.
-4. Destination namespaces should always be specified within a manifest, never
-   by a `-n/--namespace` option or by relying on a currently set OpenShift
-   project.
-5. All ConfigMaps need to be set up for automated updates by the
-   `config-updater` Prow plugin.
+1. All directories should contain `OWNERS` and `README.md` files. This is
+enforced by `make check` locally and by the `ci/prow/core-valid` check on
+pull requests.
+2. Config is applied to the cluster using the [`applyconfig`](../tools/applyconfig)
+tool. The tool applies all YAML files under your service subdirectory. All
+   YAML filenames should follow the following convention:
+    - All admin resources should be in `admin_*.yaml` files
+    - Names of YAML files that should not be applied to the cluster should start
+      with `_`.
+    - The remaining YAML files are considered "standard" resources.
+3. `applyconfig` applies files in lexicographical order. In the case when some
+resources need to be created before others, this needs to be reflected by the
+naming of the files (e.g. by including a numerical component).
+4. The `config-updater` service account in the `ci` namespace must have
+permissions to apply all standard resources.
+5. Destination namespaces should always be specified within a manifest, never
+rely on a currently set OpenShift project.
+6. All ConfigMaps need to be set up for automated updates by the
+`config-updater` Prow plugin.
 
 ## How to apply
 
@@ -63,3 +58,6 @@ ConfigMaps.
    to perform all necessary actions
 3. ConfigMaps can be manually created by the [config-bootstrapper](https://github.com/kubernetes/test-infra/tree/master/prow/cmd/config-bootstrapper)
    tool.
+
+Additionally, the [`applyconfig`](../tools/applyconfig) can be used directly.
+See its [README.md](../tools/applyconfig/README.md) for more details.

core-services/README.md

@@ -5,7 +5,7 @@ set -euo pipefail
 
 function validate_required_files() {
     local service_path="$1"
-    for required in OWNERS README.md Makefile; do
+    for required in OWNERS README.md; do
         local required_path="$service_path/$required"
         if [[ ! -s "$required_path" ]]; then
             echo "[ERROR] $required file not found: $required_path"
@@ -17,25 +17,17 @@ function validate_required_files() {
     return 0
 }
 
-validate_makefile() {
-    local service_path="$1"
-
-    for target in "resources" "admin-resources"; do
-        if ! make -C "$service_path" "$target" --dry-run; then
-            echo "[ERROR] Dry-run of 'make $target' did not succeed, Makefile likely does not provide this required target"
-            return 1
-        fi
-    done
-
-    return 0
-}
-
 to_validate="$1"
 if [[ ! -d "$to_validate" ]]; then
     echo "[ERROR] Directory not found: $to_validate"
-    echo "Usage: validate-core-service.sh DIRECTORY"
+    echo "Usage: validate-core-services.sh DIRECTORY"
     exit 1
 fi
 
-validate_required_files "$to_validate" &&
-    validate_makefile "$to_validate"
+for subdir in $1/*/
+do
+    base="$(basename "$subdir")"
+    if [[ "$base" != _* ]]; then
+        validate_required_files "$subdir"
+    fi
+done